From 166fd74e2dfee8e28357a25899ee89a27e6687c0 Mon Sep 17 00:00:00 2001
From: Stefan Schmidt <stefan.schmidt@huawei.com>
Date: Tue, 19 Jul 2022 14:02:10 +0200
Subject: [PATCH] oniro-image-common.inc/networkmanager: Add modem/usbmodem
MACHINE_FEATURE
Enable a modem/usbmodem MACHINE_FEATURE to install the needed packages
for NetworkManager and ModemManager in the image. Also enabling the
ModemManager PACKAGECONFIG for NetworkManager to build the needed support.
Fixes: https://gitlab.eclipse.org/eclipse/oniro-core/oniro/-/issues/60
Signed-off-by: Stefan Schmidt <stefan.schmidt@huawei.com>
---
.../recipes-core/images/oniro-image-common.inc | 7 +++++++
.../networkmanager/networkmanager_%.bbappend | 8 ++++++++
2 files changed, 15 insertions(+)
create mode 100644 meta-oniro-staging/recipes-connectivity/networkmanager/networkmanager_%.bbappend
diff --git a/meta-oniro-core/recipes-core/images/oniro-image-common.inc b/meta-oniro-core/recipes-core/images/oniro-image-common.inc
index 0ac0ab13..6ce454fb 100644
--- a/meta-oniro-core/recipes-core/images/oniro-image-common.inc
+++ b/meta-oniro-core/recipes-core/images/oniro-image-common.inc
@@ -20,3 +20,10 @@ IMAGE_INSTALL:append = "\
"
IMAGE_INSTALL:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'optee-client', '', d)} "
+
+# If the machine has a cellular modem it can set MACHINE_FEATURES+=modem to
+# add the needed packages into the image. In the special case of an USB cellular
+# modem adding MACHINE_FEATURES+="modem usbmodem" ensures to have the usb-modeswitch
+# package as well.
+IMAGE_INSTALL:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'modem', 'networkmanager-wwan modemmanager', '', d)} "
+IMAGE_INSTALL:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'usbmodem', 'usb-modeswitch', '', d)} "
diff --git a/meta-oniro-staging/recipes-connectivity/networkmanager/networkmanager_%.bbappend b/meta-oniro-staging/recipes-connectivity/networkmanager/networkmanager_%.bbappend
new file mode 100644
index 00000000..6e1c23f1
--- /dev/null
+++ b/meta-oniro-staging/recipes-connectivity/networkmanager/networkmanager_%.bbappend
@@ -0,0 +1,8 @@
+# SPDX-FileCopyrightText: Huawei Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+# If the machine has a cellular modem it can set MACHINE_FEATURES+=modem to
+# enable build-in support in NetworkManager.
+PACKAGECONFIG:append:pn-networkmanager = "${@bb.utils.contains('MACHINE_FEATURES', \
+ 'modem', ' modemmanager ', '', d)}"
--
GitLab