From 1a4b7ee28bf7413af6513fb45ad0d0736048f866 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sun, 16 Dec 2018 17:11:34 -0800 Subject: reset upstream subtrees to yocto 2.6 Reset the following subtrees on thud HEAD: poky: 87e3a9739d meta-openembedded: 6094ae18c8 meta-security: 31dc4e7532 meta-raspberrypi: a48743dc36 meta-xilinx: c42016e2e6 Also re-apply backports that didn't make it into thud: poky: 17726d0 systemd-systemctl-native: handle Install wildcards meta-openembedded: 4321a5d libtinyxml2: update to 7.0.1 042f0a3 libcereal: Add native and nativesdk classes e23284f libcereal: Allow empty package 030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG 179a1b9 gtest: update to 1.8.1 Squashed OpenBMC subtree compatibility updates: meta-aspeed: Brad Bishop (1): aspeed: add yocto 2.6 compatibility meta-ibm: Brad Bishop (1): ibm: prepare for yocto 2.6 meta-ingrasys: Brad Bishop (1): ingrasys: set layer compatibility to yocto 2.6 meta-openpower: Brad Bishop (1): openpower: set layer compatibility to yocto 2.6 meta-phosphor: Brad Bishop (3): phosphor: set layer compatibility to thud phosphor: libgpg-error: drop patches phosphor: react to fitimage artifact rename Ed Tanous (4): Dropbear: upgrade options for latest upgrade yocto2.6: update openssl options busybox: remove upstream watchdog patch systemd: Rebase CONFIG_CGROUP_BPF patch Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7 Signed-off-by: Brad Bishop --- .../udisks/0001-include-sys-sysmacros.h.patch | 77 ++++++++++++++++++++++ .../udisks2/0001-data-fix-out-of-tree-build.patch | 35 ---------- .../recipes-support/udisks/udisks2_2.7.6.bb | 49 -------------- .../recipes-support/udisks/udisks2_2.7.8.bb | 48 ++++++++++++++ .../meta-oe/recipes-support/udisks/udisks_1.0.5.bb | 14 ++-- 5 files changed, 132 insertions(+), 91 deletions(-) create mode 100644 meta-openembedded/meta-oe/recipes-support/udisks/udisks/0001-include-sys-sysmacros.h.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/udisks/udisks2/0001-data-fix-out-of-tree-build.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/udisks/udisks2_2.7.6.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/udisks/udisks2_2.7.8.bb (limited to 'meta-openembedded/meta-oe/recipes-support/udisks') diff --git a/meta-openembedded/meta-oe/recipes-support/udisks/udisks/0001-include-sys-sysmacros.h.patch b/meta-openembedded/meta-oe/recipes-support/udisks/udisks/0001-include-sys-sysmacros.h.patch new file mode 100644 index 000000000..f140793c5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/udisks/udisks/0001-include-sys-sysmacros.h.patch @@ -0,0 +1,77 @@ +From 64f051963d6cdeebd19f9e7f0a7e584a1f7acc60 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 11 Aug 2018 19:12:57 -0700 +Subject: [PATCH] include sys/sysmacros.h + +fixes build with glibc 2.28+ + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/daemon.c | 1 + + src/device.c | 1 + + src/mount-monitor.c | 1 + + tools/udisks.c | 1 + + tools/umount-udisks.c | 1 + + 5 files changed, 5 insertions(+) + +diff --git a/src/daemon.c b/src/daemon.c +index 14e952f..2c61cfb 100644 +--- a/src/daemon.c ++++ b/src/daemon.c +@@ -39,6 +39,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/src/device.c b/src/device.c +index d73f9d6..5911d78 100644 +--- a/src/device.c ++++ b/src/device.c +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/src/mount-monitor.c b/src/mount-monitor.c +index 573a69c..ccf3365 100644 +--- a/src/mount-monitor.c ++++ b/src/mount-monitor.c +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include + #include + +diff --git a/tools/udisks.c b/tools/udisks.c +index d30159b..f24a30a 100644 +--- a/tools/udisks.c ++++ b/tools/udisks.c +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/tools/umount-udisks.c b/tools/umount-udisks.c +index 2813fe0..5cf6b4d 100644 +--- a/tools/umount-udisks.c ++++ b/tools/umount-udisks.c +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/meta-openembedded/meta-oe/recipes-support/udisks/udisks2/0001-data-fix-out-of-tree-build.patch b/meta-openembedded/meta-oe/recipes-support/udisks/udisks2/0001-data-fix-out-of-tree-build.patch deleted file mode 100644 index 1cbd87751..000000000 --- a/meta-openembedded/meta-oe/recipes-support/udisks/udisks2/0001-data-fix-out-of-tree-build.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 7fdd4acdf6daf95c5cc74e968f4710513c8ddaea Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Fri, 23 Mar 2018 18:33:52 +0100 -Subject: [PATCH] data: fix out of tree build -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -| sed: can't read udisks2.service.in: No such file or directory - -Upstream-Status: Submitted [1] - -[1] https://github.com/storaged-project/udisks/pull/510 - -Signed-off-by: Andreas Müller ---- - data/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/Makefile.am b/data/Makefile.am -index ddf9e3d6..b38928c8 100644 ---- a/data/Makefile.am -+++ b/data/Makefile.am -@@ -22,7 +22,7 @@ systemdservicedir = $(systemdsystemunitdir) - systemdservice_DATA = $(systemdservice_in_files:.service.in=.service) - - $(systemdservice_DATA): udisks2.service.in Makefile -- @sed -e "s|\@udisksdprivdir\@|$(libexecdir)/udisks2|" udisks2.service.in > udisks2.service -+ @sed -e "s|\@udisksdprivdir\@|$(libexecdir)/udisks2|" $(srcdir)/udisks2.service.in > udisks2.service - endif - - udevrulesdir = $(udevdir)/rules.d --- -2.14.3 - diff --git a/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_2.7.6.bb b/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_2.7.6.bb deleted file mode 100644 index 4d22afd0d..000000000 --- a/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_2.7.6.bb +++ /dev/null @@ -1,49 +0,0 @@ -SUMMARY = "udisks provides dbus interfaces for disks and storage devices" -LICENSE = "GPLv2+ & LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=dd79f6dbbffdbc8e86b086a8f0c0ef43" - -DEPENDS = " \ - acl \ - libatasmart \ - polkit \ - libgudev \ - dbus-glib \ - glib-2.0 \ - libblockdev \ - intltool-native \ - gnome-common-native \ - libxslt-native \ -" -DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" - -RDEPENDS_${PN} = "acl" - -SRC_URI = " \ - git://github.com/storaged-project/udisks.git \ - file://0001-data-fix-out-of-tree-build.patch \ - file://non-gnu-libc.patch \ -" -SRCREV = "b6471f2e99f6aa1133af0de658f1fa05c748932c" -S = "${WORKDIR}/git" - -CVE_PRODUCT = "udisks" - -inherit autotools systemd gtk-doc gobject-introspection - -EXTRA_OECONF = "--disable-man --disable-gtk-doc" - -FILES_${PN} += " \ - ${datadir}/dbus-1/ \ - ${datadir}/polkit-1 \ - ${datadir}/bash-completion \ - ${libdir}/polkit-1/extensions/*.so \ - ${nonarch_base_libdir}/udev/* \ - ${exec_prefix}${nonarch_base_libdir}/udisks2/* \ - ${systemd_system_unitdir} \ -" - -PACKAGES =+ "${PN}-libs" -FILES_${PN}-libs = "${libdir}/lib*${SOLIBS}" - -SYSTEMD_SERVICE_${PN} = "${BPN}.service" -SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_2.7.8.bb b/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_2.7.8.bb new file mode 100644 index 000000000..64b338f11 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_2.7.8.bb @@ -0,0 +1,48 @@ +SUMMARY = "udisks provides dbus interfaces for disks and storage devices" +LICENSE = "GPLv2+ & LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=dd79f6dbbffdbc8e86b086a8f0c0ef43" + +DEPENDS = " \ + acl \ + libatasmart \ + polkit \ + libgudev \ + dbus-glib \ + glib-2.0 \ + libblockdev \ + intltool-native \ + gnome-common-native \ + libxslt-native \ +" +DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" + +RDEPENDS_${PN} = "acl" + +SRC_URI = " \ + git://github.com/storaged-project/udisks.git;branch=2.7.x-branch \ + file://non-gnu-libc.patch \ +" +SRCREV = "47bc0141cb84624ba1e2242d596a89a30df1f5ea" +S = "${WORKDIR}/git" + +CVE_PRODUCT = "udisks" + +inherit autotools systemd gtk-doc gobject-introspection + +EXTRA_OECONF = "--disable-man --disable-gtk-doc" + +FILES_${PN} += " \ + ${datadir}/dbus-1/ \ + ${datadir}/polkit-1 \ + ${datadir}/bash-completion \ + ${libdir}/polkit-1/extensions/*.so \ + ${nonarch_base_libdir}/udev/* \ + ${exec_prefix}${nonarch_base_libdir}/udisks2/* \ + ${systemd_system_unitdir} \ +" + +PACKAGES =+ "${PN}-libs" +FILES_${PN}-libs = "${libdir}/lib*${SOLIBS}" + +SYSTEMD_SERVICE_${PN} = "${BPN}.service" +SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-openembedded/meta-oe/recipes-support/udisks/udisks_1.0.5.bb b/meta-openembedded/meta-oe/recipes-support/udisks/udisks_1.0.5.bb index e33266001..7cd999221 100644 --- a/meta-openembedded/meta-oe/recipes-support/udisks/udisks_1.0.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/udisks/udisks_1.0.5.bb @@ -11,13 +11,13 @@ DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ dbus-glib-native \ " -SRC_URI = " \ - http://hal.freedesktop.org/releases/${BPN}-${PV}.tar.gz;name=${BPN} \ - file://optional-depends.patch \ - file://0001-fix-build-with-newer-glibc-versions.patch \ - file://udisks-1.0.5-fix-service-file.patch \ - file://0001-Make-udev-rules-directory-configurable.patch \ -" +SRC_URI = "http://hal.freedesktop.org/releases/${BPN}-${PV}.tar.gz;name=${BPN} \ + file://optional-depends.patch \ + file://0001-fix-build-with-newer-glibc-versions.patch \ + file://udisks-1.0.5-fix-service-file.patch \ + file://0001-Make-udev-rules-directory-configurable.patch \ + file://0001-include-sys-sysmacros.h.patch \ + " SRC_URI[udisks.md5sum] = "70d48dcfe523a74cd7c7fbbc2847fcdd" SRC_URI[udisks.sha256sum] = "f2ec82eb0ea7e01dc299b5b29b3c18cdf861236ec43dcff66b3552b4b31c6f71" -- cgit v1.2.3