Skip to contentSkip to conversation

compat-2.6: Fix admin-update.sh creating spurious include/linux/unaligned/unaligned/ directory

PATCH Applied Max Bowsher 2 participants 2 messages Mar 13, 2009

lore
Share & tools
lore
#1 lore raw
In reply to Max Bowsher
Quoted 11 lines · Max Bowsher

Hi,

I noticed that if compat-wireless-2.6's admin-update.sh is run twice in a row without cleaning, it erroneously copies the include/linux/unaligned/* files into an include/linux/unaligned/unaligned/ directory.

Patch below making trivial changes to the script to avoid this.

Thanks,
Max.

Thanks applied.

Luis

#0 lore raw

PATCH 1/1 compat-2.6: Fix admin-update.sh creating spurious include/linux/unaligned/unaligned/ directory

Hi,

I noticed that if compat-wireless-2.6's admin-update.sh is run twice in a row without cleaning, it erroneously copies the include/linux/unaligned/* files into an include/linux/unaligned/unaligned/ directory.

Patch below making trivial changes to the script to avoid this.

Thanks,
Max.

If admin-update.sh was run twice without an admin-clean.sh, a spurious additional /unaligned/ path component was created.

---
 scripts/admin-update.sh |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
scripts/admin-update.sh +2 -1
index 8eeef89..b40a5d6 100755
@@ -67,6 +67,7 @@ DRIVER_FILES="$DRIVER_FILES mac80211_hwsim.c"
 DRIVER_FILES="$DRIVER_FILES at76c50x-usb.c at76c50x-usb.h"
 
 mkdir -p include/linux/ include/net/ include/linux/usb \
+	include/linux/unaligned \
 	net/mac80211/ net/wireless/ \
 	drivers/ssb/ \
 	drivers/net/usb/ \
@@ -139,7 +140,7 @@ cp $GIT_TREE/$DIR/Makefile $DIR
 
 DIR="include/linux/unaligned"
 echo "Copying $GIT_TREE/$DIR/*"
-cp -a $GIT_TREE/$DIR $DIR
+cp $GIT_TREE/$DIR/* $DIR
 
 
 # Compat stuff
Signature · 1 line
1.6.0.4