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-extended/libblockdev | |
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-extended/libblockdev')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.20.bb (renamed from meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.18.bb) | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.18.bb b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.20.bb index 35f0cc0606..54a188dc8b 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.18.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.20.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" inherit autotools python3native gobject-introspection -SRCREV = "0debeb45562ac3d8f6f43f6f942b238abab55be9" +SRCREV = "cb308566c3c5222b8422f78997a1742713b265a9" SRC_URI = " \ git://github.com/rhinstaller/libblockdev;branch=master \ " @@ -19,7 +19,7 @@ S = "${WORKDIR}/git" FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}" -PACKAGECONFIG ??= "python3 lvm dm kmod parted fs escrow btrfs crypto mdraid kbd mpath" +PACKAGECONFIG ??= "python3 lvm dm kmod parted fs escrow btrfs crypto mdraid kbd mpath nvdimm" PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3" PACKAGECONFIG[python2] = "--with-python2, --without-python2,,python2" PACKAGECONFIG[lvm] = "--with-lvm, --without-lvm, multipath-tools, lvm2" @@ -30,7 +30,7 @@ PACKAGECONFIG[kmod] = "--with-kbd, --without-kbd, kmod" PACKAGECONFIG[parted] = "--with-part, --without-part, parted" PACKAGECONFIG[fs] = "--with-fs, --without-fs, util-linux" PACKAGECONFIG[doc] = "--with-gtk-doc, --without-gtk-doc, gtk-doc-native" -PACKAGECONFIG[nvdimm] = "--with-nvdimm, --without-nvdimm" +PACKAGECONFIG[nvdimm] = "--with-nvdimm, --without-nvdimm, ndctl util-linux" PACKAGECONFIG[vdo] = "--with-vdo, --without-vdo" PACKAGECONFIG[escrow] = "--with-escrow, --without-escrow, nss volume-key" PACKAGECONFIG[btrfs] = "--with-btrfs,--without-btrfs,libbytesize btrfs-tools" |