From 66f0e82be433c5f54941af7166fab74ab11c7d5a Mon Sep 17 00:00:00 2001 From: Max Bowsher Date: Fri, 13 Mar 2009 21:52:40 +0000 Subject: [PATCH] compat-2.6: Fix admin-update.sh creating spurious unaligned/unaligned/ directory 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. If admin-update.sh was run twice without an admin-clean.sh, a spurious additional /unaligned/ path component was created. Signed-off-by: Max Bowsher --- scripts/admin-update.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/admin-update.sh b/scripts/admin-update.sh index 8eeef892ff9f..b40a5d6d9dbc 100755 --- a/scripts/admin-update.sh +++ b/scripts/admin-update.sh @@ -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 -- 2.30.2