From 159008e38c4cd0ef9c92eb1af92987172326f146 Mon Sep 17 00:00:00 2001
From: Stefan Schmidt <stefan.schmidt@huawei.com>
Date: Wed, 13 Oct 2021 09:41:04 +0200
Subject: [PATCH] systemd-conf: Remove systemd-networkd append from gateway
blueprint
We switched from a systemd-networkd and hostapd based SoftAP solution to
network-manager. Interface configuration as well as DHCP and DNS for the
WiFi clients are now handled by the network-manager hotspot feature.
Signed-off-by: Stefan Schmidt <stefan.schmidt@huawei.com>
---
.../conf/distro/oniro-linux-blueprint-gateway.conf | 3 ---
.../recipes-core/systemd/files/80-wireless.network | 13 -------------
.../recipes-core/systemd/systemd-conf_%.bbappend | 7 -------
3 files changed, 23 deletions(-)
delete mode 100644 meta-oniro-blueprints/recipes-core/systemd/files/80-wireless.network
delete mode 100644 meta-oniro-blueprints/recipes-core/systemd/systemd-conf_%.bbappend
diff --git a/meta-oniro-blueprints/conf/distro/oniro-linux-blueprint-gateway.conf b/meta-oniro-blueprints/conf/distro/oniro-linux-blueprint-gateway.conf
index c89542ac..a136c326 100644
--- a/meta-oniro-blueprints/conf/distro/oniro-linux-blueprint-gateway.conf
+++ b/meta-oniro-blueprints/conf/distro/oniro-linux-blueprint-gateway.conf
@@ -33,6 +33,3 @@ BBMASK = ""
# We want hostapd service to start by default for this blueprint
SYSTEMD_AUTO_ENABLE_pn-hostapd = "enable"
-
-# Enable iptables support in systemd-networkd for NAT
-PACKAGECONFIG_append_pn-systemd = " iptc"
diff --git a/meta-oniro-blueprints/recipes-core/systemd/files/80-wireless.network b/meta-oniro-blueprints/recipes-core/systemd/files/80-wireless.network
deleted file mode 100644
index 15c343af..00000000
--- a/meta-oniro-blueprints/recipes-core/systemd/files/80-wireless.network
+++ /dev/null
@@ -1,13 +0,0 @@
-[Match]
-Name=wlan0
-
-[Network]
-Address=172.16.47.1/24
-DHCPServer=true
-IPMasquerade=true
-
-[DHCPServer]
-PoolOffset=100
-PoolSize=50
-EmitDNS=yes
-DNS=9.9.9.9 8.8.8.8
diff --git a/meta-oniro-blueprints/recipes-core/systemd/systemd-conf_%.bbappend b/meta-oniro-blueprints/recipes-core/systemd/systemd-conf_%.bbappend
deleted file mode 100644
index 9decbc87..00000000
--- a/meta-oniro-blueprints/recipes-core/systemd/systemd-conf_%.bbappend
+++ /dev/null
@@ -1,7 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SRC_URI_append = "file://80-wireless.network"
-
-do_install_append() {
- install -D -m0644 ${WORKDIR}/80-wireless.network ${D}${systemd_unitdir}/network/
-}
--
GitLab