summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/coreutils/coreutils_9.7.bb12
1 files changed, 3 insertions, 9 deletions
diff --git a/meta/recipes-core/coreutils/coreutils_9.7.bb b/meta/recipes-core/coreutils/coreutils_9.7.bb
index 091e1ea2c5..dc9dfae26b 100644
--- a/meta/recipes-core/coreutils/coreutils_9.7.bb
+++ b/meta/recipes-core/coreutils/coreutils_9.7.bb
@@ -74,11 +74,6 @@ RDEPENDS:coreutils:class-target += "${@bb.utils.contains('PACKAGECONFIG', 'singl
74# regardless of whether single-binary is in effect. 74# regardless of whether single-binary is in effect.
75RPROVIDES:coreutils += "${@bb.utils.contains('PACKAGECONFIG', 'single-binary', 'coreutils-stdbuf', '', d)}" 75RPROVIDES:coreutils += "${@bb.utils.contains('PACKAGECONFIG', 'single-binary', 'coreutils-stdbuf', '', d)}"
76 76
77# put getlimits into coreutils-getlimits, because other ptest packages such as
78# findutils-ptest may need this command. Note that getlimits is a noinst_PROGRAM
79PACKAGE_BEFORE_PN:class-target += "${PN}-getlimits"
80FILES:${PN}-getlimits = "${bindir}/getlimits"
81
82# Deal with a separate builddir failure if src doesn't exist when creating version.c/version.h 77# Deal with a separate builddir failure if src doesn't exist when creating version.c/version.h
83do_compile:prepend () { 78do_compile:prepend () {
84 mkdir -p ${B}/src 79 mkdir -p ${B}/src
@@ -106,9 +101,6 @@ do_install:append() {
106 # in update-alternatives to fail, therefore use lbracket - the name used 101 # in update-alternatives to fail, therefore use lbracket - the name used
107 # for the actual source file. 102 # for the actual source file.
108 mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${BPN} 103 mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${BPN}
109
110 # this getlimits noinst_PROGRAM would possibly be needed by other ptest packages
111 install ${B}/src/getlimits ${D}/${bindir}
112} 104}
113 105
114inherit update-alternatives 106inherit update-alternatives
@@ -213,6 +205,7 @@ do_install_ptest () {
213 fi 205 fi
214 done 206 done
215 207
208 install ${B}/src/getlimits ${D}/${bindir}
216 # handle multilib 209 # handle multilib
217 sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest 210 sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest
218} 211}
@@ -224,6 +217,7 @@ do_install_ptest:append:libc-musl () {
224 sed -i -e '/tests\/split\/line-bytes.sh/d' ${D}${PTEST_PATH}/Makefile 217 sed -i -e '/tests\/split\/line-bytes.sh/d' ${D}${PTEST_PATH}/Makefile
225} 218}
226 219
227RDEPENDS:${PN}-ptest += "${PN}-getlimits xz \ 220RDEPENDS:${PN}-ptest += "xz \
228 ${@bb.utils.contains('PACKAGECONFIG', 'acl', 'acl', '', d)} \ 221 ${@bb.utils.contains('PACKAGECONFIG', 'acl', 'acl', '', d)} \
229 ${@bb.utils.contains('PACKAGECONFIG', 'xattr', 'attr', '', d)}" 222 ${@bb.utils.contains('PACKAGECONFIG', 'xattr', 'attr', '', d)}"
223FILES:${PN}-ptest += "${bindir}/getlimits"