summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2017-04-18 01:33:20 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-04-19 10:18:43 +0100
commitf81c0de90564a7172bcd206b93abd55bba96b0dc (patch)
tree70e928e1ef3c75d53d19f8dc3b6c325118dd55e4
parent567329b56689f3cb9f2649cb52734f093eb85eac (diff)
downloadpoky-f81c0de90564a7172bcd206b93abd55bba96b0dc.tar.gz
acl: fix race issue when do_compile
Fixed race issue: In file included from acl_copy_entry.c:22:0: libacl.h:19:21: fatal error: sys/acl.h: No such file or directory #include <sys/acl.h> [snip] compilation terminated. acl_get_file.c:27:24: fatal error: acl/libacl.h: No such file or directory #include <acl/libacl.h> ^ The acl.h is in "include" directory, and include/Makefile creates symlink "sys" and "acl" poinst to current dirctory: $ ls include/ -l acl -> . sys -> . So if "libacl" target runs before "include", the error would happen since no "acl" or "sys" directory. Let libacl depend on include can fix the problem. [YOCTO #11349] (From OE-Core rev: 73d3d81fcdb92dd85c6ad1609e3a6eb20f1ea539) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/attr/acl/Makefile-libacl-should-depend-on-include.patch51
-rw-r--r--meta/recipes-support/attr/acl_2.2.52.bb4
2 files changed, 54 insertions, 1 deletions
diff --git a/meta/recipes-support/attr/acl/Makefile-libacl-should-depend-on-include.patch b/meta/recipes-support/attr/acl/Makefile-libacl-should-depend-on-include.patch
new file mode 100644
index 0000000000..4c7cba3b88
--- /dev/null
+++ b/meta/recipes-support/attr/acl/Makefile-libacl-should-depend-on-include.patch
@@ -0,0 +1,51 @@
1From d82457ce5ca7455e336da5e244d95f90e52aaef8 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Tue, 18 Apr 2017 01:17:26 -0700
4Subject: [PATCH] Makefile: libacl should depend on include
5
6Fixed race issue:
7 In file included from acl_copy_entry.c:22:0:
8 libacl.h:19:21: fatal error: sys/acl.h: No such file or directory
9 #include <sys/acl.h>
10
11[snip]
12
13 compilation terminated.
14 acl_get_file.c:27:24: fatal error: acl/libacl.h: No such file or directory
15 #include <acl/libacl.h>
16 ^
17
18The acl.h is in "include" directory, and include/Makefile creates
19symlink "sys" and "acl" poinst to current dirctory:
20$ ls include/ -l
21acl -> .
22sys -> .
23
24So if "libacl" target runs before "include", the error would happen
25since no "acl" or "sys" directory.
26
27Let libacl depend on include can fix the problem.
28
29Upstream-Status: Pending
30
31Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
32---
33 Makefile | 2 +-
34 1 file changed, 1 insertion(+), 1 deletion(-)
35
36diff --git a/Makefile b/Makefile
37index dce32d3..8a79379 100644
38--- a/Makefile
39+++ b/Makefile
40@@ -48,7 +48,7 @@ else
41 endif
42
43 # tool/lib dependencies
44-libacl: libmisc
45+libacl: include libmisc
46 getfacl setfacl chacl: libacl
47
48 ifeq ($(HAVE_BUILDDEFS), yes)
49--
502.10.2
51
diff --git a/meta/recipes-support/attr/acl_2.2.52.bb b/meta/recipes-support/attr/acl_2.2.52.bb
index 9ab5853d53..306c7b5cda 100644
--- a/meta/recipes-support/attr/acl_2.2.52.bb
+++ b/meta/recipes-support/attr/acl_2.2.52.bb
@@ -16,7 +16,9 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/acl/${BP}.src.tar.gz \
16 file://acl-fix-the-order-of-expected-output-of-getfacl.patch \ 16 file://acl-fix-the-order-of-expected-output-of-getfacl.patch \
17 file://test-fix-insufficient-quoting-of.patch \ 17 file://test-fix-insufficient-quoting-of.patch \
18 file://test-fixups-on-SELinux-machines-for-root-testcases.patch \ 18 file://test-fixups-on-SELinux-machines-for-root-testcases.patch \
19 file://test-fix-directory-permissions.patch" 19 file://test-fix-directory-permissions.patch \
20 file://Makefile-libacl-should-depend-on-include.patch \
21"
20 22
21SRC_URI[md5sum] = "a61415312426e9c2212bd7dc7929abda" 23SRC_URI[md5sum] = "a61415312426e9c2212bd7dc7929abda"
22SRC_URI[sha256sum] = "179074bb0580c06c4b4137be4c5a92a701583277967acdb5546043c7874e0d23" 24SRC_URI[sha256sum] = "179074bb0580c06c4b4137be4c5a92a701583277967acdb5546043c7874e0d23"