summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-03-08 14:35:58 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-03-11 11:44:29 +0000
commit24585a3b8ebb15ed8f88738076eefc8e3211bce1 (patch)
tree82b59d0ab032a17dded04aa4ce6b26a232cfc8c0
parent071fa6a13d91a72d5641b533b1bb1cddc85c656b (diff)
downloadpoky-24585a3b8ebb15ed8f88738076eefc8e3211bce1.tar.gz
coreutils: Fix -dev package dependencies
The new ptest dependencies present some challenges, in particular libmodule-build-perl which effectively depends on gcc. In multilib images, this results in both libXX-gcc-symlinks and libYY-gcc-symlinks being installed which conflict. This also makes little sense. The easiest way to fix this is to disable the automatic -dev package dependencies and manually specify the correct ones. (From OE-Core rev: 5463971d45b21512210cf20f3902baf95eacd4c6) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/coreutils/coreutils_8.31.bb4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/recipes-core/coreutils/coreutils_8.31.bb b/meta/recipes-core/coreutils/coreutils_8.31.bb
index cba0bfe15c..eac016319e 100644
--- a/meta/recipes-core/coreutils/coreutils_8.31.bb
+++ b/meta/recipes-core/coreutils/coreutils_8.31.bb
@@ -149,6 +149,10 @@ inherit ptest
149 149
150RDEPENDS_${PN}-ptest += "bash findutils gawk liberror-perl libmodule-build-perl make perl perl-module-file-stat python3-core sed shadow" 150RDEPENDS_${PN}-ptest += "bash findutils gawk liberror-perl libmodule-build-perl make perl perl-module-file-stat python3-core sed shadow"
151 151
152# -dev automatic dependencies fails as we don't want libmodule-build-perl-dev, its too heavy
153RRECOMMENDS_coreutils-dev[nodeprrecs] = "1"
154RRECOMMENDS_coreutils-dev = "acl-dev attr-dev gmp-dev libcap-dev bash-dev findutils-dev gawk-dev shadow-dev"
155
152do_install_ptest () { 156do_install_ptest () {
153 install -d ${D}${PTEST_PATH}/tests 157 install -d ${D}${PTEST_PATH}/tests
154 cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests 158 cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests