From 2c544a2241652e6b957a08ca54ab48c178281604 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Wed, 30 Jan 2019 18:21:29 +0100 Subject: [PATCH] meta-digi: remove initscript package dependencies when systemd is enabled Otherwise, there will be errors due to missing dependencies. https://jira.digi.com/browse/DEL-6415 Signed-off-by: Gabriel Valcazar --- .../packagegroups/packagegroup-dey-network.bb | 2 +- .../recipes-core/packagegroups/packagegroup-dey-core.bb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-network.bb b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-network.bb index 1f3abb010..8805a8140 100644 --- a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-network.bb +++ b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-network.bb @@ -33,5 +33,5 @@ RDEPENDS_${PN} = "\ ${VIRTUAL-RUNTIME_http-server} \ ${VIRTUAL-RUNTIME_network-utils} \ ${VIRTUAL-RUNTIME_snmp-manager} \ - ${VIRTUAL-RUNTIME_ntp-client} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', '${VIRTUAL-RUNTIME_ntp-client}', d)} \ " diff --git a/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb b/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb index 5d1c1b346..bb324daaa 100644 --- a/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb +++ b/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb @@ -35,7 +35,7 @@ RDEPENDS_${PN} = "\ base-passwd \ cloudconnector \ ${@bb.utils.contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \ - ${@bb.utils.contains("MACHINE_FEATURES", "rtc", "${VIRTUAL-RUNTIME_base-utils-hwclock}", "", d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', bb.utils.contains("MACHINE_FEATURES", "rtc", "${VIRTUAL-RUNTIME_base-utils-hwclock}", "", d), d)} \ ${@bb.utils.contains("MACHINE_FEATURES", "touchscreen", "${VIRTUAL-RUNTIME_touchscreen}", "",d)} \ init-ifupdown \ libdigiapix \ @@ -47,7 +47,7 @@ RDEPENDS_${PN} = "\ sysinfo \ usbutils \ ${VIRTUAL-RUNTIME_base-utils} \ - ${VIRTUAL-RUNTIME_base-utils-acpid} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', '${VIRTUAL-RUNTIME_base-utils-acpid}', d)} \ ${VIRTUAL-RUNTIME_dev_manager} \ ${VIRTUAL-RUNTIME_init_manager} \ ${VIRTUAL-RUNTIME_initscripts} \