From a5bfba31bcf4b599bcd1b820059283a0ee1240d1 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt <stefan.schmidt@huawei.com> Date: Fri, 5 Nov 2021 21:25:42 +0100 Subject: [PATCH] oniro-packageconfig.inc: Consolidate PACKAGECONFIG changes for distro Signed-off-by: Stefan Schmidt <stefan.schmidt@huawei.com> --- .../conf/distro/include/oniro-packageconfig.inc | 7 +++++++ meta-oniro-core/conf/distro/oniro-linux.conf | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/meta-oniro-core/conf/distro/include/oniro-packageconfig.inc b/meta-oniro-core/conf/distro/include/oniro-packageconfig.inc index 0c37727f..2e5bab75 100644 --- a/meta-oniro-core/conf/distro/include/oniro-packageconfig.inc +++ b/meta-oniro-core/conf/distro/include/oniro-packageconfig.inc @@ -4,3 +4,10 @@ # Define the configuration set as per our distro policy PACKAGECONFIG_pn-networkmanager = "nss systemd bluez5 wifi" + +# We have no use for dlt-daemon as we use systemd for logging +PACKAGECONFIG_remove_pn-mosquitto = "dlt" + +# We use NetworkManager as the default network manager (included in our +# reference images). +PACKAGECONFIG_remove_pn-systemd = "networkd" diff --git a/meta-oniro-core/conf/distro/oniro-linux.conf b/meta-oniro-core/conf/distro/oniro-linux.conf index 56618a92..28e25044 100644 --- a/meta-oniro-core/conf/distro/oniro-linux.conf +++ b/meta-oniro-core/conf/distro/oniro-linux.conf @@ -115,13 +115,6 @@ PREFERRED_PROVIDER_virtual/kernel_qemux86-64 = "linux-oniro" # Default to enabling serial debug console on RaspberryPi ENABLE_UART ?= "1" -# We have no use for dlt-daemon as we use systemd for logging -PACKAGECONFIG_remove_pn-mosquitto = "dlt" - -# We use NetworkManager as the default network manager (included in our -# reference images). -PACKAGECONFIG_remove_pn-systemd = "networkd" - # The KMS driver for RPI4 requires a different vc4 overlay for Raspberry Pi 4. # This is done dynamically through overlay_map.dtb. More info: # https://www.raspberrypi.com/documentation/computers/configuration.html#part2.2.10 -- GitLab