Merge madwifi-free branch into the trunk

[madwifi/.git] / patch-kernel / install.sh

diff --git a/patch-kernel/install.sh b/patch-kernel/install.sh
index e343b1c790be5afde6c2c3dae5cee7470413ec87..bf04d27ec43ed3b6552ee2a5d176b2af9b278113 100755 (executable)
--- a/patch-kernel/install.sh
+++ b/patch-kernel/install.sh
@@ -39,8 +39,8 @@ PATCH()
 # Location of various pieces.  These mimic what is in Makefile.inc
 # and can be overridden from the environment.
 #
-SRC_HAL=${HAL:-${SRC}/hal}
-test -d ${SRC_HAL} || die "No hal directory ${SRC_HAL}"
+SRC_HAL=${HAL:-${SRC}/ath_hal}
+test -d ${SRC_HAL} || die "No ath_hal directory ${SRC_HAL}"
 SRC_NET80211=${WLAN:-${SRC}/net80211}
 test -d ${SRC_NET80211} || die "No net80211 directory ${SRC_NET80211}"
 SRC_ATH=${ATH:-${SRC}/ath}
@@ -74,7 +74,8 @@ cp -f ${SRC}/BuildCaps.inc ${SRC}/svnversion.h ${SRC}/release.h ${MADWIFI}
 
 
 echo "Copying source files"
-FILES=$(cd ${SRC} && find ath ath_hal ath_rate hal include net80211 -name '*.[ch]')
+FILES=$(cd ${SRC} && find ath ath_hal ath_rate include net80211 -name '*.[ch]')
+FILES="$FILES $(cd ${SRC} && find ath_hal -name '*.ini')"
 for f in $FILES; do
        case $f in
                *.mod.c) continue;;
@@ -88,11 +89,6 @@ FILES=$(cd ${SRC} && find . -name Makefile.kernel)
 for f in $FILES; do
        cp -f ${SRC}/$f $(dirname ${MADWIFI}/$f)/Makefile
 done
-cp -f ${SRC}/ath_hal/ah_target.inc ${MADWIFI}/ath_hal
-
-echo "Copying Atheros HAL files"
-DST_HAL=${MADWIFI}/hal
-cp -f ${SRC_HAL}/public/*.hal.o.uu ${DST_HAL}/public
 
 
 echo "Patching the build system"