diff options
Diffstat (limited to 'meta/recipes-devtools/btrfs-tools')
-rw-r--r-- | meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Add-a-possibility-to-specify-where-python-modules-ar.patch | 6 | ||||
-rw-r--r-- | meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch | 42 | ||||
-rw-r--r-- | meta/recipes-devtools/btrfs-tools/btrfs-tools_6.8.bb (renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_5.13.1.bb) | 16 |
3 files changed, 11 insertions, 53 deletions
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Add-a-possibility-to-specify-where-python-modules-ar.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Add-a-possibility-to-specify-where-python-modules-ar.patch index 5846f04d1a..4b1797b65f 100644 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Add-a-possibility-to-specify-where-python-modules-ar.patch +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Add-a-possibility-to-specify-where-python-modules-ar.patch @@ -1,4 +1,4 @@ -From d3adfc21c9cc264bd191722f102963cbc4794259 Mon Sep 17 00:00:00 2001 +From 980f6edc269fa3ef8d4d4b9cd1aada2328131c19 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Wed, 23 May 2018 21:20:35 +0300 Subject: [PATCH] Add a possibility to specify where python modules are @@ -11,10 +11,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 1697794c..8ab38818 100644 +index 374f59b9..ed083f6b 100644 --- a/Makefile +++ b/Makefile -@@ -651,7 +651,7 @@ endif +@@ -959,7 +959,7 @@ endif ifeq ($(PYTHON_BINDINGS),1) install_python: libbtrfsutil_python $(Q)cd libbtrfsutil/python; \ diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch deleted file mode 100644 index d7188881da..0000000000 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 3d19b0fb882c5e195362a9f0909c474e60070ca0 Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield <bruce.ashfield@gmail.com> -Date: Fri, 18 Jun 2021 11:10:36 -0400 -Subject: [PATCH] btrfs-progs: include linux/const.h to fix build with 5.12+ - headers - -btrfs-tools compile fails with mips, musl and 5.12+ headers. - -The definition of __ALIGN_KERNEL has moved in 5.12+ kernels, so we -add an explicit include of const.h to pickup the macro: - - | make: *** [Makefile:595: mkfs.btrfs] Error 1 - | make: *** Waiting for unfinished jobs.... - | libbtrfs.a(volumes.o): in function `dev_extent_search_start': - | /usr/src/debug/btrfs-tools/5.12.1-r0/git/kernel-shared/volumes.c:464: undefined reference to `__ALIGN_KERNEL' - | collect2: error: ld returned 1 exit status - -This is safe for older kernel's as well, since the header still -exists, and is valid to include. - -Upstream-status: OE Specific [mips64 + musl + libc-headers] - -Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> ---- - kerncompat.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/kerncompat.h b/kerncompat.h -index df167fe6..254235bd 100644 ---- a/kerncompat.h -+++ b/kerncompat.h -@@ -30,6 +30,7 @@ - #include <linux/types.h> - #include <linux/kernel.h> - #include <stdint.h> -+#include <linux/const.h> - - #include <features.h> - --- -2.25.1 - diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.13.1.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.8.bb index 5288978943..15cc7ac244 100644 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.13.1.bb +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.8.bb @@ -7,20 +7,18 @@ btrfs and an utility (btrfs-convert) to make a btrfs filesystem from an ext3." HOMEPAGE = "https://btrfs.wiki.kernel.org" -LICENSE = "GPLv2 & LGPLv2.1+" +LICENSE = "GPL-2.0-only & LGPL-2.1-or-later" LIC_FILES_CHKSUM = " \ file://COPYING;md5=fcb02dc552a041dee27e4b85c7396067 \ file://libbtrfsutil/COPYING;md5=4fbd65380cdd255951079008b364516c \ " SECTION = "base" -DEPENDS = "lzo util-linux zlib" -DEPENDS:append:class-target = " udev" +DEPENDS = "util-linux zlib" -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git;branch=master;protocol=https \ file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \ - file://0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch \ " -SRCREV = "e4ac7d4f67b330a3b27a4a50f73e94b1e072ae56" +SRCREV = "3793e987d2b4e878410da16f33d963043d137d48" S = "${WORKDIR}/git" PACKAGECONFIG ??= " \ @@ -29,12 +27,14 @@ PACKAGECONFIG ??= " \ python \ crypto-builtin \ " -PACKAGECONFIG[manpages] = "--enable-documentation, --disable-documentation, asciidoc-native xmlto-native" +PACKAGECONFIG[manpages] = "--enable-documentation, --disable-documentation, python3-sphinx-native python3-sphinx-rtd-theme-native" PACKAGECONFIG[programs] = "--enable-programs,--disable-programs" PACKAGECONFIG[convert] = "--enable-convert --with-convert=ext2,--disable-convert --without-convert,e2fsprogs" PACKAGECONFIG[zoned] = "--enable-zoned,--disable-zoned" PACKAGECONFIG[python] = "--enable-python,--disable-python,python3-setuptools-native" +PACKAGECONFIG[lzo] = "--enable-lzo,--disable-lzo,lzo" PACKAGECONFIG[zstd] = "--enable-zstd,--disable-zstd,zstd" +PACKAGECONFIG[udev] = "--enable-libudev,--disable-libudev,udev" # Pick only one crypto provider PACKAGECONFIG[crypto-builtin] = "--with-crypto=builtin" @@ -43,7 +43,7 @@ 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)} +inherit_defer ${@bb.utils.contains('PACKAGECONFIG', 'python', 'setuptools3-base', '', d)} CLEANBROKEN = "1" |