From 9b5433667acd4e26ab557e1dbee0322268f28838 Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Sun, 09 Oct 2022 11:35:40 +0800
Subject: [PATCH] update wpa-conf in yocto for hardknott,honister and kirkstone

---
 yocto/meta-igkboard/hardknott/recipes-misc/wpa-conf/files/wpa-conf.service        |    2 
 yocto/meta-igkboard/hardknott/recipes-misc/wpa-conf/files/20-wlan0.network        |    5 +
 yocto/meta-igkboard/honister/recipes-misc/wpa-conf/files/wpa-conf.timer           |    8 ++
 yocto/meta-igkboard/honister/recipes-misc/wpa-conf/files/wpa_supplicant@.service  |   13 ++++
 yocto/meta-igkboard/honister/recipes-misc/wpa-conf/wpa-conf_1.0.bb                |   14 ++++
 yocto/meta-igkboard/kirkstone/recipes-misc/wpa-conf/files/wpa-conf.timer          |    8 ++
 yocto/meta-igkboard/kirkstone/recipes-misc/wpa-conf/wpa-conf_1.0.bb               |   14 ++++
 yocto/meta-igkboard/kirkstone/recipes-misc/wpa-conf/files/wpa_supplicant@.service |   13 ++++
 yocto/meta-igkboard/honister/recipes-misc/wpa-conf/files/20-wlan0.network         |    5 +
 yocto/meta-igkboard/hardknott/recipes-misc/wpa-conf/wpa-conf_1.0.bb               |   16 ++++-
 yocto/meta-igkboard/hardknott/recipes-misc/wpa-conf/files/wpa-conf.timer          |    8 ++
 yocto/meta-igkboard/honister/recipes-misc/wpa-conf/files/wpa-conf.service         |    2 
 yocto/meta-igkboard/kirkstone/recipes-misc/wpa-conf/files/wpa-conf.service        |    2 
 yocto/meta-igkboard/kirkstone/recipes-misc/wpa-conf/files/20-wlan0.network        |    5 +
 yocto/meta-igkboard/hardknott/recipes-misc/wpa-conf/files/wpa_supplicant@.service |   13 ++++
 15 files changed, 118 insertions(+), 10 deletions(-)

diff --git a/yocto/meta-igkboard/hardknott/recipes-misc/wpa-conf/files/20-wlan0.network b/yocto/meta-igkboard/hardknott/recipes-misc/wpa-conf/files/20-wlan0.network
new file mode 100644
index 0000000..36d3a47
--- /dev/null
+++ b/yocto/meta-igkboard/hardknott/recipes-misc/wpa-conf/files/20-wlan0.network
@@ -0,0 +1,5 @@
+[Match]
+Name=wlan0
+
+[Network]
+DHCP=yes
diff --git a/yocto/meta-igkboard/hardknott/recipes-misc/wpa-conf/files/wpa-conf.service b/yocto/meta-igkboard/hardknott/recipes-misc/wpa-conf/files/wpa-conf.service
old mode 100644
new mode 100755
index b994d23..036501c
--- a/yocto/meta-igkboard/hardknott/recipes-misc/wpa-conf/files/wpa-conf.service
+++ b/yocto/meta-igkboard/hardknott/recipes-misc/wpa-conf/files/wpa-conf.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Copy user wpa_supplicant.conf
 ConditionPathExists=/run/media/mmcblk1p1/wpa_supplicant.conf
-After=weston.service
+After=getty.target
 
 [Service]
 Type=oneshot
diff --git a/yocto/meta-igkboard/hardknott/recipes-misc/wpa-conf/files/wpa-conf.timer b/yocto/meta-igkboard/hardknott/recipes-misc/wpa-conf/files/wpa-conf.timer
new file mode 100644
index 0000000..43e789c
--- /dev/null
+++ b/yocto/meta-igkboard/hardknott/recipes-misc/wpa-conf/files/wpa-conf.timer
@@ -0,0 +1,8 @@
+[Unit]
+Description=Timer for the wpa-conf service
+
+[Timer]
+OnBootSec=20
+
+[Install]
+WantedBy=timers.target
diff --git a/yocto/meta-igkboard/hardknott/recipes-misc/wpa-conf/files/wpa_supplicant@.service b/yocto/meta-igkboard/hardknott/recipes-misc/wpa-conf/files/wpa_supplicant@.service
new file mode 100644
index 0000000..5bdf3dd
--- /dev/null
+++ b/yocto/meta-igkboard/hardknott/recipes-misc/wpa-conf/files/wpa_supplicant@.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=WPA supplicant daemon (interface-specific version)
+Before=network.target
+Wants=network.target
+
+# NetworkManager users will probably want the dbus version instead.
+
+[Service]
+Type=simple
+ExecStart=/usr/sbin/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant-%I.conf -i%I
+
+[Install]
+WantedBy=multi-user.target
diff --git a/yocto/meta-igkboard/hardknott/recipes-misc/wpa-conf/wpa-conf_1.0.bb b/yocto/meta-igkboard/hardknott/recipes-misc/wpa-conf/wpa-conf_1.0.bb
old mode 100644
new mode 100755
index b9f8288..18c1127
--- a/yocto/meta-igkboard/hardknott/recipes-misc/wpa-conf/wpa-conf_1.0.bb
+++ b/yocto/meta-igkboard/hardknott/recipes-misc/wpa-conf/wpa-conf_1.0.bb
@@ -1,17 +1,27 @@
 DESCRIPTION = "Copy user wpa_supplicant.conf"
-
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
 
 inherit systemd
 
 SYSTEMD_AUTO_ENABLE = "enable"
-SYSTEMD_SERVICE_${PN} = "wpa-conf.service"
+SYSTEMD_SERVICE:${PN} = "wpa-conf.service"
 
+SRC_URI += " file://20-wlan0.network "
 SRC_URI += " file://wpa-conf.service "
-FILES_${PN} += "${systemd_unitdir}/system/wpa-conf.service"
+SRC_URI += " file://wpa-conf.timer "
+SRC_URI += " file://wpa_supplicant@.service "
+
+FILES:${PN} += "${sysconfdir}/systemd/network/20-wlan0.network"
+FILES:${PN} += "${systemd_unitdir}/system/wpa-conf.service"
+FILES:${PN} += "${systemd_unitdir}/system/wpa-conf.timer"
+FILES:${PN} += "${systemd_unitdir}/system/wpa_supplicant@.service"
 
 do_install() { 
     install -d ${D}/${systemd_unitdir}/system 
+    install -d ${D}${sysconfdir}/systemd/network
+    install -m 0644 ${WORKDIR}/20-wlan0.network ${D}${sysconfdir}/systemd/network
     install -m 0644 ${WORKDIR}/wpa-conf.service ${D}/${systemd_unitdir}/system
+    install -m 0644 ${WORKDIR}/wpa-conf.timer ${D}/${systemd_unitdir}/system
+    install -m 0644 ${WORKDIR}/wpa_supplicant@.service ${D}/${systemd_unitdir}/system
 }
diff --git a/yocto/meta-igkboard/honister/recipes-misc/wpa-conf/files/20-wlan0.network b/yocto/meta-igkboard/honister/recipes-misc/wpa-conf/files/20-wlan0.network
new file mode 100644
index 0000000..36d3a47
--- /dev/null
+++ b/yocto/meta-igkboard/honister/recipes-misc/wpa-conf/files/20-wlan0.network
@@ -0,0 +1,5 @@
+[Match]
+Name=wlan0
+
+[Network]
+DHCP=yes
diff --git a/yocto/meta-igkboard/honister/recipes-misc/wpa-conf/files/wpa-conf.service b/yocto/meta-igkboard/honister/recipes-misc/wpa-conf/files/wpa-conf.service
old mode 100644
new mode 100755
index b994d23..036501c
--- a/yocto/meta-igkboard/honister/recipes-misc/wpa-conf/files/wpa-conf.service
+++ b/yocto/meta-igkboard/honister/recipes-misc/wpa-conf/files/wpa-conf.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Copy user wpa_supplicant.conf
 ConditionPathExists=/run/media/mmcblk1p1/wpa_supplicant.conf
-After=weston.service
+After=getty.target
 
 [Service]
 Type=oneshot
diff --git a/yocto/meta-igkboard/honister/recipes-misc/wpa-conf/files/wpa-conf.timer b/yocto/meta-igkboard/honister/recipes-misc/wpa-conf/files/wpa-conf.timer
new file mode 100644
index 0000000..43e789c
--- /dev/null
+++ b/yocto/meta-igkboard/honister/recipes-misc/wpa-conf/files/wpa-conf.timer
@@ -0,0 +1,8 @@
+[Unit]
+Description=Timer for the wpa-conf service
+
+[Timer]
+OnBootSec=20
+
+[Install]
+WantedBy=timers.target
diff --git a/yocto/meta-igkboard/honister/recipes-misc/wpa-conf/files/wpa_supplicant@.service b/yocto/meta-igkboard/honister/recipes-misc/wpa-conf/files/wpa_supplicant@.service
new file mode 100644
index 0000000..5bdf3dd
--- /dev/null
+++ b/yocto/meta-igkboard/honister/recipes-misc/wpa-conf/files/wpa_supplicant@.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=WPA supplicant daemon (interface-specific version)
+Before=network.target
+Wants=network.target
+
+# NetworkManager users will probably want the dbus version instead.
+
+[Service]
+Type=simple
+ExecStart=/usr/sbin/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant-%I.conf -i%I
+
+[Install]
+WantedBy=multi-user.target
diff --git a/yocto/meta-igkboard/honister/recipes-misc/wpa-conf/wpa-conf_1.0.bb b/yocto/meta-igkboard/honister/recipes-misc/wpa-conf/wpa-conf_1.0.bb
old mode 100644
new mode 100755
index 7e50cd2..18c1127
--- a/yocto/meta-igkboard/honister/recipes-misc/wpa-conf/wpa-conf_1.0.bb
+++ b/yocto/meta-igkboard/honister/recipes-misc/wpa-conf/wpa-conf_1.0.bb
@@ -1,17 +1,27 @@
 DESCRIPTION = "Copy user wpa_supplicant.conf"
-
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
 
 inherit systemd
 
 SYSTEMD_AUTO_ENABLE = "enable"
-SYSTEMD_SERVICE_${PN} = "wpa-conf.service"
+SYSTEMD_SERVICE:${PN} = "wpa-conf.service"
 
+SRC_URI += " file://20-wlan0.network "
 SRC_URI += " file://wpa-conf.service "
+SRC_URI += " file://wpa-conf.timer "
+SRC_URI += " file://wpa_supplicant@.service "
+
+FILES:${PN} += "${sysconfdir}/systemd/network/20-wlan0.network"
 FILES:${PN} += "${systemd_unitdir}/system/wpa-conf.service"
+FILES:${PN} += "${systemd_unitdir}/system/wpa-conf.timer"
+FILES:${PN} += "${systemd_unitdir}/system/wpa_supplicant@.service"
 
 do_install() { 
     install -d ${D}/${systemd_unitdir}/system 
+    install -d ${D}${sysconfdir}/systemd/network
+    install -m 0644 ${WORKDIR}/20-wlan0.network ${D}${sysconfdir}/systemd/network
     install -m 0644 ${WORKDIR}/wpa-conf.service ${D}/${systemd_unitdir}/system
+    install -m 0644 ${WORKDIR}/wpa-conf.timer ${D}/${systemd_unitdir}/system
+    install -m 0644 ${WORKDIR}/wpa_supplicant@.service ${D}/${systemd_unitdir}/system
 }
diff --git a/yocto/meta-igkboard/kirkstone/recipes-misc/wpa-conf/files/20-wlan0.network b/yocto/meta-igkboard/kirkstone/recipes-misc/wpa-conf/files/20-wlan0.network
new file mode 100644
index 0000000..36d3a47
--- /dev/null
+++ b/yocto/meta-igkboard/kirkstone/recipes-misc/wpa-conf/files/20-wlan0.network
@@ -0,0 +1,5 @@
+[Match]
+Name=wlan0
+
+[Network]
+DHCP=yes
diff --git a/yocto/meta-igkboard/kirkstone/recipes-misc/wpa-conf/files/wpa-conf.service b/yocto/meta-igkboard/kirkstone/recipes-misc/wpa-conf/files/wpa-conf.service
old mode 100644
new mode 100755
index b994d23..036501c
--- a/yocto/meta-igkboard/kirkstone/recipes-misc/wpa-conf/files/wpa-conf.service
+++ b/yocto/meta-igkboard/kirkstone/recipes-misc/wpa-conf/files/wpa-conf.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Copy user wpa_supplicant.conf
 ConditionPathExists=/run/media/mmcblk1p1/wpa_supplicant.conf
-After=weston.service
+After=getty.target
 
 [Service]
 Type=oneshot
diff --git a/yocto/meta-igkboard/kirkstone/recipes-misc/wpa-conf/files/wpa-conf.timer b/yocto/meta-igkboard/kirkstone/recipes-misc/wpa-conf/files/wpa-conf.timer
new file mode 100644
index 0000000..43e789c
--- /dev/null
+++ b/yocto/meta-igkboard/kirkstone/recipes-misc/wpa-conf/files/wpa-conf.timer
@@ -0,0 +1,8 @@
+[Unit]
+Description=Timer for the wpa-conf service
+
+[Timer]
+OnBootSec=20
+
+[Install]
+WantedBy=timers.target
diff --git a/yocto/meta-igkboard/kirkstone/recipes-misc/wpa-conf/files/wpa_supplicant@.service b/yocto/meta-igkboard/kirkstone/recipes-misc/wpa-conf/files/wpa_supplicant@.service
new file mode 100644
index 0000000..5bdf3dd
--- /dev/null
+++ b/yocto/meta-igkboard/kirkstone/recipes-misc/wpa-conf/files/wpa_supplicant@.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=WPA supplicant daemon (interface-specific version)
+Before=network.target
+Wants=network.target
+
+# NetworkManager users will probably want the dbus version instead.
+
+[Service]
+Type=simple
+ExecStart=/usr/sbin/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant-%I.conf -i%I
+
+[Install]
+WantedBy=multi-user.target
diff --git a/yocto/meta-igkboard/kirkstone/recipes-misc/wpa-conf/wpa-conf_1.0.bb b/yocto/meta-igkboard/kirkstone/recipes-misc/wpa-conf/wpa-conf_1.0.bb
old mode 100644
new mode 100755
index 7e50cd2..18c1127
--- a/yocto/meta-igkboard/kirkstone/recipes-misc/wpa-conf/wpa-conf_1.0.bb
+++ b/yocto/meta-igkboard/kirkstone/recipes-misc/wpa-conf/wpa-conf_1.0.bb
@@ -1,17 +1,27 @@
 DESCRIPTION = "Copy user wpa_supplicant.conf"
-
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
 
 inherit systemd
 
 SYSTEMD_AUTO_ENABLE = "enable"
-SYSTEMD_SERVICE_${PN} = "wpa-conf.service"
+SYSTEMD_SERVICE:${PN} = "wpa-conf.service"
 
+SRC_URI += " file://20-wlan0.network "
 SRC_URI += " file://wpa-conf.service "
+SRC_URI += " file://wpa-conf.timer "
+SRC_URI += " file://wpa_supplicant@.service "
+
+FILES:${PN} += "${sysconfdir}/systemd/network/20-wlan0.network"
 FILES:${PN} += "${systemd_unitdir}/system/wpa-conf.service"
+FILES:${PN} += "${systemd_unitdir}/system/wpa-conf.timer"
+FILES:${PN} += "${systemd_unitdir}/system/wpa_supplicant@.service"
 
 do_install() { 
     install -d ${D}/${systemd_unitdir}/system 
+    install -d ${D}${sysconfdir}/systemd/network
+    install -m 0644 ${WORKDIR}/20-wlan0.network ${D}${sysconfdir}/systemd/network
     install -m 0644 ${WORKDIR}/wpa-conf.service ${D}/${systemd_unitdir}/system
+    install -m 0644 ${WORKDIR}/wpa-conf.timer ${D}/${systemd_unitdir}/system
+    install -m 0644 ${WORKDIR}/wpa_supplicant@.service ${D}/${systemd_unitdir}/system
 }

--
Gitblit v1.9.1