From b1d1464a6802bc3a8d283be13528b8e678d2937e Mon Sep 17 00:00:00 2001 From: Stefan Schmidt <stefan.schmidt@huawei.com> Date: Fri, 5 Nov 2021 21:16:07 +0100 Subject: [PATCH] networkmanager: Change PACKAGECONFIG to a direct assignment Having the PACKAGECONFIG_remove in an bbappend file makes it really hard to consume this layer and bring the specific config back with an _append (happens for me with the gateway blueprint. Instead we are now making a direct assignment, with he values removed taken into account, from our distro as policy. This allows other distros or layers consuming meta-oniro-core to change it as needed. A new oniro-packageconfig.inc include file is created in which we will consolidate other PACKAGECONFIG changes in the next commit. Signed-off-by: Stefan Schmidt <stefan.schmidt@huawei.com> --- meta-oniro-core/conf/distro/include/oniro-packageconfig.inc | 6 ++++++ meta-oniro-core/conf/distro/oniro-linux.conf | 1 + .../networkmanager/networkmanager_%.bbappend | 2 -- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 meta-oniro-core/conf/distro/include/oniro-packageconfig.inc diff --git a/meta-oniro-core/conf/distro/include/oniro-packageconfig.inc b/meta-oniro-core/conf/distro/include/oniro-packageconfig.inc new file mode 100644 index 00000000..0c37727f --- /dev/null +++ b/meta-oniro-core/conf/distro/include/oniro-packageconfig.inc @@ -0,0 +1,6 @@ +# SPDX-FileCopyrightText: Huawei Inc. +# +# SPDX-License-Identifier: Apache-2.0 + +# Define the configuration set as per our distro policy +PACKAGECONFIG_pn-networkmanager = "nss systemd bluez5 wifi" diff --git a/meta-oniro-core/conf/distro/oniro-linux.conf b/meta-oniro-core/conf/distro/oniro-linux.conf index bdbd574f..56618a92 100644 --- a/meta-oniro-core/conf/distro/oniro-linux.conf +++ b/meta-oniro-core/conf/distro/oniro-linux.conf @@ -90,6 +90,7 @@ BB_HASHSERVE ??= "auto" require conf/distro/include/oniro.inc require conf/distro/include/oniro-wic.inc +require conf/distro/include/oniro-packageconfig.inc TCLIBC ?= "musl" diff --git a/meta-oniro-core/recipes-connectivity/networkmanager/networkmanager_%.bbappend b/meta-oniro-core/recipes-connectivity/networkmanager/networkmanager_%.bbappend index 86a334c0..75abdd24 100644 --- a/meta-oniro-core/recipes-connectivity/networkmanager/networkmanager_%.bbappend +++ b/meta-oniro-core/recipes-connectivity/networkmanager/networkmanager_%.bbappend @@ -6,5 +6,3 @@ inherit writables WRITABLES = "system-connections" WRITABLE_PATH[system-connections] = "/etc/NetworkManager/system-connections" - -PACKAGECONFIG_remove = "dhclient dnsmasq ifupdown" -- GitLab