From 1a8c0d67ff56b62d132267fafdd881d69a38ba30 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Thu, 10 Dec 2009 16:33:59 -0800 Subject: [PATCH] Re-order patch location and compat code The patches can now go on the top level dir as that is all we ship with. The top level compat/ dir now exists as the home of the copied compat module and we build the compat module there. Signed-off-by: Luis R. Rodriguez --- Makefile | 7 +++++- {compat/patches => patches}/01-netdev.patch | 0 {compat/patches => patches}/02-ksize.patch | 0 {compat/patches => patches}/03-rfkill.patch | 0 {compat/patches => patches}/04-netns.patch | 0 {compat/patches => patches}/05-usb.patch | 0 .../06-header-changes.patch | 0 .../07-change-default-rate-alg.patch | 0 .../08-rename-iwl4965-config.patch | 0 .../patches => patches}/09-threaded-irq.patch | 0 .../10-add-wext-handlers-to-netdev.patch | 0 .../patches => patches}/11-dev-pm-ops.patch | 0 .../12-iw_handler-changes.patch | 0 {compat/patches => patches}/13-trace.patch | 0 .../patches => patches}/14-device-type.patch | 0 .../15-symbol-export-conflicts.patch | 0 .../patches => patches}/16-bluetooth.patch | 0 .../98-add-compat-wireless.patch | 0 .../99-change-makefiles.patch | 0 {compat/patches => patches}/README | 0 scripts/admin-update.sh | 23 ++++++++----------- 21 files changed, 15 insertions(+), 15 deletions(-) rename {compat/patches => patches}/01-netdev.patch (100%) rename {compat/patches => patches}/02-ksize.patch (100%) rename {compat/patches => patches}/03-rfkill.patch (100%) rename {compat/patches => patches}/04-netns.patch (100%) rename {compat/patches => patches}/05-usb.patch (100%) rename {compat/patches => patches}/06-header-changes.patch (100%) rename {compat/patches => patches}/07-change-default-rate-alg.patch (100%) rename {compat/patches => patches}/08-rename-iwl4965-config.patch (100%) rename {compat/patches => patches}/09-threaded-irq.patch (100%) rename {compat/patches => patches}/10-add-wext-handlers-to-netdev.patch (100%) rename {compat/patches => patches}/11-dev-pm-ops.patch (100%) rename {compat/patches => patches}/12-iw_handler-changes.patch (100%) rename {compat/patches => patches}/13-trace.patch (100%) rename {compat/patches => patches}/14-device-type.patch (100%) rename {compat/patches => patches}/15-symbol-export-conflicts.patch (100%) rename {compat/patches => patches}/16-bluetooth.patch (100%) rename {compat/patches => patches}/98-add-compat-wireless.patch (100%) rename {compat/patches => patches}/99-change-makefiles.patch (100%) rename {compat/patches => patches}/README (100%) diff --git a/Makefile b/Makefile index 1658ac88d4f2..c76ec029d03a 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,12 @@ include $(M)/$(COMPAT_CONFIG) NOSTDINC_FLAGS := -I$(M)/include/ -include $(M)/include/net/compat.h $(CFLAGS) -obj-y := net/bluetooth/ net/compat/ net/wireless/ net/mac80211/ net/rfkill/ +obj-y := \ + compat/ \ + net/rfkill/ + net/bluetooth/ \ + net/wireless/ net/mac80211/ + ifeq ($(ONLY_CORE),) obj-m += \ drivers/ssb/ \ diff --git a/compat/patches/01-netdev.patch b/patches/01-netdev.patch similarity index 100% rename from compat/patches/01-netdev.patch rename to patches/01-netdev.patch diff --git a/compat/patches/02-ksize.patch b/patches/02-ksize.patch similarity index 100% rename from compat/patches/02-ksize.patch rename to patches/02-ksize.patch diff --git a/compat/patches/03-rfkill.patch b/patches/03-rfkill.patch similarity index 100% rename from compat/patches/03-rfkill.patch rename to patches/03-rfkill.patch diff --git a/compat/patches/04-netns.patch b/patches/04-netns.patch similarity index 100% rename from compat/patches/04-netns.patch rename to patches/04-netns.patch diff --git a/compat/patches/05-usb.patch b/patches/05-usb.patch similarity index 100% rename from compat/patches/05-usb.patch rename to patches/05-usb.patch diff --git a/compat/patches/06-header-changes.patch b/patches/06-header-changes.patch similarity index 100% rename from compat/patches/06-header-changes.patch rename to patches/06-header-changes.patch diff --git a/compat/patches/07-change-default-rate-alg.patch b/patches/07-change-default-rate-alg.patch similarity index 100% rename from compat/patches/07-change-default-rate-alg.patch rename to patches/07-change-default-rate-alg.patch diff --git a/compat/patches/08-rename-iwl4965-config.patch b/patches/08-rename-iwl4965-config.patch similarity index 100% rename from compat/patches/08-rename-iwl4965-config.patch rename to patches/08-rename-iwl4965-config.patch diff --git a/compat/patches/09-threaded-irq.patch b/patches/09-threaded-irq.patch similarity index 100% rename from compat/patches/09-threaded-irq.patch rename to patches/09-threaded-irq.patch diff --git a/compat/patches/10-add-wext-handlers-to-netdev.patch b/patches/10-add-wext-handlers-to-netdev.patch similarity index 100% rename from compat/patches/10-add-wext-handlers-to-netdev.patch rename to patches/10-add-wext-handlers-to-netdev.patch diff --git a/compat/patches/11-dev-pm-ops.patch b/patches/11-dev-pm-ops.patch similarity index 100% rename from compat/patches/11-dev-pm-ops.patch rename to patches/11-dev-pm-ops.patch diff --git a/compat/patches/12-iw_handler-changes.patch b/patches/12-iw_handler-changes.patch similarity index 100% rename from compat/patches/12-iw_handler-changes.patch rename to patches/12-iw_handler-changes.patch diff --git a/compat/patches/13-trace.patch b/patches/13-trace.patch similarity index 100% rename from compat/patches/13-trace.patch rename to patches/13-trace.patch diff --git a/compat/patches/14-device-type.patch b/patches/14-device-type.patch similarity index 100% rename from compat/patches/14-device-type.patch rename to patches/14-device-type.patch diff --git a/compat/patches/15-symbol-export-conflicts.patch b/patches/15-symbol-export-conflicts.patch similarity index 100% rename from compat/patches/15-symbol-export-conflicts.patch rename to patches/15-symbol-export-conflicts.patch diff --git a/compat/patches/16-bluetooth.patch b/patches/16-bluetooth.patch similarity index 100% rename from compat/patches/16-bluetooth.patch rename to patches/16-bluetooth.patch diff --git a/compat/patches/98-add-compat-wireless.patch b/patches/98-add-compat-wireless.patch similarity index 100% rename from compat/patches/98-add-compat-wireless.patch rename to patches/98-add-compat-wireless.patch diff --git a/compat/patches/99-change-makefiles.patch b/patches/99-change-makefiles.patch similarity index 100% rename from compat/patches/99-change-makefiles.patch rename to patches/99-change-makefiles.patch diff --git a/compat/patches/README b/patches/README similarity index 100% rename from compat/patches/README rename to patches/README diff --git a/scripts/admin-update.sh b/scripts/admin-update.sh index 979477fc8ab4..3a9dafbeb9bd 100755 --- a/scripts/admin-update.sh +++ b/scripts/admin-update.sh @@ -218,20 +218,15 @@ cp $GIT_TREE/$DIR/* $DIR # Compat stuff -COMPAT_BT="net/compat" -for i in $COMPAT_BT; do - mkdir -p $i - echo "Copying $GIT_COMPAT_TREE/$i/*.[ch]" - cp $GIT_COMPAT_TREE/*.c $i/ - #cp $GIT_COMPAT_TREE/*.h include/net - cp $GIT_COMPAT_TREE/Makefile $i/ - rm -f $i/*.mod.c -done -#cp compat/*.h include/net/ -cp $GIT_COMPAT_TREE/*.h include/net/ -cp compat/compat-2.6.33.h include/net/ - -for i in compat/patches/*.patch; do +COMPAT="compat" +mkdir -p $COMPAT +echo "Copying $GIT_COMPAT_TREE/ files..." +cp $GIT_COMPAT_TREE/compat/*.c $COMPAT/ +cp $GIT_COMPAT_TREE/Makefile $COMPAT/ +cp $GIT_COMPAT_TREE/include/linux/*.h include/linux/ +rm -f $COMPAT/*.mod.c + +for i in patches/*.patch; do echo -e "${GREEN}Applying backport patch${NORMAL}: ${BLUE}$i${NORMAL}" patch -p1 -N -t < $i RET=$? -- 2.30.2