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 0000000000000000000000000000000000000000..0c37727f3e3929f6ce04c0eb1d4a67db10ec8b73 --- /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 bdbd574f6a8d822908214ab0e87065e1ae09c7ac..56618a92c924b412bb6cc0d52ab5b75de6817ff6 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 86a334c0892791b308d5e44a73e0392e7bb3885f..75abdd24262b9beb622c977c68ae441fcd729a07 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"