diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-06-24 23:46:34 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-06-28 23:49:37 +0100 |
commit | 73cf55cdde1f3d2773b42f52d2fcf57665102c81 (patch) | |
tree | 0644cd947ff8c9d4e3917bc105fe296135059c15 /meta/recipes-core | |
parent | 4705dd264681d908f144dd4d9bf1f6175f68d8b9 (diff) | |
download | poky-73cf55cdde1f3d2773b42f52d2fcf57665102c81.tar.gz |
bitbake.conf/recipes: Introduce add DEV_PKG_DEPENDENCY to change RDEPENDS:${PN}-dev
There is a pattern that several recipes need to break the dependency of ${PN}-dev
on ${PN}, most often as ${PN} may be be empty. Add a new variable to parameterise
this and allow it to be changed more easily.
(From OE-Core rev: a5b381c0f45c590a762647a9956a8f41e2e2315e)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/glibc/glibc-package.inc | 2 | ||||
-rw-r--r-- | meta/recipes-core/musl/bsd-headers.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/musl/libssp-nonshared.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/newlib/newlib_4.2.0.bb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index 7f9e7503a1..278e1b7cc1 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc | |||
@@ -40,7 +40,7 @@ FILES:${PN}-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/*.o" | |||
40 | FILES:libsotruss = "${libdir}/audit/sotruss-lib.so" | 40 | FILES:libsotruss = "${libdir}/audit/sotruss-lib.so" |
41 | FILES_SOLIBSDEV = "${libdir}/lib*${SOLIBSDEV}" | 41 | FILES_SOLIBSDEV = "${libdir}/lib*${SOLIBSDEV}" |
42 | FILES:${PN}-dev += "${libdir}/libpthread.a ${libdir}/libdl.a ${libdir}/libutil.a ${libdir}/libanl.a ${libdir}/*_nonshared.a ${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal" | 42 | FILES:${PN}-dev += "${libdir}/libpthread.a ${libdir}/libdl.a ${libdir}/libutil.a ${libdir}/libanl.a ${libdir}/*_nonshared.a ${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal" |
43 | RDEPENDS:${PN}-dev = "linux-libc-headers-dev" | 43 | DEV_PKG_DEPENDENCY = "linux-libc-headers-dev" |
44 | FILES:${PN}-staticdev += "${libdir}/*.a ${base_libdir}/*.a" | 44 | FILES:${PN}-staticdev += "${libdir}/*.a ${base_libdir}/*.a" |
45 | FILES:nscd = "${sbindir}/nscd* ${sysconfdir}/init.d/nscd ${systemd_system_unitdir}/nscd* ${sysconfdir}/tmpfiles.d/nscd.conf \ | 45 | FILES:nscd = "${sbindir}/nscd* ${sysconfdir}/init.d/nscd ${systemd_system_unitdir}/nscd* ${sysconfdir}/tmpfiles.d/nscd.conf \ |
46 | ${sysconfdir}/nscd.conf ${sysconfdir}/default/volatiles/98_nscd ${localstatedir}/db/nscd" | 46 | ${sysconfdir}/nscd.conf ${sysconfdir}/default/volatiles/98_nscd ${localstatedir}/db/nscd" |
diff --git a/meta/recipes-core/musl/bsd-headers.bb b/meta/recipes-core/musl/bsd-headers.bb index cf8af0da3c..887a816031 100644 --- a/meta/recipes-core/musl/bsd-headers.bb +++ b/meta/recipes-core/musl/bsd-headers.bb | |||
@@ -27,5 +27,5 @@ do_install() { | |||
27 | # | 27 | # |
28 | 28 | ||
29 | COMPATIBLE_HOST = ".*-musl.*" | 29 | COMPATIBLE_HOST = ".*-musl.*" |
30 | RDEPENDS:${PN}-dev = "" | 30 | DEV_PKG_DEPENDENCY = "" |
31 | RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" | 31 | RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" |
diff --git a/meta/recipes-core/musl/libssp-nonshared.bb b/meta/recipes-core/musl/libssp-nonshared.bb index 748dacf312..3faf8f00c3 100644 --- a/meta/recipes-core/musl/libssp-nonshared.bb +++ b/meta/recipes-core/musl/libssp-nonshared.bb | |||
@@ -31,5 +31,5 @@ do_install() { | |||
31 | # | 31 | # |
32 | COMPATIBLE_HOST = ".*-musl.*" | 32 | COMPATIBLE_HOST = ".*-musl.*" |
33 | RDEPENDS:${PN}-staticdev = "" | 33 | RDEPENDS:${PN}-staticdev = "" |
34 | RDEPENDS:${PN}-dev = "" | 34 | DEV_PKG_DEPENDENCY = "" |
35 | RRECOMMENDS:${PN}-dbg = "${PN}-staticdev (= ${EXTENDPKGV})" | 35 | RRECOMMENDS:${PN}-dbg = "${PN}-staticdev (= ${EXTENDPKGV})" |
diff --git a/meta/recipes-core/newlib/newlib_4.2.0.bb b/meta/recipes-core/newlib/newlib_4.2.0.bb index 0542c596ba..fb922d65d1 100644 --- a/meta/recipes-core/newlib/newlib_4.2.0.bb +++ b/meta/recipes-core/newlib/newlib_4.2.0.bb | |||
@@ -17,4 +17,4 @@ do_install:append() { | |||
17 | } | 17 | } |
18 | 18 | ||
19 | # No rpm package is actually created but -dev depends on it, avoid dnf error | 19 | # No rpm package is actually created but -dev depends on it, avoid dnf error |
20 | RDEPENDS:${PN}-dev:libc-newlib = "" | 20 | DEV_PKG_DEPENDENCY:libc-newlib = "" |