btrfs-tools: Update to 5.11.1
PATCH v2 1/3 btrfs-tools: Update to 5.11.1
Update licensing, as libtrfsutil is under LGPLv3+. Note that libtrfsutil is in the process of being relicensed to LGPLv2.1+:
https://github.com/kdave/btrfs-progs/issues/323
---
.../{btrfs-tools_5.10.1.bb => btrfs-tools_5.11.1.bb} | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_5.10.1.bb => btrfs-tools_5.11.1.bb} (88%)meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_5.10.1.bb +6 -3
@@ -7,14 +7,17 @@ btrfs and an utility (btrfs-convert) to make a btrfs filesystem from an ext3." HOMEPAGE = "https://btrfs.wiki.kernel.org" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=fcb02dc552a041dee27e4b85c7396067" +LICENSE = "GPLv2 & LGPLv3+" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=fcb02dc552a041dee27e4b85c7396067 \ + file://libbtrfsutil/COPYING.LESSER;md5=3000208d539ec061b899bce1d9ce9404 \ +" SECTION = "base" DEPENDS = "util-linux attr e2fsprogs lzo acl" DEPENDS_append_class-target = " udev" RDEPENDS_${PN} = "libgcc" -SRCREV = "f2ffce38b9c1477a7350bfe165f0e34b9bde40f5" +SRCREV = "8d5051f279f7994fb80536ef8f846f06d121d898" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \ "
Signature · 1 line
2.26.3
PATCH v2 2/3 btrfs-tools: Add PACKAGECONFIG options
Add options to make it easier to control which features are enabled. All of these default to enabled by upstream, so keep them enabled to maintain previous behavior.
The convert option also supports reiserfs, but no recipes exist in the layer index. Limit the option to ext filesystems until someone cares enough to make reiserfs recipes.
Remove acl and attr from DEPENDS, as they do not apper to be needed. Add zlib since it is required.
--- .../btrfs-tools/btrfs-tools_5.11.1.bb | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb +16 -2
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = " \ file://libbtrfsutil/COPYING.LESSER;md5=3000208d539ec061b899bce1d9ce9404 \ " SECTION = "base" -DEPENDS = "util-linux attr e2fsprogs lzo acl" +DEPENDS = "lzo util-linux zlib" DEPENDS_append_class-target = " udev" RDEPENDS_${PN} = "libgcc"
@@ -22,16 +22,30 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \ " -PACKAGECONFIG ??= "python" +PACKAGECONFIG ??= " \ + programs \ + convert \ + python \ + crypto-builtin \ +" PACKAGECONFIG[manpages] = "--enable-documentation, --disable-documentation, asciidoc-native xmlto-native" +PACKAGECONFIG[programs] = "--enable-programs,--disable-programs" +PACKAGECONFIG[convert] = "--enable-convert --with-convert=ext2,--disable-convert --without-convert,e2fsprogs" PACKAGECONFIG[python] = "--enable-python,--disable-python,python3-setuptools-native" PACKAGECONFIG[zstd] = "--enable-zstd,--disable-zstd,zstd" +# Pick only one crypto provider +PACKAGECONFIG[crypto-builtin] = "--with-crypto=builtin" +PACKAGECONFIG[crypto-libgcrypt] = "--with-crypto=libgcrypt,,libgcrypt" +PACKAGECONFIG[crypto-libsodium] = "--with-crypto=libsodium,,libsodium" +PACKAGECONFIG[crypto-libkcapi] = "--with-crypto=libkcapi,,libkcapi" + inherit autotools-brokensep pkgconfig manpages inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'distutils3-base', '', d)} CLEANBROKEN = "1" +EXTRA_OECONF = "--enable-largefile" EXTRA_OECONF_append_libc-musl = " --disable-backtrace " EXTRA_PYTHON_CFLAGS = "${DEBUG_PREFIX_MAP}" EXTRA_PYTHON_CFLAGS_class-native = ""
Signature · 1 line
2.26.3
PATCH v2 3/3 btrfs-tools: Try to follow style guide
In reply to Robert JoslynCosmetic changes to better follow the style guide.
--- meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb +4 -3
@@ -15,12 +15,12 @@ LIC_FILES_CHKSUM = " \ SECTION = "base" DEPENDS = "lzo util-linux zlib" DEPENDS_append_class-target = " udev" -RDEPENDS_${PN} = "libgcc" -SRCREV = "8d5051f279f7994fb80536ef8f846f06d121d898" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \ " +SRCREV = "8d5051f279f7994fb80536ef8f846f06d121d898" +S = "${WORKDIR}/git" PACKAGECONFIG ??= " \ programs \
@@ -58,7 +58,6 @@ do_configure_prepend() { cp -f $(automake --print-libdir)/install-sh ${S}/config/ } -S = "${WORKDIR}/git" do_install_append() { if [ "${@bb.utils.filter('PACKAGECONFIG', 'python', d)}" ]; then
@@ -66,4 +65,6 @@ do_install_append() { fi } +RDEPENDS_${PN} = "libgcc" + BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.26.3
[SWAT}
It causing util-linux build failure on non-gpl3 build.
ERROR: Nothing RPROVIDES 'btrfs-tools' (but /home/pokybuild/yocto-worker/non-gpl3/build/meta/recipes-core/util-linux/util-linux_2.36.2.bb RDEPENDS on or otherwise requires it) btrfs-tools was skipped: it has incompatible license(s): LGPL-3.0-or-later
https://autobuilder.yoctoproject.org/typhoon/#/builders/75/builds/3312
Quoted 54 lines
-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Robert Joslyn
Sent: Sunday, April 18, 2021 11:41 AM
To: [email protected]
Cc: Robert Joslyn <[email protected]>
Subject: [OE-core] [PATCH v2 1/3] btrfs-tools: Update to 5.11.1Update licensing, as libtrfsutil is under LGPLv3+. Note that libtrfsutil is in the process of being relicensed to LGPLv2.1+:
https://github.com/kdave/btrfs-progs/issues/323Signed-off-by Robert Joslyn <[email protected]>--- .../{btrfs-tools_5.10.1.bb => btrfs-tools_5.11.1.bb} | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_5.10.1.bb => btrfs-tools_5.11.1.bb} (88%)
meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_5.10.1.bb +0
-0@@ -7,14 +7,17 @@ btrfs and an utility (btrfs-convert) to make a btrfsfilesystem from an ext3."
HOMEPAGE = "https://btrfs.wiki.kernel.org"
meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_5.10.1.bb +0
-2-LICENSE = "GPLv2" -LIC_FILES_CHKSUM ="file://COPYING;md5=fcb02dc552a041dee27e4b85c7396067"
meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_5.10.1.bb +5
-0+LICENSE = "GPLv2 & LGPLv3+" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=fcb02dc552a041dee27e4b85c7396067 \ + +file://libbtrfsutil/COPYING.LESSER;md5=3000208d539ec061b899bce1d9ce9404 \ "
SECTION = "base"
DEPENDS = "util-linux attr e2fsprogs lzo acl"
DEPENDS_append_class-target = " udev"
RDEPENDS_${PN} = "libgcc"meta/recipes-devtools/btrfs-tools/btrfs-tools_5.11.1.bb renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_5.10.1.bb +1
-1-SRCREV = "f2ffce38b9c1477a7350bfe165f0e34b9bde40f5" +SRCREV = "8d5051f279f7994fb80536ef8f846f06d121d898" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ file://0001-Add-a-possibility-to-specify-where-python-modules- ar.patch \ "--
2.26.3
Quoted 6 lines · Naveen Saini
[SWAT}
It causing util-linux build failure on non-gpl3 build.ERROR: Nothing RPROVIDES 'btrfs-tools' (but
/home/pokybuild/yocto-worker/non-gpl3/build/meta/recipes-core/util-linux/util-linux_2.36.2.bbRDEPENDS on or otherwise requires it) btrfs-tools was skipped: it has incompatible license(s): LGPL-3.0-or-later
https://autobuilder.yoctoproject.org/typhoon/#/builders/75/builds/3312
Just FYI I've a fix queued for this one to meta-gplv2.
Cheers,
Richard