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_6.14.bb (renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_6.8.1.bb) | 6 |
2 files changed, 5 insertions, 7 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 4b1797b65f..2cd66d2722 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 @@ | |||
1 | From 980f6edc269fa3ef8d4d4b9cd1aada2328131c19 Mon Sep 17 00:00:00 2001 | 1 | From 030ec81c0dac1e067faf49924d5631bb22ccc90d Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Wed, 23 May 2018 21:20:35 +0300 | 3 | Date: Wed, 23 May 2018 21:20:35 +0300 |
4 | Subject: [PATCH] Add a possibility to specify where python modules are | 4 | Subject: [PATCH] Add a possibility to specify where python modules are |
@@ -11,10 +11,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | 11 | 1 file changed, 1 insertion(+), 1 deletion(-) |
12 | 12 | ||
13 | diff --git a/Makefile b/Makefile | 13 | diff --git a/Makefile b/Makefile |
14 | index 374f59b9..ed083f6b 100644 | 14 | index 7e36aa42..edff7d5b 100644 |
15 | --- a/Makefile | 15 | --- a/Makefile |
16 | +++ b/Makefile | 16 | +++ b/Makefile |
17 | @@ -959,7 +959,7 @@ endif | 17 | @@ -996,7 +996,7 @@ endif |
18 | ifeq ($(PYTHON_BINDINGS),1) | 18 | ifeq ($(PYTHON_BINDINGS),1) |
19 | install_python: libbtrfsutil_python | 19 | install_python: libbtrfsutil_python |
20 | $(Q)cd libbtrfsutil/python; \ | 20 | $(Q)cd libbtrfsutil/python; \ |
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.8.1.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.14.bb index fac9f8f7ef..982d4830b5 100644 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.8.1.bb +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.14.bb | |||
@@ -15,11 +15,10 @@ LIC_FILES_CHKSUM = " \ | |||
15 | SECTION = "base" | 15 | SECTION = "base" |
16 | DEPENDS = "util-linux zlib" | 16 | DEPENDS = "util-linux zlib" |
17 | 17 | ||
18 | SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git;branch=master;protocol=https \ | 18 | SRC_URI = "git://github.com/kdave/btrfs-progs.git;branch=master;protocol=https;tag=v${PV} \ |
19 | file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \ | 19 | file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \ |
20 | " | 20 | " |
21 | SRCREV = "5d97c32d6f94cf6f473a5f82964e3edaeb1b146e" | 21 | SRCREV = "5ad147c9ec00e657393c85b195c9bcc0f4c35a54" |
22 | S = "${WORKDIR}/git" | ||
23 | 22 | ||
24 | PACKAGECONFIG ??= " \ | 23 | PACKAGECONFIG ??= " \ |
25 | programs \ | 24 | programs \ |
@@ -60,7 +59,6 @@ do_configure:prepend() { | |||
60 | cp -f $(automake --print-libdir)/install-sh ${S}/config/ | 59 | cp -f $(automake --print-libdir)/install-sh ${S}/config/ |
61 | } | 60 | } |
62 | 61 | ||
63 | |||
64 | do_install:append() { | 62 | do_install:append() { |
65 | if [ "${@bb.utils.filter('PACKAGECONFIG', 'python', d)}" ]; then | 63 | if [ "${@bb.utils.filter('PACKAGECONFIG', 'python', d)}" ]; then |
66 | oe_runmake 'DESTDIR=${D}' 'PYTHON_SITEPACKAGES_DIR=${PYTHON_SITEPACKAGES_DIR}' install_python | 64 | oe_runmake 'DESTDIR=${D}' 'PYTHON_SITEPACKAGES_DIR=${PYTHON_SITEPACKAGES_DIR}' install_python |