[PATCH 1/3] compat-wireless: update clean scripts

[PATCH 1/3] compat-wireless: update clean scripts

[Hauke Mehrtens]

Without this patch make fails after calling make clean because compat_*
files were deleted.

Delete all files generated by scripts/admin-update.sh in
scripts/admin-clean.sh and not in make clean

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 Makefile               |    2 --
 scripts/admin-clean.sh |   12 +++++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 1da7e87..e204112 100644
--- a/Makefile
+++ b/Makefile
@@ -337,8 +337,6 @@ clean:
 		$(MAKE) -C $(KLIB_BUILD) M=$(PWD) clean ;\
 	fi
 	@rm -f $(CREL_PRE)*
-	@rm -f code-metrics.txt
-	@rm -f compat_base_tree compat_base_tree_version compat_version
 unload:
 	@./scripts/unload.sh
 
diff --git a/scripts/admin-clean.sh b/scripts/admin-clean.sh
index ae5f188..86d5460 100755
--- a/scripts/admin-clean.sh
+++ b/scripts/admin-clean.sh
@@ -2,12 +2,14 @@
 if [ -d net ] ; then
 	make clean
 fi
-rm -rf net drivers include
+rm -rf net
 rm -rf drivers
 rm -rf include
-rm -f Module.symvers
-rm -f git-describe
+rm -rf compat
+rm -rf udev
 rm -f master-tag
-rm -f compat-git-release
-rm -f compat-release
+rm -f compat_base_tree
+rm -f compat_base_tree_version
+rm -f compat_version
+rm -f code-metrics.txt
 echo "Cleaned wireless-bt-compat-2.6"
-- 
1.7.0.4

[PATCH 2/3] compat-wireless: use /etc/init.d/ and not sudo service

[Hauke Mehrtens]

sudo is not installed and used on all distributions. the user should
call the script with the needed rights and the script should not
include sudo. This fails on debian lenny.

service is only available on very recent distributions and not on old
ons like debian lenny in the default configuration. Use the old init.d
script. This also works on ubuntu 10.04.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 scripts/btload.sh   |    4 ++--
 scripts/btunload.sh |    4 ++--
 scripts/load.sh     |    4 ++--
 scripts/unload.sh   |    4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/btload.sh b/scripts/btload.sh
index 50f37b6..e3f7cef 100755
--- a/scripts/btload.sh
+++ b/scripts/btload.sh
@@ -5,6 +5,6 @@ for i in $MODULES; do
 	modprobe $i
 done
 echo Starting bluetooth service..
-sudo service bluetooth start
-sudo service bluetooth status
+/etc/init.d/bluetooth start
+/etc/init.d/bluetooth status
 
diff --git a/scripts/btunload.sh b/scripts/btunload.sh
index c14f8c6..56046c2 100755
--- a/scripts/btunload.sh
+++ b/scripts/btunload.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 MODULES="hidp rfcomm bnep l2cap sco btusb bluetooth"
 echo Stoping bluetooth service..
-sudo service bluetooth stop
-sudo service bluetooth status
+/etc/init.d/bluetooth stop
+/etc/init.d/bluetooth status
 
 for i in $MODULES; do
 	grep ^$i /proc/modules 2>&1 > /dev/null
diff --git a/scripts/load.sh b/scripts/load.sh
index 9f82e2c..304798c 100755
--- a/scripts/load.sh
+++ b/scripts/load.sh
@@ -22,5 +22,5 @@ athload ath5k
 # For b43 we must make sure to unload bcm43xx first
 b43load b43
 echo Starting bluetooth service..
-sudo service bluetooth start
-sudo service bluetooth status
+/etc/init.d/bluetooth start
+/etc/init.d/bluetooth status
diff --git a/scripts/unload.sh b/scripts/unload.sh
index 0cd8a0a..12bb35c 100755
--- a/scripts/unload.sh
+++ b/scripts/unload.sh
@@ -31,8 +31,8 @@ MODULES="$MODULES mac80211 cfg80211 lib80211"
 MODULES="$MODULES hidp rfcomm bnep l2cap sco btusb bluetooth"
 MODULES="$MODULES compat"
 echo Stoping bluetooth service..
-sudo service bluetooth stop
-sudo service bluetooth status
+/etc/init.d/bluetooth stop
+/etc/init.d/bluetooth status
 MADWIFI_MODULES="ath_pci ath_rate_sample wlan_scan_sta wlan ath_hal"
 IPW3945D="/sbin/ipw3945d-`uname -r`"
 
-- 
1.7.0.4

[PATCH 3/3] compat-wireless: run refresh only on last applied directory

[Hauke Mehrtens]

running "./scripts/admin-refresh.sh -n -p -c refresh" failed because the patches were applied but

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 scripts/admin-update.sh |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/scripts/admin-update.sh b/scripts/admin-update.sh
index 99ab6c3..36cce31 100755
--- a/scripts/admin-update.sh
+++ b/scripts/admin-update.sh
@@ -391,12 +391,6 @@ patchRefresh() {
 	rm -rf patches.orig .pc $1/series
 }
 
-if [[ "$REFRESH" = "y" ]]; then
-	for dir in $EXTRA_PATCHES; do
-		patchRefresh $dir
-	done
-fi
-
 ORIG_CODE=$(find ./ -type f -name  \*.[ch] |
 	egrep -v "^./compat/|include/linux/compat" |
 	xargs wc -l | tail -1 | awk '{print $1}')
@@ -404,6 +398,14 @@ printf "\n${CYAN}compat-wireless code metrics${NORMAL}\n\n" > $CODE_METRICS
 printf "${PURPLE}%10s${NORMAL} - Total upstream code being pulled\n" $ORIG_CODE >> $CODE_METRICS
 
 for dir in $EXTRA_PATCHES; do
+	LAST_ELEM=$dir
+done
+
+for dir in $EXTRA_PATCHES; do
+	if [[ $LAST_ELEM = $dir && "$REFRESH" = y ]]; then
+		patchRefresh $dir
+	fi
+
 	FOUND=$(find $dir/ -name \*.patch | wc -l)
 	if [ $FOUND -eq 0 ]; then
 		continue
-- 
1.7.0.4

[PATCH 3/3] compat-wireless: run refresh only on last applied directory

[Hauke Mehrtens]

Running "./scripts/admin-refresh.sh -n -p -c refresh" failed because 
patchRefresh refreshes and applies every patch form the series and 
then  reverse them all. If a patch from the next series in an other 
directory depends on that it will not apply any more.

Now only the last series/directory will be refresh.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---

commit comment was not ready ;-)

 scripts/admin-update.sh |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/scripts/admin-update.sh b/scripts/admin-update.sh
index 99ab6c3..36cce31 100755
--- a/scripts/admin-update.sh
+++ b/scripts/admin-update.sh
@@ -391,12 +391,6 @@ patchRefresh() {
 	rm -rf patches.orig .pc $1/series
 }
 
-if [[ "$REFRESH" = "y" ]]; then
-	for dir in $EXTRA_PATCHES; do
-		patchRefresh $dir
-	done
-fi
-
 ORIG_CODE=$(find ./ -type f -name  \*.[ch] |
 	egrep -v "^./compat/|include/linux/compat" |
 	xargs wc -l | tail -1 | awk '{print $1}')
@@ -404,6 +398,14 @@ printf "\n${CYAN}compat-wireless code metrics${NORMAL}\n\n" > $CODE_METRICS
 printf "${PURPLE}%10s${NORMAL} - Total upstream code being pulled\n" $ORIG_CODE >> $CODE_METRICS
 
 for dir in $EXTRA_PATCHES; do
+	LAST_ELEM=$dir
+done
+
+for dir in $EXTRA_PATCHES; do
+	if [[ $LAST_ELEM = $dir && "$REFRESH" = y ]]; then
+		patchRefresh $dir
+	fi
+
 	FOUND=$(find $dir/ -name \*.patch | wc -l)
 	if [ $FOUND -eq 0 ]; then
 		continue
-- 
1.7.0.4

Re: [PATCH 3/3] compat-wireless: run refresh only on last applied directory

[Luis R. Rodriguez]

On Sat, May 29, 2010 at 6:44 AM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
> Running "./scripts/admin-refresh.sh -n -p -c refresh" failed because
> patchRefresh refreshes and applies every patch form the series and
> then  reverse them all. If a patch from the next series in an other
> directory depends on that it will not apply any more.
>
> Now only the last series/directory will be refresh.
>
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

All applied, thanks!

  Luis