From 5e5d88295b9373bfad7424b003b536b6dafeee42 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Fri, 23 Mar 2018 23:58:14 +0100 Subject: udisks2: update 2.1.8 -> 2.7.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit They moved to github so updates slipped through... Signed-off-by: Andreas Müller Signed-off-by: Armin Kuster --- .../udisks2/0001-data-fix-out-of-tree-build.patch | 35 ++++++++++++++++ meta-oe/recipes-support/udisks/udisks2_2.1.8.bb | 39 ----------------- meta-oe/recipes-support/udisks/udisks2_2.7.6.bb | 49 ++++++++++++++++++++++ 3 files changed, 84 insertions(+), 39 deletions(-) create mode 100644 meta-oe/recipes-support/udisks/udisks2/0001-data-fix-out-of-tree-build.patch delete mode 100644 meta-oe/recipes-support/udisks/udisks2_2.1.8.bb create mode 100644 meta-oe/recipes-support/udisks/udisks2_2.7.6.bb (limited to 'meta-oe/recipes-support') diff --git a/meta-oe/recipes-support/udisks/udisks2/0001-data-fix-out-of-tree-build.patch b/meta-oe/recipes-support/udisks/udisks2/0001-data-fix-out-of-tree-build.patch new file mode 100644 index 0000000000..1cbd877517 --- /dev/null +++ b/meta-oe/recipes-support/udisks/udisks2/0001-data-fix-out-of-tree-build.patch @@ -0,0 +1,35 @@ +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-oe/recipes-support/udisks/udisks2_2.1.8.bb b/meta-oe/recipes-support/udisks/udisks2_2.1.8.bb deleted file mode 100644 index a3efc5160d..0000000000 --- a/meta-oe/recipes-support/udisks/udisks2_2.1.8.bb +++ /dev/null @@ -1,39 +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 intltool-native gnome-common-native libxslt-native" -DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" - -RDEPENDS_${PN} = "acl" - -SRC_URI = "http://udisks.freedesktop.org/releases/udisks-${PV}.tar.bz2 \ - file://non-gnu-libc.patch \ -" -SRC_URI[md5sum] = "501d11c243bd8c6c00650474cd2afaab" -SRC_URI[sha256sum] = "da416914812a77e5f4d82b81deb8c25799fd3228d27d52f7bf89a501b1857dda" - -CVE_PRODUCT = "udisks" - -inherit autotools systemd gtk-doc gobject-introspection - -S = "${WORKDIR}/udisks-${PV}" - -EXTRA_OECONF = "--disable-man --disable-gtk-doc" - -FILES_${PN} += "${libdir}/polkit-1/extensions/*.so \ - ${datadir}/dbus-1/ \ - ${datadir}/polkit-1 \ - ${nonarch_base_libdir}/udev/* \ - ${exec_prefix}${nonarch_base_libdir}/udisks2/* \ -" - -PACKAGES =+ "${PN}-libs" - -FILES_${PN} += "${datadir}/bash-completion" -FILES_${PN}-libs = "${libdir}/lib*${SOLIBS}" - -FILES_${PN}-dbg += "${exec_prefix}${nonarch_base_libdir}/udisks2/.debug" - -SYSTEMD_SERVICE_${PN} = "${BPN}.service" -SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-oe/recipes-support/udisks/udisks2_2.7.6.bb b/meta-oe/recipes-support/udisks/udisks2_2.7.6.bb new file mode 100644 index 0000000000..4d22afd0d5 --- /dev/null +++ b/meta-oe/recipes-support/udisks/udisks2_2.7.6.bb @@ -0,0 +1,49 @@ +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" -- cgit 1.2.3-korg