From 193236933b0f4ab91b1625b64e2187e2db4e0e8f Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 5 Apr 2019 15:28:33 -0400 Subject: reset upstream subtrees to HEAD Reset the following subtrees on HEAD: poky: 8217b477a1(master) meta-xilinx: 64aa3d35ae(master) meta-openembedded: 0435c9e193(master) meta-raspberrypi: 490a4441ac(master) meta-security: cb6d1c85ee(master) Squashed patches: meta-phosphor: drop systemd 239 patches meta-phosphor: mrw-api: use correct install path Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d Signed-off-by: Brad Bishop --- .../fuse-exfat/fuse-exfat_1.2.3.bb | 1 - .../images/meta-filesystems-image-base.bb | 7 +++++ .../images/meta-filesystems-image.bb | 3 ++ .../recipes-filesystems/owfs/owfs_3.2p2.bb | 17 ++++++++--- .../packagegroup-meta-filesystems.bb | 35 ++++++++++++++++++++++ .../recipes-filesystems/yaffs2/yaffs2-utils_git.bb | 6 ++++ 6 files changed, 64 insertions(+), 5 deletions(-) create mode 100644 meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-base.bb create mode 100644 meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image.bb create mode 100644 meta-openembedded/meta-filesystems/recipes-filesystems/packageconfigs/packagegroup-meta-filesystems.bb (limited to 'meta-openembedded/meta-filesystems/recipes-filesystems') diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/fuse-exfat/fuse-exfat_1.2.3.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/fuse-exfat/fuse-exfat_1.2.3.bb index 99bf2bed41..18fc9cd6f1 100644 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/fuse-exfat/fuse-exfat_1.2.3.bb +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/fuse-exfat/fuse-exfat_1.2.3.bb @@ -17,5 +17,4 @@ inherit autotools pkgconfig SRC_URI[md5sum] = "fca71e6598f79d037a3c7c969cb5710c" SRC_URI[sha256sum] = "f2e06eba5a21c621aac1d6da21b12a5a324fdd1e20f9c8acd357dd463c2355d9" -S = "${WORKDIR}/${PN}-${PV}" EXTRA_OECONF += "sbindir=${base_sbindir}" diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-base.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-base.bb new file mode 100644 index 0000000000..c89b1e1362 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-base.bb @@ -0,0 +1,7 @@ +SUMMARY = "meta-filesystems build test image" + +IMAGE_INSTALL = "packagegroup-core-boot" + +LICENSE = "MIT" + +inherit core-image diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image.bb new file mode 100644 index 0000000000..ca21d2a0ed --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image.bb @@ -0,0 +1,3 @@ +require meta-filesystems-image-base.bb + +IMAGE_INSTALL += "packagegroup-meta-filesystems" diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p2.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p2.bb index 50865cccda..857aaf216d 100644 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p2.bb +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p2.bb @@ -18,7 +18,7 @@ SRC_URI = "git://github.com/owfs/owfs \ S = "${WORKDIR}/git" -inherit autotools-brokensep update-rc.d pkgconfig +inherit autotools-brokensep update-rc.d pkgconfig systemd EXTRA_OECONF = " \ --with-fuseinclude=${STAGING_INCDIR} \ @@ -52,9 +52,12 @@ DESCRIPTION_libownet = "easy C-language 1-wire interface to the owserver protoco DESCRIPTION_owmon = "Monitor for owserver settings and statistics" DESCRIPTION_owtap = "Packet sniffer for the owserver protocol" -FILES_owftpd = "${bindir}/owftpd" -FILES_owhttpd = "${bindir}/owhttpd ${sysconfdir}/init.d/owhttpd" -FILES_owserver = "${bindir}/owserver ${sysconfdir}/init.d/owserver" +FILES_owftpd = "${bindir}/owftpd ${systemd_system_unitdir}/owftpd.service" +FILES_owhttpd = "${bindir}/owhttpd ${sysconfdir}/init.d/owhttpd \ + ${systemd_system_unitdir}/owhttpd.service" +FILES_owserver = "${bindir}/owserver ${sysconfdir}/init.d/owserver \ + ${systemd_system_unitdir}/owserver.service \ + ${systemd_system_unitdir}/owserver.socket" FILES_owshell = "${bindir}/owread ${bindir}/owwrite \ ${bindir}/owdir ${bindir}/owpresent \ ${bindir}/owget ${bindir}/owside" @@ -63,9 +66,15 @@ FILES_owtap = "${bindir}/owtap" FILES_libowcapi = "${libdir}/libowcapi-*" FILES_libow = "${libdir}/libow-*" FILES_libownet = "${libdir}/libownet-*" +FILES_${PN} += "${systemd_system_unitdir}/owfs.service" INITSCRIPT_PACKAGES = "owhttpd owserver" INITSCRIPT_NAME_owserver = "owserver" INITSCRIPT_NAME_owhttpd = "owhttpd" INITSCRIPT_PARAMS_owserver = "defaults 20" INITSCRIPT_PARAMS_owhttpd = "defaults 21" + +SYSTEMD_SERVICE_${PN} = "owfs.service" +SYSTEMD_SERVICE_${PN}-owftpd = "owftpd.service" +SYSTEMD_SERVICE_${PN}-owhttpd = "owhttpd.service" +SYSTEMD_SERVICE_${PN}-owserver = "owserver.service owserver.socket" diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/packageconfigs/packagegroup-meta-filesystems.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/packageconfigs/packagegroup-meta-filesystems.bb new file mode 100644 index 0000000000..86b1c9b36f --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/packageconfigs/packagegroup-meta-filesystems.bb @@ -0,0 +1,35 @@ +SUMMARY = "Meta-filesystem packagegroups" + +inherit packagegroup + +PROVIDES = "${PACKAGES}" +PACKAGES = ' \ + packagegroup-meta-filesystems \ + packagegroup-meta-filesystems-support \ + packagegroup-meta-filesystems-utls \ +' + +RDEPENDS_packagegroup-meta-filesystems = "\ + packagegroup-meta-filesystems \ + packagegroup-meta-filesystems-support \ + packagegroup-meta-filesystems-utls \ +" + +RDEPENDS_packagegroup-meta-filesystems = "\ + ntfs-3g-ntfsprogs ifuse sshfs-fuse \ + logfsprogs owfs simple-mtpfs \ + unionfs-fuse fuse-exfat yaffs2-utils \ + ${@bb.utils.contains("DISTRO_FEATURES", "pam", "smbnetfs", "", d)} \ + " + +RDEPENDS_packagegroup-meta-filesystems-support = "\ + physfs fuse \ + " + +RDEPENDS_packagegroup-meta-filesystems-utils = "\ + xorriso aufs-util xfsprogs \ + f2fs-tools exfat-utils udevil \ + xfsdump \ + " + +EXCLUDE_FROM_WORLD = "1" diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb index 6095e27a74..8628bea0b5 100644 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb @@ -43,3 +43,9 @@ do_install() { } BBCLASSEXTEND = "native" + +# Fixed make clean error: +#make -C /lib/modules/4.4.0-112-generic/build M= +#make: *** /lib/modules/4.4.0-112-generic/build: No such file or directory. Stop. +#make: *** [clean] Error 2 +CLEANBROKEN = "1" -- cgit v1.2.3