diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2016-08-17 14:31:25 -0500 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2016-08-22 16:43:26 +0000 |
commit | 60f9d69e016b11c468c98ea75ba0a60c44afbbc4 (patch) | |
tree | ecb49581a9e41a37943c22cd9ef3f63451b20ee7 /import-layers/yocto-poky/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-symlink-creation-multiple-times.patch | |
parent | e18c61205e0234b03697129c20cc69c9b3940efc (diff) | |
download | blackbird-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.tar.gz blackbird-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.zip |
yocto-poky: Move to import-layers subdir
We are going to import additional layers, so create a subdir to
hold all of the layers that we import with git-subtree.
Change-Id: I6f732153a22be8ca663035c518837e3cc5ec0799
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-symlink-creation-multiple-times.patch')
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-symlink-creation-multiple-times.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-symlink-creation-multiple-times.patch b/import-layers/yocto-poky/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-symlink-creation-multiple-times.patch new file mode 100644 index 000000000..a94549639 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-symlink-creation-multiple-times.patch @@ -0,0 +1,46 @@ +From 05ab78e9183575e38f342e05a056cb7bcd1e52e1 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Thu, 18 Feb 2016 20:41:28 -0500 +Subject: [PATCH] btrfs-progs: fix symlink creation multiple times + +The rule to create symlink in Makefile caused parallel issue: +$ make -j 40 DESTDIR=/image install BUILD_VERBOSE=1 +... + 1 [LN] libbtrfs.so.0 + 2 [LN] libbtrfs.so + 3 ln -s -f libbtrfs.so.0.1 libbtrfs.so.0 + 4 ln -s -f libbtrfs.so.0.1 libbtrfs.so.0 + 5 ln -s -f libbtrfs.so.0.1 libbtrfs.so + 6 ln -s -f libbtrfs.so.0.1 libbtrfs.so +... + +It failed occasionally: +... +|symlinkat: couldn't stat 'git/libbtrfs.so' even though symlink +creation succeeded (No such file or directory). +|ln: failed to create symbolic link 'libbtrfs.so': No such file or directory +... + +Upstream-Status: Submitted [linux-btrfs@vger.kernel.org] +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + Makefile.in | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 1f4002e..16eeaf9 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -236,8 +236,7 @@ $(libs_static): $(libbtrfs_objects) + + $(lib_links): + @echo " [LN] $@" +- $(Q)$(LN_S) -f libbtrfs.so.0.1 libbtrfs.so.0 +- $(Q)$(LN_S) -f libbtrfs.so.0.1 libbtrfs.so ++ $(Q)$(LN_S) -f libbtrfs.so.0.1 $@ + + # keep intermediate files from the below implicit rules around + .PRECIOUS: $(addsuffix .o,$(progs)) +-- +1.9.1 + |