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 --- .../libblockdev/libblockdev_2.18.bb | 43 ---------------------- .../libblockdev/libblockdev_2.20.bb | 43 ++++++++++++++++++++++ 2 files changed, 43 insertions(+), 43 deletions(-) delete mode 100644 meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.18.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.20.bb (limited to 'meta-openembedded/meta-oe/recipes-extended/libblockdev') diff --git a/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.18.bb b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.18.bb deleted file mode 100644 index 35f0cc060..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.18.bb +++ /dev/null @@ -1,43 +0,0 @@ -DESCRIPTION = "libblockdev is a C library supporting GObject introspection for manipulation of \ -block devices. It has a plugin-based architecture where each technology (like \ -LVM, Btrfs, MD RAID, Swap,...) is implemented in a separate plugin, possibly \ -with multiple implementations (e.g. using LVM CLI or the new LVM DBus API)." -HOMEPAGE = "http://rhinstaller.github.io/libblockdev/" -LICENSE = "LGPLv2+" -SECTION = "devel/lib" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" - -inherit autotools python3native gobject-introspection - -SRCREV = "0debeb45562ac3d8f6f43f6f942b238abab55be9" -SRC_URI = " \ - git://github.com/rhinstaller/libblockdev;branch=master \ -" - -S = "${WORKDIR}/git" - -FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}" - -PACKAGECONFIG ??= "python3 lvm dm kmod parted fs escrow btrfs crypto mdraid kbd mpath" -PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3" -PACKAGECONFIG[python2] = "--with-python2, --without-python2,,python2" -PACKAGECONFIG[lvm] = "--with-lvm, --without-lvm, multipath-tools, lvm2" -PACKAGECONFIG[lvm-dbus] = "--with-lvm_dbus, --without-lvm_dbus, multipath-tools, lvm2" -PACKAGECONFIG[dm] = "--with-dm, --without-dm, multipath-tools, lvm2" -PACKAGECONFIG[dmraid] = "--with-dmraid, --without-dmraid" -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[vdo] = "--with-vdo, --without-vdo" -PACKAGECONFIG[escrow] = "--with-escrow, --without-escrow, nss volume-key" -PACKAGECONFIG[btrfs] = "--with-btrfs,--without-btrfs,libbytesize btrfs-tools" -PACKAGECONFIG[crypto] = "--with-crypto,--without-crypto,cryptsetup nss volume-key" -PACKAGECONFIG[mdraid] = "--with-mdraid,--without-mdraid,libbytesize" -PACKAGECONFIG[kbd] = "--with-kbd,--without-kbd,libbytesize" -PACKAGECONFIG[mpath] = "--with-mpath,--without-mpath, multipath-tools, lvm2" - -export GIR_EXTRA_LIBS_PATH="${B}/src/utils/.libs" - diff --git a/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.20.bb b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.20.bb new file mode 100644 index 000000000..54a188dc8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.20.bb @@ -0,0 +1,43 @@ +DESCRIPTION = "libblockdev is a C library supporting GObject introspection for manipulation of \ +block devices. It has a plugin-based architecture where each technology (like \ +LVM, Btrfs, MD RAID, Swap,...) is implemented in a separate plugin, possibly \ +with multiple implementations (e.g. using LVM CLI or the new LVM DBus API)." +HOMEPAGE = "http://rhinstaller.github.io/libblockdev/" +LICENSE = "LGPLv2+" +SECTION = "devel/lib" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" + +inherit autotools python3native gobject-introspection + +SRCREV = "cb308566c3c5222b8422f78997a1742713b265a9" +SRC_URI = " \ + git://github.com/rhinstaller/libblockdev;branch=master \ +" + +S = "${WORKDIR}/git" + +FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}" + +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" +PACKAGECONFIG[lvm-dbus] = "--with-lvm_dbus, --without-lvm_dbus, multipath-tools, lvm2" +PACKAGECONFIG[dm] = "--with-dm, --without-dm, multipath-tools, lvm2" +PACKAGECONFIG[dmraid] = "--with-dmraid, --without-dmraid" +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, 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" +PACKAGECONFIG[crypto] = "--with-crypto,--without-crypto,cryptsetup nss volume-key" +PACKAGECONFIG[mdraid] = "--with-mdraid,--without-mdraid,libbytesize" +PACKAGECONFIG[kbd] = "--with-kbd,--without-kbd,libbytesize" +PACKAGECONFIG[mpath] = "--with-mpath,--without-mpath, multipath-tools, lvm2" + +export GIR_EXTRA_LIBS_PATH="${B}/src/utils/.libs" + -- cgit v1.2.1