summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2019-04-12 18:14:47 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-09 16:31:56 +0100
commit310a958fb3e38e4f2b4a99648cbc9ffaf5628184 (patch)
tree914261727f790d42847300ef4a582685a013895b /meta/recipes-core/systemd
parent541ff15c2212d2fd4f2df7327054e62199f487d3 (diff)
downloadpoky-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/systemd')
-rw-r--r--meta/recipes-core/systemd/systemd_242.bb3
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"
144PACKAGECONFIG[machined] = "-Dmachined=true,-Dmachined=false" 144PACKAGECONFIG[machined] = "-Dmachined=true,-Dmachined=false"
145PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxslt-native xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" 145PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxslt-native xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
146PACKAGECONFIG[microhttpd] = "-Dmicrohttpd=true,-Dmicrohttpd=false,libmicrohttpd" 146PACKAGECONFIG[microhttpd] = "-Dmicrohttpd=true,-Dmicrohttpd=false,libmicrohttpd"
147PACKAGECONFIG[myhostname] = "-Dnss-myhostname=true,-Dnss-myhostname=false" 147PACKAGECONFIG[myhostname] = "-Dnss-myhostname=true,-Dnss-myhostname=false,,libnss-myhostname"
148PACKAGECONFIG[networkd] = "-Dnetworkd=true,-Dnetworkd=false" 148PACKAGECONFIG[networkd] = "-Dnetworkd=true,-Dnetworkd=false"
149PACKAGECONFIG[nss] = "-Dnss-systemd=true,-Dnss-systemd=false" 149PACKAGECONFIG[nss] = "-Dnss-systemd=true,-Dnss-systemd=false"
150PACKAGECONFIG[nss-mymachines] = "-Dnss-mymachines=true,-Dnss-mymachines=false" 150PACKAGECONFIG[nss-mymachines] = "-Dnss-mymachines=true,-Dnss-mymachines=false"
@@ -553,7 +553,6 @@ FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ $
553RDEPENDS_${PN} += "kmod dbus util-linux-mount util-linux-umount udev (= ${EXTENDPKGV}) util-linux-agetty util-linux-fsck" 553RDEPENDS_${PN} += "kmod dbus util-linux-mount util-linux-umount udev (= ${EXTENDPKGV}) util-linux-agetty util-linux-fsck"
554RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', '', 'systemd-serialgetty', d)}" 554RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', '', 'systemd-serialgetty', d)}"
555RDEPENDS_${PN} += "volatile-binds update-rc.d" 555RDEPENDS_${PN} += "volatile-binds update-rc.d"
556RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'myhostname', 'libnss-myhostname', '', d)}"
557 556
558RRECOMMENDS_${PN} += "systemd-extra-utils \ 557RRECOMMENDS_${PN} += "systemd-extra-utils \
559 systemd-compat-units udev-hwdb \ 558 systemd-compat-units udev-hwdb \