Changeset 336

Timestamp:

Jun 20, 2012, 12:33:34 PM (10 years ago)

Author:

amain

Message:

Remove temporary patch 006_reverse-changeset27849-changes.patch

File:

• trunk/openwrt/openwrt.mk (modified) (2 diffs)

trunk/openwrt/openwrt.mk

@@ -85 +85 @@
         patch -d $(OPENWRT_BUILD_DIR) -p 0 -N \
           < $(PATCHES_DIR_OPENWRT)/trunk/005_make_empty_rootfs
-        #patch -d $(OPENWRT_BUILD_DIR) -p 1 -N \
-      < $(PATCHES_DIR_OPENWRT)/trunk/006_reverse-changeset27849-changes.patch
+        #patch -d $(OPENWRT_BUILD_DIR) -p 1 -N  < $(PATCHES_DIR_OPENWRT)/trunk/006_reverse-changeset27849-changes.patch
 else ifeq ($(IS_OPENWRT_BACKFIRE),y)
         patch -d $(OPENWRT_BUILD_DIR) -p 0 -N \
@@ -98 +97 @@
           < $(PATCHES_DIR_OPENWRT)/004_save_environment_variables
         touch $@
+
+openwrt/unpatch: openwrt/checkout
+        -patch -R -d $(OPENWRT_BUILD_DIR) -p 0 -N \
+          < $(PATCHES_DIR_OPENWRT)/001_disable_all_openwrt_packages
+ifeq ($(IS_OPENWRT_TRUNK),y)
+        -patch -R -d $(OPENWRT_BUILD_DIR) -p 0 -N \
+          < $(PATCHES_DIR_OPENWRT)/trunk/002_install_kernel_modules_and_merge_debwrt_config
+        -patch -R -d $(OPENWRT_BUILD_DIR) -p 0 -N \
+          < $(PATCHES_DIR_OPENWRT)/trunk/005_make_empty_rootfs
+        #-patch -R -d $(OPENWRT_BUILD_DIR) -p 1 -N  < $(PATCHES_DIR_OPENWRT)/trunk/006_reverse-changeset27849-changes.patch
+else ifeq ($(IS_OPENWRT_BACKFIRE),y)
+        -patch -R -d $(OPENWRT_BUILD_DIR) -p 0 -N \
+          < $(PATCHES_DIR_OPENWRT)/backfire/002_install_kernel_modules_and_merge_debwrt_config
+        -patch -R -d $(OPENWRT_BUILD_DIR) -p 0 -N \
+          < $(PATCHES_DIR_OPENWRT)/backfire/005_make_empty_rootfs
+endif
+        #-patch -R -d $(OPENWRT_BUILD_DIR) -p 0 -N \
+          < $(PATCHES_DIR_OPENWRT)/003_set_kernel_version
+        -patch -R -d $(OPENWRT_BUILD_DIR) -p 0 -N \
+          < $(PATCHES_DIR_OPENWRT)/004_save_environment_variables
+        touch $@
+        
 
 openwrt/files-copy: openwrt/patch