merge of 'a44afc798e40bba1259a38bb3528b174fe0f726f'

     and 'ff4945554f42e9be0ee0cf9d1a222718ac61d4b6'

8 files changed, 34 insertions, 74 deletions

diff --git a/conf/distro/angstrom-2007.1-oabi.conf b/conf/distro/angstrom-2007.1-oabi.conf
index d1541509c5..2c03702977 100644
--- a/conf/distro/angstrom-2007.1-oabi.conf
+++ b/conf/distro/angstrom-2007.1-oabi.conf
@@ -6,6 +6,9 @@ require conf/distro/angstrom-2007.1.conf
 #only glibc based builds are supported ATM
 TARGET_OS = "linux"
 
+PACKAGE_ARCH = "arm-oabi"
+PACKAGE_EXTRA_ARCHS = "arm-oabi"
+
 FEED_ARCH_collie       = "arm"
 FEED_ARCH_h3600        = "arm"
 FEED_ARCH_h3800        = "arm"
diff --git a/conf/machine/efika.conf b/conf/machine/efika.conf
index 7c277d3d73..d564dc5654 100644
--- a/conf/machine/efika.conf
+++ b/conf/machine/efika.conf
@@ -6,7 +6,7 @@
 TARGET_ARCH = "powerpc"
 PACKAGE_EXTRA_ARCHS = "ppc ppc603e"
 
-MACHINE_FEATURES = "kernel26 usbhost ext2 pci alsa"
+MACHINE_FEATURES = "kernel26 usbhost ext2 alsa"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
 
diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index cfe3613473..b3ea1beb77 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -140,7 +140,6 @@ SLUGOS_PACKAGES = "\
 	rng-tools \
 	rsync \
 	samba \
-	sane-backends \
 	sed \
 	setpwc \
 	setserial \
@@ -165,7 +164,6 @@ SLUGOS_PACKAGES = "\
 	wget \
 	wireless-tools \
 	wpa-supplicant \
-	zd1211 \
 	zip \
 	zlib \
 	"
@@ -184,11 +182,13 @@ SLUGOS_BROKEN_PACKAGES = "\
 	obexftp \
 	puppy \
 	qc-usb-messenger \
+	sane-backends \
 	unionfs-modules \
 	unionfs-utils \
 	cyrus-imapd \
 	lirc \
 	pwc \
+	zd1211 \
 	"
 
 # These packages will never build because uclibc lacks (and always will lack)
@@ -198,9 +198,9 @@ SLUGOS_BROKEN_PACKAGES = "\
 # calls often still have 'yp' in the name).
 
 # NOTE: rng-tools is only here until argp-standalone can be built!
+	nfs-utils \
 UCLIBC_UNSUPPORTABLE_PACKAGES = "\
 	libpam \
-	nfs-utils \
 	rng-tools \
 	postfix \
 	yp-tools ypbind ypserv \
diff --git a/packages/wpa-supplicant/wpa-supplicant_0.5.1.bb b/packages/wpa-supplicant/wpa-supplicant-0.5.inc
index 52eb62d848..28f355c612 100644
--- a/packages/wpa-supplicant/wpa-supplicant_0.5.1.bb
+++ b/packages/wpa-supplicant/wpa-supplicant-0.5.inc
@@ -2,15 +2,20 @@ DESCRIPTION = "A Client for Wi-Fi Protected Access (WPA)."
 SECTION = "network"
 LICENSE = "GPL"
 HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/"
-DEPENDS = "gnutls madwifi-ng"
+DEPENDS = "gnutls ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "",d)}"
 
-PR = "r5"
-DEFAULT_PREFERENCE = "-1"
+#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)}"
+
+DEFAULT_PREFERENCE = "-2"
 
 SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
 	file://defconfig-gnutls \
 	file://init.sh \
+	file://gnutlsfix.patch;patch=1 \
 	file://defaults-sane \
+	file://wpa-supplicant.sh \
 	file://wpa_supplicant.conf \
 	file://wpa_supplicant.conf-sane"
 
@@ -26,10 +31,15 @@ INITSCRIPT_NAME = "wpa"
 INITSCRIPT_PARAMS = "defaults 10"
 inherit update-rc.d
 
+export HAS_PCI = "${@base_contains('COMBINED_FEATURES', 'pci', 1, 0,d)}"
+
 do_configure () {
-	install -m 0755 ${WORKDIR}/defconfig-gnutls  .config
-	echo "CONFIG_DRIVER_MADWIFI=y" >> .config
-	echo "CFLAGS += -I${STAGING_INCDIR}/madwifi-ng" >> .config
+        install -m 0755 ${WORKDIR}/defconfig-gnutls  .config
+
+        if [ "x$HAS_PCI" == "x1" ] ; then
+                echo "CONFIG_DRIVER_MADWIFI=y" >> .config
+                echo "CFLAGS += -I${STAGING_INCDIR}/madwifi-ng" >> .config
+        fi
 }
 
 do_compile () {
@@ -53,4 +63,12 @@ do_install () {
 	install -d ${D}${sysconfdir}/default
 	install -m 600 ${WORKDIR}/defaults-sane ${D}${sysconfdir}/default/wpa
 	install -m 600 ${WORKDIR}/wpa_supplicant.conf-sane ${D}${sysconfdir}/wpa_supplicant.conf
+
+	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/packages/wpa-supplicant/wpa-supplicant-0.5.5/.mtn2git_empty b/packages/wpa-supplicant/wpa-supplicant/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/wpa-supplicant/wpa-supplicant-0.5.5/.mtn2git_empty
+++ b/packages/wpa-supplicant/wpa-supplicant/.mtn2git_empty
diff --git a/packages/wpa-supplicant/wpa-supplicant-0.5.5/gnutlsfix.patch b/packages/wpa-supplicant/wpa-supplicant/gnutlsfix.patch
index 795306bb35..795306bb35 100644
--- a/packages/wpa-supplicant/wpa-supplicant-0.5.5/gnutlsfix.patch
+++ b/packages/wpa-supplicant/wpa-supplicant/gnutlsfix.patch
diff --git a/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb b/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb
index 46ff13e3f0..67a5b99b0f 100644
--- a/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb
+++ b/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb
@@ -1,65 +1,3 @@
-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)}"
+require wpa-supplicant-0.5.inc
 
-#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)}"
-
-DEFAULT_PREFERENCE = "-2"
-
-SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
-	file://defconfig-gnutls \
-	file://init.sh \
-	file://gnutlsfix.patch;patch=1 \
-	file://defaults-sane \
-	file://wpa_supplicant.conf \
-	file://wpa_supplicant.conf-sane"
-
-S = "${WORKDIR}/wpa_supplicant-${PV}"
-
-PACKAGES_prepend = "wpa-supplicant-passphrase wpa-supplicant-cli "
-FILES_wpa-supplicant-passphrase = "/usr/sbin/wpa_passphrase"
-FILES_wpa-supplicant-cli = "/usr/sbin/wpa_cli"
-
-RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli"
-
-INITSCRIPT_NAME = "wpa"
-INITSCRIPT_PARAMS = "defaults 10"
-inherit update-rc.d
-
-export HAS_PCI = "${@base_contains('COMBINED_FEATURES', 'pci', 1, 0,d)}"
-
-do_configure () {
-        install -m 0755 ${WORKDIR}/defconfig-gnutls  .config
-
-        if [ "x$HAS_PCI" == "x1" ] ; then
-                echo "CONFIG_DRIVER_MADWIFI=y" >> .config
-                echo "CFLAGS += -I${STAGING_INCDIR}/madwifi-ng" >> .config
-        fi
-}
-
-do_compile () {
-	make
-}
-
-do_install () {
-	install -d ${D}${sbindir}
-	install -m 755 wpa_supplicant ${D}${sbindir}
-	install -m 755 wpa_passphrase ${D}${sbindir}
-	install -m 755 wpa_cli        ${D}${sbindir}
-
-	install -d ${D}${localstatedir}/run/wpa_supplicant
-
-	install -d ${D}${docdir}/wpa_supplicant
-	install -m 644 README ${WORKDIR}/wpa_supplicant.conf ${D}${docdir}/wpa_supplicant
-
-	install -d ${D}${sysconfdir}/init.d
-	install -m 700 ${WORKDIR}/init.sh ${D}${sysconfdir}/init.d/wpa
-
-	install -d ${D}${sysconfdir}/default
-	install -m 600 ${WORKDIR}/defaults-sane ${D}${sysconfdir}/default/wpa
-	install -m 600 ${WORKDIR}/wpa_supplicant.conf-sane ${D}${sysconfdir}/wpa_supplicant.conf
-}
+PR = "r1"
diff --git a/packages/wpa-supplicant/wpa-supplicant_0.5.7.bb b/packages/wpa-supplicant/wpa-supplicant_0.5.7.bb
new file mode 100644
index 0000000000..6594bbfdbe
--- /dev/null
+++ b/packages/wpa-supplicant/wpa-supplicant_0.5.7.bb
@@ -0,0 +1 @@
+require wpa-supplicant-0.5.inc