From cca449193c2206d59d733407379792cb4fc2967c Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 4 Aug 2008 23:30:10 +0200 Subject: [PATCH] Changed madwifi to hal 0.10.5.6 changed madwifi binary dir from /usr/local/bin to /usr/bin fix samba libsasl dependency --- config/hostapd/config | 2 +- config/rootfiles/common/madwifi | 41 +++++++++++----------- config/rootfiles/updater/filelists/madwifi | 41 +++++++++++----------- doc/packages-list.txt | 2 +- lfs/hostapd | 1 - lfs/madwifi | 23 +++++------- lfs/samba | 2 +- src/initscripts/init.d/hostapd | 6 ++-- 8 files changed, 55 insertions(+), 63 deletions(-) diff --git a/config/hostapd/config b/config/hostapd/config index e95e7f7db5..75b1ce1280 100644 --- a/config/hostapd/config +++ b/config/hostapd/config @@ -17,7 +17,7 @@ CONFIG_DRIVER_HOSTAP=y # Driver interface for madwifi driver CONFIG_DRIVER_MADWIFI=y -CFLAGS += -I../madwifi-0.9.4 # change to reflect local setup; directory for madwifi src +CFLAGS += -I../madwifi # change to reflect local setup; directory for madwifi src # Driver interface for Prism54 driver #CONFIG_DRIVER_PRISM54=y diff --git a/config/rootfiles/common/madwifi b/config/rootfiles/common/madwifi index c684ea9327..d4bf0ea14a 100644 --- a/config/rootfiles/common/madwifi +++ b/config/rootfiles/common/madwifi @@ -1,22 +1,21 @@ etc/madwifi.conf -usr/local/bin/80211debug -usr/local/bin/80211stats -usr/local/bin/ath_info -usr/local/bin/athchans -usr/local/bin/athctrl -usr/local/bin/athdebug -usr/local/bin/athkey -usr/local/bin/athstats -usr/local/bin/madwifi-unload -usr/local/bin/wlanconfig -usr/local/bin/wpakey -#usr/local/man/man8 -#usr/local/man/man8/80211debug.8 -#usr/local/man/man8/80211stats.8 -#usr/local/man/man8/athchans.8 -#usr/local/man/man8/athctrl.8 -#usr/local/man/man8/athdebug.8 -#usr/local/man/man8/athkey.8 -#usr/local/man/man8/athstats.8 -#usr/local/man/man8/wlanconfig.8 -#usr/local/share/man/man8/ath_info.8 +usr/bin/80211debug +usr/bin/80211stats +usr/bin/ath_info +usr/bin/athchans +usr/bin/athctrl +usr/bin/athdebug +usr/bin/athkey +usr/bin/athstats +usr/bin/madwifi-unload +usr/bin/wlanconfig +usr/bin/wpakey +#usr/man/man8 +#usr/man/man8/80211debug.8 +#usr/man/man8/80211stats.8 +#usr/man/man8/athchans.8 +#usr/man/man8/athctrl.8 +#usr/man/man8/athdebug.8 +#usr/man/man8/athkey.8 +#usr/man/man8/athstats.8 +#usr/man/man8/wlanconfig.8 diff --git a/config/rootfiles/updater/filelists/madwifi b/config/rootfiles/updater/filelists/madwifi index c684ea9327..d4bf0ea14a 100644 --- a/config/rootfiles/updater/filelists/madwifi +++ b/config/rootfiles/updater/filelists/madwifi @@ -1,22 +1,21 @@ etc/madwifi.conf -usr/local/bin/80211debug -usr/local/bin/80211stats -usr/local/bin/ath_info -usr/local/bin/athchans -usr/local/bin/athctrl -usr/local/bin/athdebug -usr/local/bin/athkey -usr/local/bin/athstats -usr/local/bin/madwifi-unload -usr/local/bin/wlanconfig -usr/local/bin/wpakey -#usr/local/man/man8 -#usr/local/man/man8/80211debug.8 -#usr/local/man/man8/80211stats.8 -#usr/local/man/man8/athchans.8 -#usr/local/man/man8/athctrl.8 -#usr/local/man/man8/athdebug.8 -#usr/local/man/man8/athkey.8 -#usr/local/man/man8/athstats.8 -#usr/local/man/man8/wlanconfig.8 -#usr/local/share/man/man8/ath_info.8 +usr/bin/80211debug +usr/bin/80211stats +usr/bin/ath_info +usr/bin/athchans +usr/bin/athctrl +usr/bin/athdebug +usr/bin/athkey +usr/bin/athstats +usr/bin/madwifi-unload +usr/bin/wlanconfig +usr/bin/wpakey +#usr/man/man8 +#usr/man/man8/80211debug.8 +#usr/man/man8/80211stats.8 +#usr/man/man8/athchans.8 +#usr/man/man8/athctrl.8 +#usr/man/man8/athdebug.8 +#usr/man/man8/athkey.8 +#usr/man/man8/athstats.8 +#usr/man/man8/wlanconfig.8 diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 398a6abd56..28632f8cc2 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -177,7 +177,7 @@ * lzo-2.02 * m4-1.4.4 * mISDNuser-1_1_8 -* madwifi-0.9.4-wlan +* madwifi-hal-0.10.5.6-r3835-20080801 * make-3.81 * man-db-2.4.3 * man-pages-2.34 diff --git a/lfs/hostapd b/lfs/hostapd index e58e4b978e..c0bf830ad3 100644 --- a/lfs/hostapd +++ b/lfs/hostapd @@ -77,7 +77,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_SRC) && tar xzf $(DIR_DL)/madwifi-0.9.4.tar.gz cd $(DIR_APP) && cp $(DIR_SRC)/config/hostapd/config ./.config cd $(DIR_APP) && sed -e "s@/usr/local@/usr@g" -i Makefile cd $(DIR_APP) && make && make install diff --git a/lfs/madwifi b/lfs/madwifi index 1ea024f12d..73e9c8d414 100644 --- a/lfs/madwifi +++ b/lfs/madwifi @@ -24,16 +24,16 @@ include Config -VER = svn3841 +VER = hal-0.10.5.6-r3835-20080801 THISAPP = madwifi-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) ifeq "$(SMP)" "" - TARGET = $(DIR_INFO)/$(THISAPP)-wlan + TARGET = $(DIR_INFO)/$(THISAPP) else - TARGET = $(DIR_INFO)/$(THISAPP)-wlan-smp + TARGET = $(DIR_INFO)/$(THISAPP)-smp endif ############################################################################### @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 60c8ce7553b55eff618b49aeee3bc3b5 +$(DL_FILE)_MD5 = 23018ff3366b427eb9cbe5ac653bc1ab install : $(TARGET) @@ -73,15 +73,10 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xjf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && sed -i -e "s/\/sbin\/depmod -ae//" Makefile - cd $(DIR_APP) && sed -i -e "94,96d" Makefile - # workaround for build on lfs - ln -s $(DIR_APP)/net80211/if_ethersubr.h $(DIR_APP)/ath/if_ethersubr.h - ln -s $(DIR_APP)/net80211/if_media.h $(DIR_APP)/ath/if_media.h - ln -s $(DIR_APP)/net80211/if_llc.h $(DIR_APP)/ath/if_llc.h - cd $(DIR_APP) && make KERNELPATH=/usr/src/linux - cd $(DIR_APP) && make install KERNELPATH=/usr/src/linux + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xzf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && make $(MAKETUNING) KERNELPATH=/usr/src/linux + cd $(DIR_APP) && make KERNELPATH=/usr/src/linux BINDIR=/usr/bin \ + MANDIR=/usr/man install ifeq "$(SMP)" "" cp $(DIR_SRC)/config/madwifi/madwifi.conf /etc/ ln -s $(DIR_APP) $(DIR_SRC)/madwifi diff --git a/lfs/samba b/lfs/samba index 05d4439b57..1c91528265 100644 --- a/lfs/samba +++ b/lfs/samba @@ -34,7 +34,7 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = samba PAK_VER = 7 -DEPS = "cups" +DEPS = "cups cyrus-sasl" ############################################################################### # Top-level Rules diff --git a/src/initscripts/init.d/hostapd b/src/initscripts/init.d/hostapd index 6fa326e82e..b529c5cd22 100644 --- a/src/initscripts/init.d/hostapd +++ b/src/initscripts/init.d/hostapd @@ -6,8 +6,8 @@ case "${1}" in start) # enable wlan module of collectd sed -i -e "s|#LoadPlugin wireless|LoadPlugin wireless|g" /etc/collectd.conf - /usr/local/bin/wlanconfig ath0 destroy - /usr/local/bin/wlanconfig blue0 create wlandev wifi0 wlanmode ap + /usr/bin/wlanconfig ath0 destroy + /usr/bin/wlanconfig blue0 create wlandev wifi0 wlanmode ap /usr/sbin/iwconfig blue0 channel 05 /usr/bin/hostapd -P /var/run/hostapd /etc/hostapd.conf & evaluate_retval @@ -16,7 +16,7 @@ case "${1}" in stop) # Just make sure when going down the first time blue0 nw values are ignored sed -i -e 's/^ACTION=="add", SUBSYSTEM=="net", SYSFS{address}=="*", NAME="blue0"*/#ACTION=="add", SUBSYSTEM=="net", SYSFS{address}=="*", NAME="blue0"*/' /etc/udev/rules.d/30-persistent-network.rules - /usr/local/bin/wlanconfig blue0 destroy + /usr/bin/wlanconfig blue0 destroy killproc /usr/bin/hostapd evaluate_retval ;; -- 2.39.2