summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2016-02-16 15:06:05 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-18 07:39:29 +0000
commitfad63e3ab42d03f0802e8d772b3d28ba9e704ced (patch)
tree148416fde5e20c0de1a068efa8c81df2cd313d22 /meta
parent351039f21a3896a937eef2ca87c3e49e8a7a02ce (diff)
downloadpoky-fad63e3ab42d03f0802e8d772b3d28ba9e704ced.tar.gz
coreutils: fix problem with acl for 6.9 version
If 'acl' is not in DISTRO_FEATURES, building coreutils 6.9 would sometimes fail. The problem could be reproduced by executing the following command. `bitbake acl && bitbake coreutils -c configure && bitbake acl -c cleansstate && bitbake coreutils -c compile' Fix this problem by setting the correct value for the 'acl' PACKAGECONFIG. [YOCTO #8906] (From OE-Core rev: a9004ff3f8de83d22d9159a9f103e2773e927a0b) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/coreutils/coreutils-6.9/coreutils-build-with-acl.patch28
-rw-r--r--meta/recipes-core/coreutils/coreutils_6.9.bb3
2 files changed, 1 insertions, 30 deletions
diff --git a/meta/recipes-core/coreutils/coreutils-6.9/coreutils-build-with-acl.patch b/meta/recipes-core/coreutils/coreutils-6.9/coreutils-build-with-acl.patch
deleted file mode 100644
index 8273d78eb3..0000000000
--- a/meta/recipes-core/coreutils/coreutils-6.9/coreutils-build-with-acl.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3Fix the following issue so that coreutils can build with ACL:
4
5configure: WARNING: libacl development library was not found or not usable.
6configure: WARNING: GNU coreutils will be built without ACL support.
7
8Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
9---
10 m4/acl.m4 | 2 +-
11 1 files changed, 1 insertions(+), 1 deletions(-)
12
13diff --git a/m4/acl.m4 b/m4/acl.m4
14index d6a448a..a9d4836 100644
15--- a/m4/acl.m4
16+++ b/m4/acl.m4
17@@ -159,7 +159,7 @@ AC_DEFUN([gl_ACL_GET_FILE],
18 ]])],
19 [gl_cv_func_working_acl_get_file=yes],
20 [gl_cv_func_working_acl_get_file=no],
21- [gl_cv_func_working_acl_get_file=cross-compiling])])
22+ [gl_cv_func_working_acl_get_file=yes])])
23
24 AS_IF([test $gl_cv_func_working_acl_get_file = yes], [$1], [$2])
25 ])
26--
271.7.7
28
diff --git a/meta/recipes-core/coreutils/coreutils_6.9.bb b/meta/recipes-core/coreutils/coreutils_6.9.bb
index e9f82abc8b..9ce717d1aa 100644
--- a/meta/recipes-core/coreutils/coreutils_6.9.bb
+++ b/meta/recipes-core/coreutils/coreutils_6.9.bb
@@ -23,7 +23,6 @@ SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.bz2 \
23 file://coreutils-fix-install.patch \ 23 file://coreutils-fix-install.patch \
24 file://man-touch.patch \ 24 file://man-touch.patch \
25 file://coreutils_fix_for_automake-1.12.patch \ 25 file://coreutils_fix_for_automake-1.12.patch \
26 file://coreutils-build-with-acl.patch \
27 file://coreutils-fix-texinfo.patch \ 26 file://coreutils-fix-texinfo.patch \
28 file://fix_for_manpage_building.patch \ 27 file://fix_for_manpage_building.patch \
29 file://loadavg.patch \ 28 file://loadavg.patch \
@@ -41,7 +40,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}
41 40
42# with, without, depends, rdepends 41# with, without, depends, rdepends
43# 42#
44PACKAGECONFIG[acl] = "ac_cv_header_sys_acl_h=yes,ac_cv_header_sys_acl_h=no,acl," 43PACKAGECONFIG[acl] = "ac_cv_header_sys_acl_h=yes ac_cv_header_acl_libacl_h=yes ac_cv_search_acl_get_file=-lacl,ac_cv_header_sys_acl_h=no ac_cv_header_acl_libacl_h=no ac_cv_search_acl_get_file=,acl,"
45 44
46 45
47# [ gets a special treatment and is not included in this 46# [ gets a special treatment and is not included in this