summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2016-06-03 12:14:45 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-04 14:13:33 +0100
commit88ac05912ca91fc62206afc490d700e85db1c27f (patch)
tree530e621b517ec9fbf46ae6cd40eb6dbd95ae255b
parentf6f7db7c2ab409abab0e7a2f9d36a35419e76076 (diff)
downloadpoky-88ac05912ca91fc62206afc490d700e85db1c27f.tar.gz
btrfs-tools: update to 4.5.3
Drop fix-symlink-creation-multiple-times.patch (merged upstream). (From OE-Core rev: 531b6173893ab5cbe163a071a5fea0ae39c81cbf) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-symlink-creation-multiple-times.patch46
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools_4.5.3.bb (renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_4.4.bb)3
2 files changed, 1 insertions, 48 deletions
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-symlink-creation-multiple-times.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-symlink-creation-multiple-times.patch
deleted file mode 100644
index a945496399..0000000000
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-symlink-creation-multiple-times.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1From 05ab78e9183575e38f342e05a056cb7bcd1e52e1 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Thu, 18 Feb 2016 20:41:28 -0500
4Subject: [PATCH] btrfs-progs: fix symlink creation multiple times
5
6The rule to create symlink in Makefile caused parallel issue:
7$ make -j 40 DESTDIR=/image install BUILD_VERBOSE=1
8...
9 1 [LN] libbtrfs.so.0
10 2 [LN] libbtrfs.so
11 3 ln -s -f libbtrfs.so.0.1 libbtrfs.so.0
12 4 ln -s -f libbtrfs.so.0.1 libbtrfs.so.0
13 5 ln -s -f libbtrfs.so.0.1 libbtrfs.so
14 6 ln -s -f libbtrfs.so.0.1 libbtrfs.so
15...
16
17It failed occasionally:
18...
19|symlinkat: couldn't stat 'git/libbtrfs.so' even though symlink
20creation succeeded (No such file or directory).
21|ln: failed to create symbolic link 'libbtrfs.so': No such file or directory
22...
23
24Upstream-Status: Submitted [linux-btrfs@vger.kernel.org]
25Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
26---
27 Makefile.in | 3 +--
28 1 file changed, 1 insertion(+), 2 deletions(-)
29
30diff --git a/Makefile.in b/Makefile.in
31index 1f4002e..16eeaf9 100644
32--- a/Makefile.in
33+++ b/Makefile.in
34@@ -236,8 +236,7 @@ $(libs_static): $(libbtrfs_objects)
35
36 $(lib_links):
37 @echo " [LN] $@"
38- $(Q)$(LN_S) -f libbtrfs.so.0.1 libbtrfs.so.0
39- $(Q)$(LN_S) -f libbtrfs.so.0.1 libbtrfs.so
40+ $(Q)$(LN_S) -f libbtrfs.so.0.1 $@
41
42 # keep intermediate files from the below implicit rules around
43 .PRECIOUS: $(addsuffix .o,$(progs))
44--
451.9.1
46
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.4.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.5.3.bb
index 32e7bae587..50fe66ea74 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.4.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.5.3.bb
@@ -13,10 +13,9 @@ SECTION = "base"
13DEPENDS = "util-linux attr e2fsprogs lzo acl" 13DEPENDS = "util-linux attr e2fsprogs lzo acl"
14RDEPENDS_${PN} = "libgcc" 14RDEPENDS_${PN} = "libgcc"
15 15
16SRCREV = "21258fab2caeade405a15ba932d373b364aa6e8c" 16SRCREV = "b72438362b2dbce880cefe9427ffe0947a94e060"
17SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ 17SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
18 file://fix-parallel.patch \ 18 file://fix-parallel.patch \
19 file://fix-symlink-creation-multiple-times.patch \
20" 19"
21 20
22inherit autotools-brokensep pkgconfig 21inherit autotools-brokensep pkgconfig