From 35bd7de678223f48443bddbeed4f4640534805a4 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 19 Jun 2019 15:24:49 +0200 Subject: [PATCH] btrfs-tools: update to 5.1.1 Drop backported patch, and a patch where upstream took care of the issue. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...DFLAGS-when-building-libbtrfsutil.so.patch | 26 ----------- ...gs-Pass-CFLAGS-and-LDFLAGS-to-Python.patch | 43 ------------------- ...trfs-tools_5.1.bb => btrfs-tools_5.1.1.bb} | 4 +- 3 files changed, 1 insertion(+), 72 deletions(-) delete mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Add-LDFLAGS-when-building-libbtrfsutil.so.patch delete mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/0003-btrfs-progs-Pass-CFLAGS-and-LDFLAGS-to-Python.patch rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_5.1.bb => btrfs-tools_5.1.1.bb} (89%) diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Add-LDFLAGS-when-building-libbtrfsutil.so.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Add-LDFLAGS-when-building-libbtrfsutil.so.patch deleted file mode 100644 index e23be32599..0000000000 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Add-LDFLAGS-when-building-libbtrfsutil.so.patch +++ /dev/null @@ -1,26 +0,0 @@ -From c384fa875c5128009ac8b6ba11a54a6bd4de575a Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Thu, 17 May 2018 12:21:31 +0300 -Subject: [PATCH] Add LDFLAGS when building libbtrfsutil.so and python - bindings. - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin - ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index e25e256f..6df00186 100644 ---- a/Makefile -+++ b/Makefile -@@ -424,7 +424,7 @@ libbtrfsutil/%.o: libbtrfsutil/%.c - - libbtrfsutil.so.$(libbtrfsutil_version): $(libbtrfsutil_objects) - @echo " [LD] $@" -- $(Q)$(CC) $(LIBBTRFSUTIL_CFLAGS) $(libbtrfsutil_objects) \ -+ $(Q)$(CC) $(LIBBTRFSUTIL_CFLAGS) $(LDFLAGS) $(libbtrfsutil_objects) \ - -shared -Wl,-soname,libbtrfsutil.so.$(libbtrfsutil_major) -o $@ - - libbtrfsutil.a: $(libbtrfsutil_objects) diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0003-btrfs-progs-Pass-CFLAGS-and-LDFLAGS-to-Python.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0003-btrfs-progs-Pass-CFLAGS-and-LDFLAGS-to-Python.patch deleted file mode 100644 index f69507164c..0000000000 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0003-btrfs-progs-Pass-CFLAGS-and-LDFLAGS-to-Python.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 730fe2ee2fb9e08cbe885f370afe83fecb18d048 Mon Sep 17 00:00:00 2001 -From: Joshua Watt -Date: Sun, 26 May 2019 21:26:04 -0500 -Subject: [PATCH] btrfs-progs: Pass CFLAGS and LDFLAGS to Python - -Adds Make variables EXTRA_PYTHON_CFLAGS and EXTRA_PYTHON_LDFLAGS which -can be used to pass CFLAGS and LDFLAGS respectively when building the -Python library. - -This is required to support reproducible builds, as there are often -compiler and linker flags that must be passed in order to generate -reproducible output (e.g. -fdebug-prefix-map) - -Signed-off-by: Joshua Watt -Upstream-Status: Accepted [https://github.com/kdave/btrfs-progs/pull/176] ---- - Makefile | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 505bd9c1..814767a8 100644 ---- a/Makefile -+++ b/Makefile -@@ -24,6 +24,10 @@ - # DEBUG_CFLAGS additional compiler flags for debugging build - # EXTRA_CFLAGS additional compiler flags - # EXTRA_LDFLAGS additional linker flags -+# EXTRA_PYTHON_CFLAGS additional compiler flags to pass when building Python -+# library -+# EXTRA_PYTHON_LDFLAGS additional linker flags to pass when building Python -+# library - # - # Testing-specific options (see also tests/README.md): - # TEST=GLOB run test(s) from directories matching GLOB -@@ -439,7 +443,7 @@ ifeq ($(PYTHON_BINDINGS),1) - libbtrfsutil_python: libbtrfsutil.so.$(libbtrfsutil_major) libbtrfsutil.so libbtrfsutil/btrfsutil.h - @echo " [PY] libbtrfsutil" - $(Q)cd libbtrfsutil/python; \ -- CFLAGS= LDFLAGS= $(PYTHON) setup.py $(SETUP_PY_Q) build_ext -i build -+ CFLAGS="$(EXTRA_PYTHON_CFLAGS)" LDFLAGS="$(EXTRA_PYTHON_LDFLAGS)" $(PYTHON) setup.py $(SETUP_PY_Q) build_ext -i build - - .PHONY: libbtrfsutil_python - endif diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.1.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.1.1.bb similarity index 89% rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_5.1.bb rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_5.1.1.bb index 89cc1bfe20..2cd99706b4 100644 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.1.bb +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.1.1.bb @@ -14,11 +14,9 @@ DEPENDS = "util-linux attr e2fsprogs lzo acl python3-setuptools-native" DEPENDS_append_class-target = " udev" RDEPENDS_${PN} = "libgcc" -SRCREV = "43013422dbce4bcc9ed77cfe65b294caa0985ec8" +SRCREV = "781e36a784faa58a4f0515eef124af860d59e2c0" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ - file://0001-Add-LDFLAGS-when-building-libbtrfsutil.so.patch \ file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \ - file://0003-btrfs-progs-Pass-CFLAGS-and-LDFLAGS-to-Python.patch \ " inherit autotools-brokensep pkgconfig manpages distutils3-base -- 2.40.1