[OE-core] [PATCH 1/2] wpa-supplicant: Use systemd-tmpfiles to create volatiles files and dirs

Fabio Berton fabio.berton at ossystems.com.br
Wed Apr 5 12:09:15 UTC 2017


Volatiles files are installed in different locations depending on
distro feature update-rc.d or systemd. For update-rc.d volatiles
configuration files are installed in /etc/default/volatiles and
for systemd in /etc/tmpfiles.d/. So, we need to install volatiles
files in correct location depending on what distro feature is used.

Signed-off-by: Fabio Berton <fabio.berton at ossystems.com.br>
---
 .../wpa-supplicant/wpa-supplicant/wpa_supplicant.tmpfiles.d       | 1 +
 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.6.bb    | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.tmpfiles.d

diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.tmpfiles.d b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.tmpfiles.d
new file mode 100644
index 0000000000..5b27498b8e
--- /dev/null
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.tmpfiles.d
@@ -0,0 +1 @@
+d /var/run/wpa_supplicant   0700    root    root    -   -
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.6.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.6.bb
index 146bccfaa7..ff4ad34d51 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.6.bb
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.6.bb
@@ -24,6 +24,7 @@ SRC_URI = "http://w1.fi/releases/wpa_supplicant-${PV}.tar.gz  \
            file://wpa_supplicant.conf \
            file://wpa_supplicant.conf-sane \
            file://99_wpa_supplicant \
+           file://wpa_supplicant.tmpfiles.d \
           "
 SRC_URI[md5sum] = "091569eb4440b7d7f2b4276dbfc03c3c"
 SRC_URI[sha256sum] = "b4936d34c4e6cdd44954beba74296d964bc2c9668ecaa5255e499636fe2b1450"
@@ -93,10 +94,11 @@ do_install () {
 	if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
 		install -d ${D}/${systemd_unitdir}/system
 		install -m 644 ${S}/wpa_supplicant/systemd/*.service ${D}/${systemd_unitdir}/system
+		install -Dm 0644 ${WORKDIR}/wpa_supplicant.tmpfiles.d ${D}${sysconfdir}/tmpfiles.d/wpa_supplicant.conf
+	else
+		install -d ${D}/etc/default/volatiles
+		install -m 0644 ${WORKDIR}/99_wpa_supplicant ${D}/etc/default/volatiles
 	fi
-
-	install -d ${D}/etc/default/volatiles
-	install -m 0644 ${WORKDIR}/99_wpa_supplicant ${D}/etc/default/volatiles
 }
 
 pkg_postinst_wpa-supplicant () {
-- 
2.11.0




More information about the Openembedded-core mailing list