Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <michael.burr@digi.com>
Signed-off-by: Hector Palacios <hector.palacios@digi.com>

https://onedigi.atlassian.net/browse/DEL-7712
This commit is contained in:
Hector Palacios 2021-11-11 14:05:41 +01:00
parent fe2a1f281e
commit 116fb5e203
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_%.bbappend
View File

@ -11,7 +11,7 @@ SRC_URI += " \
# 'polkit' depends on 'consolekit', and this requires 'x11' distro feature. So # 'polkit' depends on 'consolekit', and this requires 'x11' distro feature. So
# remove 'polkit' support to be able to build ModemManager on a framebuffer # remove 'polkit' support to be able to build ModemManager on a framebuffer
# only image (without X11) # only image (without X11)
PACKAGECONFIG_remove = " polkit" PACKAGECONFIG_remove_dey = " polkit"
do_install_append() { do_install_append() {
# Install udev rules for ModemManager blacklist devices # Install udev rules for ModemManager blacklist devices

4
meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_%.bbappend
View File

@ -24,10 +24,10 @@ SRC_URI += " \
# based images. # based images.
DEPENDS_remove = "polkit" DEPENDS_remove = "polkit"
EXTRA_OECONF += "--enable-polkit=disabled" EXTRA_OECONF += "--enable-polkit=disabled"
PACKAGECONFIG_remove = "consolekit" PACKAGECONFIG_remove_dey = "consolekit"
# Adjust other compile time options to save space # Adjust other compile time options to save space
PACKAGECONFIG_remove = "netconfig nss" PACKAGECONFIG_remove_dey = "netconfig nss"
PACKAGECONFIG_append = " gnutls modemmanager ppp" PACKAGECONFIG_append = " gnutls modemmanager ppp"
EXTRA_OECONF_append = " --disable-introspection --enable-concheck" EXTRA_OECONF_append = " --disable-introspection --enable-concheck"

2
meta-digi-dey/recipes-core/systemd/systemd_%.bbappend
View File

@ -6,7 +6,7 @@ SRC_URI += " \
" "
# Remove systemd-networkd from our images, since we already use NetworkManager # Remove systemd-networkd from our images, since we already use NetworkManager
PACKAGECONFIG_remove = "networkd" PACKAGECONFIG_remove_dey = "networkd"
do_install_append () { do_install_append () {
# Disable the assignment of the fixed network interface name # Disable the assignment of the fixed network interface name