btrfs-tools: upgrade 4.15.1 -> 4.16.1
PATCH 1/1 btrfs-tools: upgrade 4.15.1 -> 4.16.1
Drop upstreamed patch.
Add a patch to correctly set LDFLAGS for one of the libraries and Python bindings.
Add dependencies to build Python bindings
(directly inheriting setuptools3 class does not work, as the build is Makefile-managed) and a snippet to install them. Also add a patch to allow specifying where they are installed (to avoid hardcoded /usr/lib default).
Signed-off-by Alexander Kanavin <[email protected]>
---
...DFLAGS-when-building-libbtrfsutil.so.patch | 35 ++++++++++
...y-to-specify-where-python-modules-ar.patch | 25 +++++++
.../btrfs-tools/ftw-subdir-walk.patch | 69 -------------------
...-tools_4.15.1.bb => btrfs-tools_4.16.1.bb} | 13 ++--
4 files changed, 69 insertions(+), 73 deletions(-)
create mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Add-LDFLAGS-when-building-libbtrfsutil.so.patch
create mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Add-a-possibility-to-specify-where-python-modules-ar.patch
delete mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/ftw-subdir-walk.patch
rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_4.15.1.bb => btrfs-tools_4.16.1.bb} (72%)meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Add-LDFLAGS-when-building-libbtrfsutil.so.patch new file +35 -0
@@ -0,0 +1,35 @@ +From eecc48ecad359cd4fab650ce49cfe57e99d1859d Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +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 <[email protected]> + +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 10f0e3b0..1697794c 100644 +--- a/Makefile ++++ b/Makefile +@@ -402,7 +402,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) +@@ -417,7 +417,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= $(PYTHON) setup.py $(SETUP_PY_Q) build_ext -i build + + .PHONY: libbtrfsutil_python + endif
meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Add-a-possibility-to-specify-where-python-modules-ar.patch new file +25 -0
@@ -0,0 +1,25 @@ +From d3adfc21c9cc264bd191722f102963cbc4794259 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Wed, 23 May 2018 21:20:35 +0300 +Subject: [PATCH] Add a possibility to specify where python modules are + installed + +Upstream-Status: Inappropriate [oe-core specific to solve multilib use case] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 1697794c..8ab38818 100644 +--- a/Makefile ++++ b/Makefile +@@ -651,7 +651,7 @@ endif + ifeq ($(PYTHON_BINDINGS),1) + install_python: libbtrfsutil_python + $(Q)cd libbtrfsutil/python; \ +- $(PYTHON) setup.py install --skip-build $(if $(DESTDIR),--root $(DESTDIR)) --prefix $(prefix) ++ $(PYTHON) setup.py install --skip-build $(if $(DESTDIR),--root $(DESTDIR)) --prefix $(prefix) --install-lib=$(PYTHON_SITEPACKAGES_DIR) + + .PHONY: install_python + endif
meta/recipes-devtools/btrfs-tools/btrfs-tools/ftw-subdir-walk.patch deleted +0 -69
69 lines not on this page · raw message
meta/recipes-devtools/btrfs-tools/btrfs-tools_4.16.1.bb renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_4.15.1.bb +9 -4
@@ -10,17 +10,18 @@ HOMEPAGE = "https://btrfs.wiki.kernel.org" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=fcb02dc552a041dee27e4b85c7396067" SECTION = "base" -DEPENDS = "util-linux attr e2fsprogs lzo acl" +DEPENDS = "util-linux attr e2fsprogs lzo acl python3-setuptools-native" DEPENDS_append_class-target = " udev" RDEPENDS_${PN} = "libgcc" -SRCREV = "3097f02c948f69f520c565ff8f8ba476aa6edb88" +SRCREV = "f7fc27cb20924cc340a2a522655969253dd97ae9" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ file://0001-Makefile-build-mktables-using-native-gcc.patch \ - file://ftw-subdir-walk.patch \ + file://0001-Add-LDFLAGS-when-building-libbtrfsutil.so.patch \ + file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \ " -inherit autotools-brokensep pkgconfig manpages +inherit autotools-brokensep pkgconfig manpages distutils3-base CLEANBROKEN = "1"
@@ -36,4 +37,8 @@ do_configure_prepend() { S = "${WORKDIR}/git" +do_install_append() { + oe_runmake 'DESTDIR=${D}' 'PYTHON_SITEPACKAGES_DIR=${PYTHON_SITEPACKAGES_DIR}' install_python +} + BBCLASSEXTEND = "native"
Signature · 1 line
2.17.0