Patchwork wpa-supplicant: add wpa_supplicant.conf to CONFFILES and don't install it twice

login
register
mail settings
Submitter Martin Jansa
Date May 24, 2012, 2:09 p.m.
Message ID <1337868551-6674-1-git-send-email-Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/28613/
State Accepted
Commit 583fdb62c73851b439bdf0c8e50f74073e566d5a
Headers show

Comments

Martin Jansa - May 24, 2012, 2:09 p.m.
* first we install ${WORKDIR}/wpa_supplicant.conf-sane
  install -m 600 ${WORKDIR}/wpa_supplicant.conf-sane ${D}${sysconfdir}/wpa_supplicant.conf
  and a bit later in do_install we were overwritting it with ${WORKDIR}/wpa_supplicant.conf
  install -m 644 ${WORKDIR}/wpa_supplicant.conf ${D}${sysconfdir}
* notice that this patch also changes .conf permissions from 644 back to 600

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../wpa-supplicant/wpa-supplicant-0.7.inc          |    2 +-
 .../wpa-supplicant/wpa-supplicant_0.7.3.bb         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Saul Wold - May 25, 2012, 4:39 p.m.
On 05/24/2012 07:09 AM, Martin Jansa wrote:
> * first we install ${WORKDIR}/wpa_supplicant.conf-sane
>    install -m 600 ${WORKDIR}/wpa_supplicant.conf-sane ${D}${sysconfdir}/wpa_supplicant.conf
>    and a bit later in do_install we were overwritting it with ${WORKDIR}/wpa_supplicant.conf
>    install -m 644 ${WORKDIR}/wpa_supplicant.conf ${D}${sysconfdir}
> * notice that this patch also changes .conf permissions from 644 back to 600
>
> Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com>
> ---
>   .../wpa-supplicant/wpa-supplicant-0.7.inc          |    2 +-
>   .../wpa-supplicant/wpa-supplicant_0.7.3.bb         |    2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
> index b489893..efd1a66 100644
> --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
> +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
> @@ -22,6 +22,7 @@ PACKAGES_prepend = "wpa-supplicant-passphrase wpa-supplicant-cli "
>   FILES_wpa-supplicant-passphrase = "${bindir}/wpa_passphrase"
>   FILES_wpa-supplicant-cli = "${sbindir}/wpa_cli"
>   FILES_${PN} += "${datadir}/dbus-1/system-services/*"
> +CONFFILES_${PN} += "${sysconfdir}/wpa_supplicant.conf"
>
>   do_configure () {
>   	install -m 0755 ${WORKDIR}/defconfig-gnutls .config
> @@ -50,7 +51,6 @@ do_install () {
>   	install -d ${D}${sysconfdir}/network/if-pre-up.d/
>   	install -d ${D}${sysconfdir}/network/if-post-down.d/
>   	install -d ${D}${sysconfdir}/network/if-down.d/
> -	install -m 644 ${WORKDIR}/wpa_supplicant.conf ${D}${sysconfdir}
>   	install -m 755 ${WORKDIR}/wpa-supplicant.sh ${D}${sysconfdir}/network/if-pre-up.d/wpa-supplicant
>   	cd ${D}${sysconfdir}/network/&&  \
>   	ln -sf ../if-pre-up.d/wpa-supplicant if-post-down.d/wpa-supplicant
> diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb
> index 1e0086a..7bbb8c0 100644
> --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb
> +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb
> @@ -1,6 +1,6 @@
>   require wpa-supplicant-0.7.inc
>
> -PR = "r10"
> +PR = "r11"
>
>   SRC_URI[md5sum] = "f516f191384a9a546e3f5145c08addda"
>   SRC_URI[sha256sum] = "d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443"

Merged into OE-Core

Thanks
	Sau!

Patch

diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
index b489893..efd1a66 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
@@ -22,6 +22,7 @@  PACKAGES_prepend = "wpa-supplicant-passphrase wpa-supplicant-cli "
 FILES_wpa-supplicant-passphrase = "${bindir}/wpa_passphrase"
 FILES_wpa-supplicant-cli = "${sbindir}/wpa_cli"
 FILES_${PN} += "${datadir}/dbus-1/system-services/*"
+CONFFILES_${PN} += "${sysconfdir}/wpa_supplicant.conf"
 
 do_configure () {
 	install -m 0755 ${WORKDIR}/defconfig-gnutls .config
@@ -50,7 +51,6 @@  do_install () {
 	install -d ${D}${sysconfdir}/network/if-pre-up.d/
 	install -d ${D}${sysconfdir}/network/if-post-down.d/
 	install -d ${D}${sysconfdir}/network/if-down.d/
-	install -m 644 ${WORKDIR}/wpa_supplicant.conf ${D}${sysconfdir}
 	install -m 755 ${WORKDIR}/wpa-supplicant.sh ${D}${sysconfdir}/network/if-pre-up.d/wpa-supplicant
 	cd ${D}${sysconfdir}/network/ && \
 	ln -sf ../if-pre-up.d/wpa-supplicant if-post-down.d/wpa-supplicant
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb
index 1e0086a..7bbb8c0 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb
@@ -1,6 +1,6 @@ 
 require wpa-supplicant-0.7.inc
 
-PR = "r10"
+PR = "r11"
 
 SRC_URI[md5sum] = "f516f191384a9a546e3f5145c08addda"
 SRC_URI[sha256sum] = "d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443"