diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-06-24 23:48:09 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-06-28 23:49:35 +0100 |
| commit | 6f28420ab0e8f2ab5eb06326024777a40aded0a6 (patch) | |
| tree | 6e0559772934df8d9ce2838caad4f8becba73490 | |
| parent | a5b381c0f45c590a762647a9956a8f41e2e2315e (diff) | |
| download | openembedded-core-6f28420ab0e8f2ab5eb06326024777a40aded0a6.tar.gz | |
bitbake.conf: Change -dev RDEPENDS to RRECOMMENDS
Switch the default DEPENDS for ${PN}-dev to be a RRECOMMENDS instead. This
takes advantage of a change to complmentary package globbing to not follow
RRECOMMENDS and means and SDK for an image with both openssh and dropbear
compoments will now build successfully.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/conf/bitbake.conf | 2 | ||||
| -rw-r--r-- | meta/lib/oeqa/selftest/cases/oescripts.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 40a893fe1c..1d36aae8b3 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -350,7 +350,7 @@ FILES:${PN}-dev = "${includedir} ${FILES_SOLIBSDEV} ${libdir}/*.la \ SECTION:${PN}-dev = "devel" ALLOW_EMPTY:${PN}-dev = "1" DEV_PKG_DEPENDENCY = "${PN} (= ${EXTENDPKGV})" -RDEPENDS:${PN}-dev = "${DEV_PKG_DEPENDENCY}" +RRECOMMENDS:${PN}-dev = "${DEV_PKG_DEPENDENCY}" FILES:${PN}-staticdev = "${libdir}/*.a ${base_libdir}/*.a ${libdir}/${BPN}/*.a" SECTION:${PN}-staticdev = "devel" diff --git a/meta/lib/oeqa/selftest/cases/oescripts.py b/meta/lib/oeqa/selftest/cases/oescripts.py index bd84f151cb..d3a789a6a7 100644 --- a/meta/lib/oeqa/selftest/cases/oescripts.py +++ b/meta/lib/oeqa/selftest/cases/oescripts.py @@ -21,7 +21,7 @@ class BuildhistoryDiffTests(BuildhistoryBase): pkgv = result.output.rstrip() result = runCmd("buildhistory-diff -p %s" % get_bb_var('BUILDHISTORY_DIR')) expected_endlines = [ - "xcursor-transparent-theme-dev: RDEPENDS: removed \"xcursor-transparent-theme (['= %s-r1'])\", added \"xcursor-transparent-theme (['= %s-r0'])\"" % (pkgv, pkgv), + "xcursor-transparent-theme-dev: RRECOMMENDS: removed \"xcursor-transparent-theme (['= %s-r1'])\", added \"xcursor-transparent-theme (['= %s-r0'])\"" % (pkgv, pkgv), "xcursor-transparent-theme-staticdev: RDEPENDS: removed \"xcursor-transparent-theme-dev (['= %s-r1'])\", added \"xcursor-transparent-theme-dev (['= %s-r0'])\"" % (pkgv, pkgv) ] for line in result.output.splitlines(): |