diff options
author | Stanislav Brabec <utx@penguin.cz> | 2009-08-19 20:56:07 +0000 |
---|---|---|
committer | utx@penguin.cz <utx@penguin.cz> | 2009-08-19 20:56:07 +0000 |
commit | 3bd6ffb5ba47ff8f6ca3d0741a6c7ff2392c4486 (patch) | |
tree | 13298eee779cc0aa64628085e0c44a9a8d7e6f7c | |
parent | ada6f217e946c731fbc42d831021aa1fcae28777 (diff) | |
parent | ac729cee6058e9e601af4869874213ccd129c732 (diff) |
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
-rw-r--r-- | classes/base.bbclass | 9 | ||||
-rw-r--r-- | conf/bitbake.conf | 19 | ||||
-rw-r--r-- | recipes/hostap/hostap-daemon_0.5.10.bb | 8 | ||||
-rw-r--r-- | recipes/tasks/task-base.bb | 7 | ||||
-rw-r--r-- | recipes/tasks/task-mokogateway.bb | 4 | ||||
-rw-r--r-- | recipes/wpa-supplicant/wpa-supplicant-0.6.inc | 8 | ||||
-rw-r--r-- | recipes/wpa-supplicant/wpa-supplicant_0.5.10.bb | 8 |
7 files changed, 45 insertions, 18 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 51648dae92..598a7bb77f 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -159,6 +159,12 @@ def base_read_file(filename): return f.read().strip() return None +def base_ifelse(condition, iftrue = True, iffalse = False): + if condition: + return iftrue + else: + return iffalse + def base_conditional(variable, checkvalue, truevalue, falsevalue, d): import bb if bb.data.getVar(variable,d,1) == checkvalue: @@ -614,6 +620,9 @@ python base_do_fetch() { except bb.fetch.NoMethodError: (type, value, traceback) = sys.exc_info() raise bb.build.FuncFailed("No method: %s" % value) + except bb.MalformedUrl: + (type, value, traceback) = sys.exc_info() + raise bb.build.FuncFailed("Malformed URL: %s" % value) try: bb.fetch.go(localdata) diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 37b17d6ccf..c4af34e8d7 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -716,3 +716,22 @@ COMBINED_FEATURES = "\ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbgadget", d)} \ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbhost", d)} \ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "wifi", d)}" + +# We want madwifi if all of the following are true: +# - distro has pci, wifi, and madwifi in its features +# - machine has pci in its features +COMBINED_FEATURES += "${@base_ifelse( \ + base_contains('DISTRO_FEATURES', ('pci', 'wifi', 'madwifi'), True, False, d) and \ + base_contains('MACHINE_FEATURES', 'pci', True, False, d), \ + 'madwifi', '')}" + +# We want hostap if all of the following are true: +# - 'wifi' and 'hostap' are in distro features +# - either 'pci' or 'pcmcia' are in both distro and machine features +COMBINED_FEATURES += "${@base_ifelse( \ + base_contains('DISTRO_FEATURES', ('wifi', 'hostap'), True, False, d) and \ + ((base_contains('MACHINE_FEATURES', 'pci', True, False, d) and \ + base_contains('DISTRO_FEATURES', 'pci', True, False, d)) or \ + (base_contains('MACHINE_FEATURES', 'pcmcia', True, False, d) and \ + base_contains('DISTRO_FEATURES', 'pcmcia', True, False, d))), \ + 'hostap', '')}" diff --git a/recipes/hostap/hostap-daemon_0.5.10.bb b/recipes/hostap/hostap-daemon_0.5.10.bb index ea493017fe..10eea40336 100644 --- a/recipes/hostap/hostap-daemon_0.5.10.bb +++ b/recipes/hostap/hostap-daemon_0.5.10.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://hostap.epitest.fi" SECTION = "kernel/userland" PRIORITY = "optional" LICENSE = "GPL" -DEPENDS = "openssl ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "",d)}" +DEPENDS = "openssl ${@base_contains("COMBINED_FEATURES", "madwifi", "madwifi-ng", "",d)}" PR = "r1" DEPENDS_append_mtx-1 = " madwifi-modules" DEPENDS_append_mtx-2 = " madwifi-modules" @@ -12,7 +12,7 @@ CPPFLAGS_append_mtx-2 = " -I${STAGING_INCDIR}/madwifi/" #we introduce MY_ARCH to get 'armv5te' as arch instead of the misleading 'arm' on armv5te builds MY_ARCH := "${PACKAGE_ARCH}" -PACKAGE_ARCH = "${@base_contains('COMBINED_FEATURES', 'pci', '${MACHINE_ARCH}', '${MY_ARCH}', d)}" +PACKAGE_ARCH = "${@base_contains('COMBINED_FEATURES', 'madwifi', '${MACHINE_ARCH}', '${MY_ARCH}', d)}" SRC_URI = "http://hostap.epitest.fi/releases/hostapd-${PV}.tar.gz \ file://makefile-cross.diff;patch=1 \ @@ -21,14 +21,14 @@ SRC_URI = "http://hostap.epitest.fi/releases/hostapd-${PV}.tar.gz \ S = "${WORKDIR}/hostapd-${PV}" -export HAS_PCI = "${@base_contains('COMBINED_FEATURES', 'pci', 1, 0,d)}" +export HAS_MADWIFI = "${@base_contains('COMBINED_FEATURES', 'madwifi', 1, 0,d)}" inherit update-rc.d INITSCRIPT_NAME=hostapd do_configure() { install -m 0644 ${WORKDIR}/defconfig ${S}/.config - if [ "x$HAS_PCI" = "x1" ] ; then + if [ "x$HAS_MADWIFI" = "x1" ] ; then echo "CONFIG_DRIVER_MADWIFI=y" >> .config echo "CFLAGS += -I${STAGING_INCDIR}/madwifi-ng" >> .config fi diff --git a/recipes/tasks/task-base.bb b/recipes/tasks/task-base.bb index 66c26af181..7316d8f911 100644 --- a/recipes/tasks/task-base.bb +++ b/recipes/tasks/task-base.bb @@ -340,13 +340,12 @@ RRECOMMENDS_task-base-ipsec = "\ # RDEPENDS_task-base-wifi = "\ wireless-tools \ - ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'hostap-utils', '',d)} \ - ${@base_contains('COMBINED_FEATURES', 'pci', 'hostap-utils', '',d)} \ - ${@base_contains('COMBINED_FEATURES', 'pci', 'madwifi-ng-tools', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'hostap', 'hostap-utils', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'madwifi', 'madwifi-ng-tools', '',d)} \ wpa-supplicant" RRECOMMENDS_task-base-wifi = "\ - ${@base_contains('COMBINED_FEATURES', 'pci', 'madwifi-ng-modules', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'madwifi', 'madwifi-ng-modules', '',d)} \ ${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-zd1211rw', '',d)} \ kernel-module-ieee80211-crypt \ kernel-module-ieee80211-crypt-ccmp \ diff --git a/recipes/tasks/task-mokogateway.bb b/recipes/tasks/task-mokogateway.bb index b0214dc388..a1e0bc2b02 100644 --- a/recipes/tasks/task-mokogateway.bb +++ b/recipes/tasks/task-mokogateway.bb @@ -55,8 +55,8 @@ DESCRIPTION_task-mokogateway-wifi = "MokoGateway: WiFi" RDEPENDS_task-mokogateway-wifi = "\ bridge-utils \ wireless-tools \ - ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng-modules", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng-tools", "",d)} \ + ${@base_contains("COMBINED_FEATURES", "madwifi", "madwifi-ng-modules", "",d)} \ + ${@base_contains("COMBINED_FEATURES", "madwifi", "madwifi-ng-tools", "",d)} \ wpa-supplicant \ " RRECOMMENDS_task-mokogateway-wifi = "\ diff --git a/recipes/wpa-supplicant/wpa-supplicant-0.6.inc b/recipes/wpa-supplicant/wpa-supplicant-0.6.inc index aee9ced4f7..05d439f8e2 100644 --- a/recipes/wpa-supplicant/wpa-supplicant-0.6.inc +++ b/recipes/wpa-supplicant/wpa-supplicant-0.6.inc @@ -2,11 +2,11 @@ DESCRIPTION = "A Client for Wi-Fi Protected Access (WPA)." SECTION = "network" LICENSE = "GPL" HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" -DEPENDS = "dbus gnutls ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "",d)}" +DEPENDS = "dbus gnutls ${@base_contains("COMBINED_FEATURES", "madwifi", "madwifi-ng", "",d)}" #we introduce MY_ARCH to get 'armv5te' as arch instead of the misleading 'arm' on armv5te builds MY_ARCH := "${PACKAGE_ARCH}" -PACKAGE_ARCH = "${@base_contains('COMBINED_FEATURES', 'pci', '${MACHINE_ARCH}', '${MY_ARCH}', d)}" +PACKAGE_ARCH = "${@base_contains('COMBINED_FEATURES', 'madwifi', '${MACHINE_ARCH}', '${MY_ARCH}', d)}" DEFAULT_PREFERENCE = "-2" @@ -26,12 +26,12 @@ RREPLACES = "wpa-supplicant-cli" RRECOMMENDS_${PN} = "wpa-supplicant-passphrase" -export HAS_PCI = "${@base_contains('COMBINED_FEATURES', 'pci', 1, 0,d)}" +export HAS_MADWIFI = "${@base_contains('COMBINED_FEATURES', 'madwifi', 1, 0,d)}" do_configure () { install -m 0755 ${WORKDIR}/defconfig-0.6.0-gnutls .config - if [ "x$HAS_PCI" == "x1" ] ; then + if [ "x$HAS_MADWIFI" == "x1" ] ; then echo "CONFIG_DRIVER_MADWIFI=y" >> .config echo "CFLAGS += -I${STAGING_INCDIR}/madwifi-ng" >> .config fi diff --git a/recipes/wpa-supplicant/wpa-supplicant_0.5.10.bb b/recipes/wpa-supplicant/wpa-supplicant_0.5.10.bb index 14186db40c..d502f77d83 100644 --- a/recipes/wpa-supplicant/wpa-supplicant_0.5.10.bb +++ b/recipes/wpa-supplicant/wpa-supplicant_0.5.10.bb @@ -2,13 +2,13 @@ DESCRIPTION = "A Client for Wi-Fi Protected Access (WPA)." SECTION = "network" LICENSE = "GPL" HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" -DEPENDS = "gnutls ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "",d)}" +DEPENDS = "gnutls ${@base_contains("COMBINED_FEATURES", "madwifi", "madwifi-ng", "",d)}" PR = "r1" #we introduce MY_ARCH to get 'armv5te' as arch instead of the misleading 'arm' on armv5te builds MY_ARCH := "${PACKAGE_ARCH}" -PACKAGE_ARCH = "${@base_contains('COMBINED_FEATURES', 'pci', '${MACHINE_ARCH}', '${MY_ARCH}', d)}" +PACKAGE_ARCH = "${@base_contains('COMBINED_FEATURES', 'madwifi', '${MACHINE_ARCH}', '${MY_ARCH}', d)}" SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \ file://defconfig-gnutls \ @@ -24,12 +24,12 @@ RREPLACES = "wpa-supplicant-cli" RRECOMMENDS_${PN} = "wpa-supplicant-passphrase" -export HAS_PCI = "${@base_contains('COMBINED_FEATURES', 'pci', 1, 0,d)}" +export HAS_MADWIFI = "${@base_contains('COMBINED_FEATURES', 'madwifi', 1, 0,d)}" do_configure () { install -m 0755 ${WORKDIR}/defconfig-gnutls .config - if [ "x$HAS_PCI" == "x1" ] ; then + if [ "x$HAS_MADWIFI" == "x1" ] ; then echo "CONFIG_DRIVER_MADWIFI=y" >> .config echo "CFLAGS += -I${STAGING_INCDIR}/madwifi-ng" >> .config fi |