From f16f0323a6c3cfafb2d8c349a8bfc6eeaa97773b Mon Sep 17 00:00:00 2001
From: Marius Vlad <marius.vlad@collabora.com>
Date: Fri, 7 Feb 2025 15:39:18 +0200
Subject: [PATCH] meta-agl-uhmi-demo: Removed fixed configuration

Rather than having a static IPs assigned let us use DHCP by default.
This is more in common with the other images we have available. Also
qemu can provide DHCP server so we wouldn't really need this.

A fixed IP configuration can't really work out, when we have other
network class in the system, meaning that this won't really work unless
you have the same class in your network already we that's not case.

Change-Id: I19aeecdac2f8e5bcade1ee9e4c130880e710b85b
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
---
 .../recipes-config/uhmi-config/files/wired-receiver.config       | 7 -------
 .../recipes-config/uhmi-config/files/wired-sender.config         | 7 -------
 .../recipes-config/uhmi-config/uhmi-config-receiver.bb           | 9 ---------
 .../recipes-config/uhmi-config/uhmi-config-sender.bb             | 7 -------
 4 files changed, 30 deletions(-)
 delete mode 100644 meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/files/wired-receiver.config
 delete mode 100644 meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/files/wired-sender.config

diff --git a/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/files/wired-receiver.config b/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/files/wired-receiver.config
deleted file mode 100644
index 9d6b3a63..00000000
--- a/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/files/wired-receiver.config
+++ /dev/null
@@ -1,7 +0,0 @@
-[global]
-Name = Wired
-Description = Wired network configuration
-
-[service_ether]
-Type = ethernet
-IPv4 = 192.168.0.101/24
diff --git a/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/files/wired-sender.config b/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/files/wired-sender.config
deleted file mode 100644
index 777a3e95..00000000
--- a/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/files/wired-sender.config
+++ /dev/null
@@ -1,7 +0,0 @@
-[global]
-Name = Wired
-Description = Wired network configuration
-
-[service_ether]
-Type = ethernet
-IPv4 = 192.168.0.100/24
diff --git a/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/uhmi-config-receiver.bb b/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/uhmi-config-receiver.bb
index 94092b13..b0b9a17e 100644
--- a/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/uhmi-config-receiver.bb
+++ b/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/uhmi-config-receiver.bb
@@ -3,20 +3,11 @@ LICENSE     = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
 SRC_URI = " \
-    file://wired-receiver.config \
     file://uhmi-ivi-wm.conf \
 "
 
 do_install() {
-    if [ ! -e ${D}/var/lib/connman/wired.config ]; then
-        install -d ${D}/var/lib/connman/
-        install -m 6444 ${WORKDIR}/wired-receiver.config ${D}/var/lib/connman/wired.config
-    fi
-
     install -d ${D}/etc/systemd/system/uhmi-ivi-wm.service.d/
     install -m 0644 ${WORKDIR}/uhmi-ivi-wm.conf ${D}/etc/systemd/system/uhmi-ivi-wm.service.d/
 }
 
-FILES:${PN} += " \
-    /var/lib/connman/wired.config \
-"
diff --git a/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/uhmi-config-sender.bb b/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/uhmi-config-sender.bb
index ee854d85..04b20671 100644
--- a/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/uhmi-config-sender.bb
+++ b/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/uhmi-config-sender.bb
@@ -5,16 +5,10 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 SRC_URI = " \
     file://app.json \
     file://initial_vscreen.json \
-    file://wired-sender.config \
     file://uhmi-ivi-wm.conf \
 "
 
 do_install() {
-    if [ ! -e ${D}/var/lib/connman/wired.config ]; then
-        install -d ${D}/var/lib/connman/
-        install -m 6444 ${WORKDIR}/wired-sender.config ${D}/var/lib/connman/wired.config
-    fi
-
     install -d ${D}/var/local/uhmi-app/glmark2
     install -m 644 ${WORKDIR}/app.json ${D}/var/local/uhmi-app/glmark2/
     install -m 644 ${WORKDIR}/initial_vscreen.json ${D}/var/local/uhmi-app/glmark2/
@@ -24,6 +18,5 @@ do_install() {
 }
 
 FILES:${PN} += " \
-    /var/lib/connman/wired.config \
     /var/local/uhmi-app/glmark2 \
 "
-- 
2.16.6