diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2019-04-12 18:14:47 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-09 16:31:56 +0100 |
commit | 310a958fb3e38e4f2b4a99648cbc9ffaf5628184 (patch) | |
tree | 914261727f790d42847300ef4a582685a013895b /meta/recipes-core | |
parent | 541ff15c2212d2fd4f2df7327054e62199f487d3 (diff) | |
download | poky-310a958fb3e38e4f2b4a99648cbc9ffaf5628184.tar.gz |
systemd: Use PACKAGECONFIG definition to depend on libnss-myhostname
Rather than adding the dependency on libnss-myhostname to
RDEPENDS_${PN} if the myhostname PACKAGECONFIG is set, add the runtime
dependency to myhostname's PACKAGECONFIG definition.
(From OE-Core rev: e107feab1734d5751ea0d94ca6dbccc059709b55)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/systemd/systemd_242.bb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/recipes-core/systemd/systemd_242.bb b/meta/recipes-core/systemd/systemd_242.bb index 3012f20b11..c7ccd1f99b 100644 --- a/meta/recipes-core/systemd/systemd_242.bb +++ b/meta/recipes-core/systemd/systemd_242.bb | |||
@@ -144,7 +144,7 @@ PACKAGECONFIG[lz4] = "-Dlz4=true,-Dlz4=false,lz4" | |||
144 | PACKAGECONFIG[machined] = "-Dmachined=true,-Dmachined=false" | 144 | PACKAGECONFIG[machined] = "-Dmachined=true,-Dmachined=false" |
145 | PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxslt-native xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" | 145 | PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxslt-native xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" |
146 | PACKAGECONFIG[microhttpd] = "-Dmicrohttpd=true,-Dmicrohttpd=false,libmicrohttpd" | 146 | PACKAGECONFIG[microhttpd] = "-Dmicrohttpd=true,-Dmicrohttpd=false,libmicrohttpd" |
147 | PACKAGECONFIG[myhostname] = "-Dnss-myhostname=true,-Dnss-myhostname=false" | 147 | PACKAGECONFIG[myhostname] = "-Dnss-myhostname=true,-Dnss-myhostname=false,,libnss-myhostname" |
148 | PACKAGECONFIG[networkd] = "-Dnetworkd=true,-Dnetworkd=false" | 148 | PACKAGECONFIG[networkd] = "-Dnetworkd=true,-Dnetworkd=false" |
149 | PACKAGECONFIG[nss] = "-Dnss-systemd=true,-Dnss-systemd=false" | 149 | PACKAGECONFIG[nss] = "-Dnss-systemd=true,-Dnss-systemd=false" |
150 | PACKAGECONFIG[nss-mymachines] = "-Dnss-mymachines=true,-Dnss-mymachines=false" | 150 | PACKAGECONFIG[nss-mymachines] = "-Dnss-mymachines=true,-Dnss-mymachines=false" |
@@ -553,7 +553,6 @@ FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ $ | |||
553 | RDEPENDS_${PN} += "kmod dbus util-linux-mount util-linux-umount udev (= ${EXTENDPKGV}) util-linux-agetty util-linux-fsck" | 553 | RDEPENDS_${PN} += "kmod dbus util-linux-mount util-linux-umount udev (= ${EXTENDPKGV}) util-linux-agetty util-linux-fsck" |
554 | RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', '', 'systemd-serialgetty', d)}" | 554 | RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', '', 'systemd-serialgetty', d)}" |
555 | RDEPENDS_${PN} += "volatile-binds update-rc.d" | 555 | RDEPENDS_${PN} += "volatile-binds update-rc.d" |
556 | RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'myhostname', 'libnss-myhostname', '', d)}" | ||
557 | 556 | ||
558 | RRECOMMENDS_${PN} += "systemd-extra-utils \ | 557 | RRECOMMENDS_${PN} += "systemd-extra-utils \ |
559 | systemd-compat-units udev-hwdb \ | 558 | systemd-compat-units udev-hwdb \ |