From 116fb5e203172fba6101fa57c82704ffb77f428d Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Thu, 11 Nov 2021 14:05:41 +0100 Subject: [PATCH] meta-digi-dey: append 'dey' distro override to PACKAGECONFIG_remove Some recipes were forcibly removing conflicting packages. This does not allow to add those packages back for users that want to use meta-digi layer, but a different distro than 'dey'. With the 'dey' distro override, such removals are only done if using this distro. Reported-by: Michael Burr Signed-off-by: Hector Palacios https://onedigi.atlassian.net/browse/DEL-7712 --- .../recipes-connectivity/modemmanager/modemmanager_%.bbappend | 2 +- .../networkmanager/networkmanager_%.bbappend | 4 ++-- meta-digi-dey/recipes-core/systemd/systemd_%.bbappend | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_%.bbappend b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_%.bbappend index 5d4bdc0e8..cae977902 100644 --- a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_%.bbappend +++ b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_%.bbappend @@ -11,7 +11,7 @@ SRC_URI += " \ # 'polkit' depends on 'consolekit', and this requires 'x11' distro feature. So # remove 'polkit' support to be able to build ModemManager on a framebuffer # only image (without X11) -PACKAGECONFIG_remove = " polkit" +PACKAGECONFIG_remove_dey = " polkit" do_install_append() { # Install udev rules for ModemManager blacklist devices diff --git a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_%.bbappend b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_%.bbappend index 8fee2cc8c..9f1f4a79d 100644 --- a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_%.bbappend +++ b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_%.bbappend @@ -24,10 +24,10 @@ SRC_URI += " \ # based images. DEPENDS_remove = "polkit" EXTRA_OECONF += "--enable-polkit=disabled" -PACKAGECONFIG_remove = "consolekit" +PACKAGECONFIG_remove_dey = "consolekit" # Adjust other compile time options to save space -PACKAGECONFIG_remove = "netconfig nss" +PACKAGECONFIG_remove_dey = "netconfig nss" PACKAGECONFIG_append = " gnutls modemmanager ppp" EXTRA_OECONF_append = " --disable-introspection --enable-concheck" diff --git a/meta-digi-dey/recipes-core/systemd/systemd_%.bbappend b/meta-digi-dey/recipes-core/systemd/systemd_%.bbappend index 14b395eae..95140a179 100644 --- a/meta-digi-dey/recipes-core/systemd/systemd_%.bbappend +++ b/meta-digi-dey/recipes-core/systemd/systemd_%.bbappend @@ -6,7 +6,7 @@ SRC_URI += " \ " # Remove systemd-networkd from our images, since we already use NetworkManager -PACKAGECONFIG_remove = "networkd" +PACKAGECONFIG_remove_dey = "networkd" do_install_append () { # Disable the assignment of the fixed network interface name