From c790eefea5f5fc7f4bb3648f3b8823dfcedde814 Mon Sep 17 00:00:00 2001
From: DanyLE <xsang.le@gmail.com>
Date: Mon, 21 Jul 2025 19:48:15 +0200
Subject: [PATCH] add networkmanaer and modemmanager to the image

---
 README.md                                                | 9 +++++++++
 conf/layer.conf                                          | 3 +--
 conf/machine/pinephone.conf                              | 3 ++-
 recipes-connectivity/eg25-manager/eg25-manager_git.bb    | 2 +-
 .../modemmanager/modemmanager_%.bbappend                 | 1 +
 .../networkmanager/networkmanager_%.bbappend             | 1 +
 recipes-core/images/core-image-base.bbappend             | 7 ++++++-
 7 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 recipes-connectivity/modemmanager/modemmanager_%.bbappend
 create mode 100644 recipes-connectivity/networkmanager/networkmanager_%.bbappend

diff --git a/README.md b/README.md
index 03717a5..9a29b2e 100644
--- a/README.md
+++ b/README.md
@@ -14,4 +14,13 @@ Enable GPS
 
 ```sh
 mmcli -m 0 --command="AT+QGPS=1,30,50,0,2"
+```
+
+Wifi
+
+```sh
+nmcli radio wifi
+nmcli radio wifi on
+nmcli dev wifi list
+
 ```
\ No newline at end of file
diff --git a/conf/layer.conf b/conf/layer.conf
index a237973..de9627c 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -33,5 +33,4 @@ PREFERRED_PROVIDER_u-boot = "u-boot-megous"
 # extra kernel CMDLINE_RNDIS option
 # CMDLINE_RNDIS += " video=DPI-1:480x640,rotate=90 "
 # accept license for wifi and bluetooth firmware
-LICENSE_FLAGS_ACCEPTED = "synaptics-killswitch commercial"
-SERIAL_CONSOLES:append = " ttyS0,115200 "
\ No newline at end of file
+LICENSE_FLAGS_ACCEPTED = "synaptics-killswitch commercial"
\ No newline at end of file
diff --git a/conf/machine/pinephone.conf b/conf/machine/pinephone.conf
index c81c6be..b9fa352 100644
--- a/conf/machine/pinephone.conf
+++ b/conf/machine/pinephone.conf
@@ -17,4 +17,5 @@ SPL_BINARY = "u-boot-sunxi-with-spl.bin"
 MACHINE_FEATURES:remove = "x11"
 MACHINE_FEATURES:append = "bluetooth wifi"
 
-MACHINE_EXTRA_RRECOMMENDS = "pinephone-firmware"
\ No newline at end of file
+MACHINE_EXTRA_RRECOMMENDS = "pinephone-firmware"
+SERIAL_CONSOLES = " 115200;ttyS0 "
\ No newline at end of file
diff --git a/recipes-connectivity/eg25-manager/eg25-manager_git.bb b/recipes-connectivity/eg25-manager/eg25-manager_git.bb
index 0dee6f9..0241809 100644
--- a/recipes-connectivity/eg25-manager/eg25-manager_git.bb
+++ b/recipes-connectivity/eg25-manager/eg25-manager_git.bb
@@ -10,7 +10,7 @@ SRCREV = "${AUTOREV}"
 PV = "0.5.2+git${SRCPV}"
 S = "${UNPACKDIR}/git"
 
-DEPENDS:append = " libgudev libgpiod libusb curl "
+DEPENDS:append = " libgudev libgpiod libusb curl modemmanager "
 
 inherit meson pkgconfig
 
diff --git a/recipes-connectivity/modemmanager/modemmanager_%.bbappend b/recipes-connectivity/modemmanager/modemmanager_%.bbappend
new file mode 100644
index 0000000..844b699
--- /dev/null
+++ b/recipes-connectivity/modemmanager/modemmanager_%.bbappend
@@ -0,0 +1 @@
+PACKAGECONFIG:remove =" systemd "
\ No newline at end of file
diff --git a/recipes-connectivity/networkmanager/networkmanager_%.bbappend b/recipes-connectivity/networkmanager/networkmanager_%.bbappend
new file mode 100644
index 0000000..c3ced15
--- /dev/null
+++ b/recipes-connectivity/networkmanager/networkmanager_%.bbappend
@@ -0,0 +1 @@
+PACKAGECONFIG:append = " modemmanager ppp wifi dhcpcd iwd resolvconf nmtui wwan "
\ No newline at end of file
diff --git a/recipes-core/images/core-image-base.bbappend b/recipes-core/images/core-image-base.bbappend
index 408dc51..ded4d2e 100644
--- a/recipes-core/images/core-image-base.bbappend
+++ b/recipes-core/images/core-image-base.bbappend
@@ -1,2 +1,7 @@
 IMAGE_BOOT_FILES:append:pinephone = " boot.scr ${KERNEL_DEVICETREE} "
-IMAGE_INSTALL:append:pinephone = " pinephone-firmware eg25-manager glibmm "
\ No newline at end of file
+IMAGE_INSTALL:append:pinephone = " \
+    pinephone-firmware \
+    eg25-manager \
+    modemmanager \
+    gpsd \
+    gps-utils "
\ No newline at end of file