Skip to contentSkip to conversation

connman: make tist functionallity a PACKAGECONFIG option

PATCH In review Jack Mitchell 3 participants 4 messages Apr 26, 2013

lore
Share & tools
lore

Jack Mitchell

author
#0 lore raw

PATCH 1/1 connman: make tist functionallity a PACKAGECONFIG option

From: Jack Mitchell <[email protected]>

Signed-off-by Jack Mitchell <[email protected]>

---

Runtime tested on beaglebone armv7a, with and without tist PACKAGECONFIG

 meta/recipes-connectivity/connman/connman.inc | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
meta/recipes-connectivity/connman/connman.inc +7 -6
index 589ece8..eb9d145 100644
@@ -20,10 +20,7 @@ DEPENDS  = "dbus glib-2.0 ppp iptables gnutls \
             ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
             "
 
-INC_PR = "r19"
-
-TIST = "--enable-tist"
-TIST_powerpc = ""
+INC_PR = "r20"
 
 EXTRA_OECONF += "\
     ac_cv_path_WPASUPPLICANT=${sbindir}/wpa_supplicant \

@@ -32,8 +29,8 @@ EXTRA_OECONF += "\
     --enable-threads \
     --enable-loopback \
     --enable-ethernet \
-    ${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi ${TIST}', '--disable-wifi', d)} \
-    ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth ${TIST}', '--disable-bluetooth', d)} \
+    ${@base_contains('DISTRO_FEATURES', 'wifi', '--enable-wifi', '--disable-wifi', d)} \
+    ${@base_contains('DISTRO_FEATURES', 'bluetooth', '--enable-bluetooth', '--disable-bluetooth', d)} \
     ${@base_contains('DISTRO_FEATURES', '3g', '--enable-ofono', '--disable-ofono', d)} \
     --enable-tools \
     --enable-test \

@@ -43,6 +40,10 @@ EXTRA_OECONF += "\
     ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '--with-systemdunitdir=', d)} \
 "
 
+PACKAGECONFIG ??= ""
+
+PACKAGECONFIG[tist] = "--enable-tist,,"
+
 INITSCRIPT_NAME = "connman"
 INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ."
Signature · 1 line
1.8.2.1
#1 lore raw
Quoted 38 lines · Jack Mitchell

From: Jack Mitchell <[email protected]>

Signed-off-by Jack Mitchell <[email protected]>

---

Runtime tested on beaglebone armv7a, with and without tist PACKAGECONFIG

 meta/recipes-connectivity/connman/connman.inc | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
meta/recipes-connectivity/connman/connman.inc +3 -6
index 589ece8..eb9d145 100644
@@ -20,10 +20,7 @@ DEPENDS  = "dbus glib-2.0 ppp iptables gnutls \
             ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
             "
 
-INC_PR = "r19"
-
-TIST = "--enable-tist"
-TIST_powerpc = ""
+INC_PR = "r20"
 
 EXTRA_OECONF += "\
     ac_cv_path_WPASUPPLICANT=${sbindir}/wpa_supplicant \

@@ -32,8 +29,8 @@ EXTRA_OECONF += "\
     --enable-threads \
     --enable-loopback \
     --enable-ethernet \
-    ${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi ${TIST}', '--disable-wifi', d)} \
-    ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth ${TIST}', '--disable-bluetooth', d)} \
+    ${@base_contains('DISTRO_FEATURES', 'wifi', '--enable-wifi', '--disable-wifi', d)} \
+    ${@base_contains('DISTRO_FEATURES', 'bluetooth', '--enable-bluetooth', '--disable-bluetooth', d)} \
     ${@base_contains('DISTRO_FEATURES', '3g', '--enable-ofono', '--disable-ofono', d)} \
     --enable-tools \
     --enable-test \

meta/recipes-connectivity/connman/connman.inc EXTRA_OECONF += "\ · line 45

Quoted 6 lines
meta/recipes-connectivity/connman/connman.inc +3 -0
@@ -43,6 +40,10 @@ EXTRA_OECONF += "\
     ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '--with-systemdunitdir=', d)} \
 "
 
+PACKAGECONFIG ??= ""
+
+PACKAGECONFIG[tist] = "--enable-tist,,"

would you mind to convert wifi, bluetooth and 3g also to PACKAGECONFIGs?

Quoted 12 lines
meta/recipes-connectivity/connman/connman.inc +1 -0
+
 INITSCRIPT_NAME = "connman"
 INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ."
Signature · 7 lines
1.8.2.1


_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
author
#2 lore raw
Quoted 42 lines · Martin Jansa
Quoted 41 lines · Jack Mitchell

From: Jack Mitchell <[email protected]>

Signed-off-by Jack Mitchell <[email protected]>

---

Runtime tested on beaglebone armv7a, with and without tist PACKAGECONFIG

  meta/recipes-connectivity/connman/connman.inc | 13 +++++++------
  1 file changed, 7 insertions(+), 6 deletions(-)
meta/recipes-connectivity/connman/connman.inc +3 -6
index 589ece8..eb9d145 100644
@@ -20,10 +20,7 @@ DEPENDS  = "dbus glib-2.0 ppp iptables gnutls \
              ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
              "
 
-INC_PR = "r19"
-
-TIST = "--enable-tist"
-TIST_powerpc = ""
+INC_PR = "r20"
 
  EXTRA_OECONF += "\
      ac_cv_path_WPASUPPLICANT=${sbindir}/wpa_supplicant \

@@ -32,8 +29,8 @@ EXTRA_OECONF += "\
      --enable-threads \
      --enable-loopback \
      --enable-ethernet \
-    ${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi ${TIST}', '--disable-wifi', d)} \
-    ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth ${TIST}', '--disable-bluetooth', d)} \
+    ${@base_contains('DISTRO_FEATURES', 'wifi', '--enable-wifi', '--disable-wifi', d)} \
+    ${@base_contains('DISTRO_FEATURES', 'bluetooth', '--enable-bluetooth', '--disable-bluetooth', d)} \
      ${@base_contains('DISTRO_FEATURES', '3g', '--enable-ofono', '--disable-ofono', d)} \
      --enable-tools \
      --enable-test \

@@ -43,6 +40,10 @@ EXTRA_OECONF += "\
      ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '--with-systemdunitdir=', d)} \
  "
Quoted 17 lines

meta/recipes-connectivity/connman/connman.inc EXTRA_OECONF += "\ · line 45

Quoted 3 lines
meta/recipes-connectivity/connman/connman.inc +3 -0
+PACKAGECONFIG ??= ""
+
+PACKAGECONFIG[tist] = "--enable-tist,,"

would you mind to convert wifi, bluetooth and 3g also to PACKAGECONFIGs?

Quoted 12 lines
meta/recipes-connectivity/connman/connman.inc +1 -0
+
  INITSCRIPT_NAME = "connman"
  INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ."
Signature · 7 lines
1.8.2.1


_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Something like:

PACKAGECONFIG ??= " \

${@base_contains('DISTRO_FEATURES', 'wifi','wifi', '', d)}\
                  "

PACKAGECONFIG[wifi] = "--enable-wifi,--disable-wifi,"

Or were you thinking of another method?

Signature · 5 lines
  Jack Mitchell ([email protected])
  Embedded Systems Engineer
  http://www.embed.me.uk

--
#3 lore raw
Quoted 9 lines · Jack Mitchell

Something like:

PACKAGECONFIG ??= " \

${@base_contains('DISTRO_FEATURES', 'wifi','wifi', '', d)}\
                  "

PACKAGECONFIG[wifi] = "--enable-wifi,--disable-wifi,"

Or were you thinking of another method?

That's right. Would be nice if we had a more concise method, but that's idiomatic at least.

Ross