diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /meta-openembedded/meta-oe/recipes-support/udisks | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
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 <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support/udisks')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/udisks/udisks2_2.8.1.bb (renamed from meta-openembedded/meta-oe/recipes-support/udisks/udisks2_2.7.8.bb) | 8 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/udisks/udisks_1.0.5.bb | 5 |
2 files changed, 9 insertions, 4 deletions
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.8.1.bb index 64b338f11b..3f2130ecda 100644 --- a/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_2.7.8.bb +++ b/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_2.8.1.bb @@ -19,15 +19,17 @@ 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 \ + git://github.com/storaged-project/udisks.git;branch=master \ file://non-gnu-libc.patch \ " -SRCREV = "47bc0141cb84624ba1e2242d596a89a30df1f5ea" +SRCREV = "05ae471be3c2adf2255b3a01edb00bba06e02afb" S = "${WORKDIR}/git" CVE_PRODUCT = "udisks" -inherit autotools systemd gtk-doc gobject-introspection +inherit autotools systemd gtk-doc gobject-introspection distro_features_check + +REQUIRED_DISTRO_FEATURES = "polkit" EXTRA_OECONF = "--disable-man --disable-gtk-doc" 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 7cd9992214..3ae8ecc15c 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 @@ -22,7 +22,10 @@ SRC_URI = "http://hal.freedesktop.org/releases/${BPN}-${PV}.tar.gz;name=${BPN} \ SRC_URI[udisks.md5sum] = "70d48dcfe523a74cd7c7fbbc2847fcdd" SRC_URI[udisks.sha256sum] = "f2ec82eb0ea7e01dc299b5b29b3c18cdf861236ec43dcff66b3552b4b31c6f71" -inherit autotools-brokensep systemd gtk-doc +inherit autotools-brokensep systemd gtk-doc distro_features_check + +REQUIRED_DISTRO_FEATURES = "polkit" + PACKAGECONFIG ??= "libdevmapper" PACKAGECONFIG[libdevmapper] = "--enable-devmapper,--disable-devmapper,libdevmapper" |