diff options
| -rw-r--r-- | conf/distro/slugos.conf | 5 | ||||
| -rw-r--r-- | packages/madwifi/madwifi-ng_r1527-20060425.bb (renamed from packages/madwifi/madwifi-ng-modules_svn.bb) | 19 | ||||
| -rw-r--r-- | packages/meta/slugos-packages.bb | 5 | ||||
| -rw-r--r-- | packages/wpa-supplicant/files/slugos/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/wpa-supplicant/files/slugos/defaults-sane | 8 | ||||
| -rw-r--r-- | packages/wpa-supplicant/wpa-supplicant_0.5.1.bb | 9 |
6 files changed, 32 insertions, 14 deletions
diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf index 5a73aff7a2..acb055eb42 100644 --- a/conf/distro/slugos.conf +++ b/conf/distro/slugos.conf @@ -78,7 +78,7 @@ SLUGOS_IMAGENAME ?= "${DISTRO_NAME}" # pull in the frozen list of bbfiles - this sets BBFILES and this will override any # setting in local.conf Since this depends on ${DISTRO} it doesn't actually do # anything by default unless conf/distro/${DISTRO}-packages.conf exists. -include conf/distro/freeze.conf +# include conf/distro/freeze.conf #---------------------------------------------------------------------------------- # FEEDS @@ -182,6 +182,9 @@ PREFERRED_VERSION_ixp400-eth ?= "1.5" PREFERRED_PROVIDER_libx11 ?= "diet-x11" SRCDATE_diet-x11 ?= "20060106" +# Latest wpa-supplicant which supports madwifi-ng +PREFERRED_VERSION_wpa-supplicant ?= "0.5.1" + # Ensure consistency across all SlugOS builds for the provider of a # relational database - use the latest version of the SleepyCat # Berkeley database diff --git a/packages/madwifi/madwifi-ng-modules_svn.bb b/packages/madwifi/madwifi-ng_r1527-20060425.bb index ae3a499625..aa03b048a2 100644 --- a/packages/madwifi/madwifi-ng-modules_svn.bb +++ b/packages/madwifi/madwifi-ng_r1527-20060425.bb @@ -5,13 +5,13 @@ MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>" LICENSE = "GPL" RDEPENDS = "kernel (${KERNEL_VERSION})" DEPENDS = "virtual/kernel" -PV = "r1527-20060425" +PR="r0" -SRC_URI = "http://snapshots.madwifi.org/madwifi-ng/madwifi-ng-${PV}.tar.gz \ +SRC_URI = "http://snapshots.madwifi.org/${PN}/${PN}-${PV}.tar.gz \ file://10-xscale-be-elf-copts.patch;patch=1 \ file://10-xscale-le-elf-copts.patch;patch=1" -S = "${WORKDIR}/madwifi-ng-${PV}" +S = "${WORKDIR}/${PN}-${PV}" inherit module-base @@ -23,6 +23,13 @@ do_compile() { oe_runmake all } +do_stage() { + install -d ${STAGING_INCDIR}/${PN}/include + install -d ${STAGING_INCDIR}/${PN}/net80211 + cp --dereference include/compat.h ${STAGING_INCDIR}/${PN}/include/ + cp --dereference net80211/*.h ${STAGING_INCDIR}/${PN}/net80211/ +} + do_install() { install -d ${D}${sbindir} oe_runmake DESTDIR=${D} BINDIR=${sbindir} install @@ -36,6 +43,6 @@ else fi } -PACKAGES = "madwifi-ng-tools ${PN}" -FILES_${PN} = "/lib/modules/" -FILES_madwifi-ng-tools = "/usr/" +PACKAGES = "${PN}-modules ${PN}-tools" +FILES_${PN}-modules = "/lib/modules/" +FILES_${PN}-tools = "/usr/" diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index c9a54c4c2f..0baa850aa5 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -68,9 +68,6 @@ SLUGOS_PACKAGES = "\ grep \ gtk-doc \ gzip \ - hostap-daemon \ - hostap-modules \ - hostap-utils \ ifupdown \ ipkg-utils \ iptables \ @@ -96,7 +93,7 @@ SLUGOS_PACKAGES = "\ lsof \ lvm2 \ m4 \ - madwifi-ng-modules \ + madwifi-ng \ mailx \ make \ masqmail \ diff --git a/packages/wpa-supplicant/files/slugos/.mtn2git_empty b/packages/wpa-supplicant/files/slugos/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/wpa-supplicant/files/slugos/.mtn2git_empty diff --git a/packages/wpa-supplicant/files/slugos/defaults-sane b/packages/wpa-supplicant/files/slugos/defaults-sane new file mode 100644 index 0000000000..df4268b3a6 --- /dev/null +++ b/packages/wpa-supplicant/files/slugos/defaults-sane @@ -0,0 +1,8 @@ +# Useful flags: +# -i <ifname> Interface (required, unless specified in config) +# -D <driver> Wireless Driver +# -d Debugging (-dd for more) +# -q Quiet (-qq for more) + +CONFIG="/etc/wpa_supplicant.conf" +OPTIONS="-i ath0 -D madwifi" diff --git a/packages/wpa-supplicant/wpa-supplicant_0.5.1.bb b/packages/wpa-supplicant/wpa-supplicant_0.5.1.bb index d91d123105..236992f8f0 100644 --- a/packages/wpa-supplicant/wpa-supplicant_0.5.1.bb +++ b/packages/wpa-supplicant/wpa-supplicant_0.5.1.bb @@ -4,8 +4,9 @@ LICENSE = "GPL" MAINTAINER = "Holger Schurig" MAINTAINER = "Eric Shattow <lucent@gmail.com>" HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" -DEPENDS = "gnutls" -PR = "r1" +DEPENDS = "gnutls madwifi-ng" + +PR = "r4" DEFAULT_PREFERENCE = "-1" SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \ @@ -17,7 +18,7 @@ SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \ S = "${WORKDIR}/wpa_supplicant-${PV}" -PACKAGES_prepend = "wpa-supplicant-passphrase wpa-supplicant-cli" +PACKAGES_prepend = "wpa-supplicant-passphrase wpa-supplicant-cli " FILES_wpa-supplicant-passphrase = "/usr/sbin/wpa_passphrase" FILES_wpa-supplicant-cli = "/usr/sbin/wpa_cli" @@ -29,6 +30,8 @@ inherit update-rc.d do_configure () { install -m 0755 ${WORKDIR}/defconfig-gnutls .config + echo "CONFIG_DRIVER_MADWIFI=y" >> .config + echo "CFLAGS += -I${STAGING_INCDIR}/madwifi-ng" >> .config } do_compile () { |