Patchwork wpa-supplicant: Package systemd service in -systemd

login
register
mail settings
Submitter Andrei Gherzan
Date Feb. 5, 2013, 12:15 p.m.
Message ID <1360066533-20693-1-git-send-email-andrei.gherzan@windriver.com>
Download mbox | patch
Permalink /patch/44093/
State New
Headers show

Comments

Andrei Gherzan - Feb. 5, 2013, 12:15 p.m.
Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
---
 .../wpa-supplicant/wpa-supplicant-2.0.inc          |    6 ++++--
 .../wpa-supplicant/wpa-supplicant_2.0.bb           |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)
Ross Burton - Feb. 5, 2013, 1:54 p.m.
On 5 February 2013 12:15, Andrei Gherzan <andrei.gherzan@windriver.com> wrote:
> Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
> ---
>  .../wpa-supplicant/wpa-supplicant-2.0.inc          |    6 ++++--
>  .../wpa-supplicant/wpa-supplicant_2.0.bb           |    2 +-
>  2 files changed, 5 insertions(+), 3 deletions(-)

NACK.

Please don't add -systemd packages.  I've almost got a systemd.bbclass
that I'm happy with, but if you must add integration now then just
package the unit files alongside the daemons, respecting the distro
feature.

Ross
Otavio Salvador - Feb. 5, 2013, 3:42 p.m.
On Tue, Feb 5, 2013 at 11:54 AM, Burton, Ross <ross.burton@intel.com> wrote:
> On 5 February 2013 12:15, Andrei Gherzan <andrei.gherzan@windriver.com> wrote:
>> Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
>> ---
>>  .../wpa-supplicant/wpa-supplicant-2.0.inc          |    6 ++++--
>>  .../wpa-supplicant/wpa-supplicant_2.0.bb           |    2 +-
>>  2 files changed, 5 insertions(+), 3 deletions(-)
>
> NACK.
>
> Please don't add -systemd packages.  I've almost got a systemd.bbclass
> that I'm happy with, but if you must add integration now then just
> package the unit files alongside the daemons, respecting the distro
> feature.

I'd prefer to hold it until the class is out.

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
Andrei Gherzan - Feb. 5, 2013, 3:47 p.m.
On Tue, Feb 05, 2013 at 01:42:38PM -0200, Otavio Salvador wrote:
> On Tue, Feb 5, 2013 at 11:54 AM, Burton, Ross <ross.burton@intel.com> wrote:
> > On 5 February 2013 12:15, Andrei Gherzan <andrei.gherzan@windriver.com> wrote:
> >> Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
> >> ---
> >>  .../wpa-supplicant/wpa-supplicant-2.0.inc          |    6 ++++--
> >>  .../wpa-supplicant/wpa-supplicant_2.0.bb           |    2 +-
> >>  2 files changed, 5 insertions(+), 3 deletions(-)
> >
> > NACK.
> >
> > Please don't add -systemd packages.  I've almost got a systemd.bbclass
> > that I'm happy with, but if you must add integration now then just
> > package the unit files alongside the daemons, respecting the distro
> > feature.
>
> I'd prefer to hold it until the class is out.
>

Fair.

--
Andrei Gherzan | Wind River Systems
m: +40 734 450 615 | p: +40 236 320 307

Patch

diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc
index 89910a0..7ce85a6 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc
@@ -18,10 +18,12 @@  SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
 
 S = "${WORKDIR}/wpa_supplicant-${PV}/wpa_supplicant"
 
-PACKAGES_prepend = "wpa-supplicant-passphrase wpa-supplicant-cli "
+PACKAGES_prepend = "wpa-supplicant-passphrase wpa-supplicant-cli wpa-supplicant-systemd "
 FILES_wpa-supplicant-passphrase = "${bindir}/wpa_passphrase"
 FILES_wpa-supplicant-cli = "${sbindir}/wpa_cli"
-FILES_${PN} += "${datadir}/dbus-1/system-services/* ${systemd_unitdir}/system/*"
+FILES_wpa-supplicant-systemd = "${systemd_unitdir}/system/*"
+FILES_${PN} += "${datadir}/dbus-1/system-services/*"
+
 CONFFILES_${PN} += "${sysconfdir}/wpa_supplicant.conf"
 
 do_configure () {
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bb
index 22e42dd..a8b0dad 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bb
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bb
@@ -1,6 +1,6 @@ 
 require wpa-supplicant-2.0.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI[md5sum] = "3be2ebfdcced52e00eda0afe2889839d"
 SRC_URI[sha256sum] = "2c115609fbb5223d51381084a5c944455a8afcda81d584173ff55ba233379e09"