Changeset 348

Timestamp:

Sep 28, 2012, 8:20:45 AM (10 years ago)

Author:

ehem

Message:

Normalize the trunk/006_reverse-changeset27849-changes.patch with respect
to all the other patches to OpenWRT. Now use -p 0, instead of -p 1.

Location:

branches/contrib/openwrt

Files:

• openwrt.mk (modified) (2 diffs)
• patches/trunk/006_reverse-changeset27849-changes.patch (modified) (6 diffs)

branches/contrib/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 0 -N  < $(PATCHES_DIR_OPENWRT)/trunk/006_reverse-changeset27849-changes.patch
 else ifeq ($(OPENWRT_BRANCH),backfire)
         patch -d $(OPENWRT_BUILD_DIR) -p 0 -N \
@@ -106 +106 @@
         -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
+        #-patch -R -d $(OPENWRT_BUILD_DIR) -p 0 -N  < $(PATCHES_DIR_OPENWRT)/trunk/006_reverse-changeset27849-changes.patch
 else ifeq ($(OPENWRT_BRANCH),backfire)
         -patch -R -d $(OPENWRT_BUILD_DIR) -p 0 -N \

branches/contrib/openwrt/patches/trunk/006_reverse-changeset27849-changes.patch

@@ -1 @@
-Index: openwrt/package/kernel/modules/fs.mk
+Index: package/kernel/modules/fs.mk
 ===================================================================
---- openwrt.orig/package/kernel/modules/fs.mk   (revision 26901)
-+++ oenwrt/package/kernel/modules/fs.mk (revision 27849)
-@@ -77,5 +77,5 @@
+--- package/kernel/modules/fs.mk        (revision 31633)
++++ package/kernel/modules/fs.mk        (working copy)
+@@ -87,7 +87,7 @@
+   SUBMENU:=$(FS_MENU)
    TITLE:=EXT2 filesystem support
    KCONFIG:=CONFIG_EXT2_FS
@@ -10 +11 @@
    FILES:=$(LINUX_DIR)/fs/ext2/ext2.ko
    AUTOLOAD:=$(call AutoLoad,32,ext2,1)
-@@ -95,5 +95,5 @@
+ endef
+@@ -105,7 +105,7 @@
+   KCONFIG:= \
         CONFIG_EXT3_FS \
         CONFIG_JBD
@@ -17 +20 @@
    FILES:= \
         $(LINUX_DIR)/fs/ext3/ext3.ko \
-@@ -115,14 +115,9 @@
+        $(LINUX_DIR)/fs/jbd/jbd.ko
+@@ -125,16 +125,11 @@
+   KCONFIG:= \
         CONFIG_EXT4_FS \
         CONFIG_JBD2
@@ -24 +29 @@
         $(LINUX_DIR)/fs/ext4/ext4.ko \
         $(LINUX_DIR)/fs/jbd2/jbd2.ko
-+  AUTOLOAD:=$(call AutoLoad,30,jbd2 ext4,1)
 - ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.37)),1)
 -    FILES+= \
@@ -32 +36 @@
 -    AUTOLOAD:=$(call AutoLoad,30,jbd2 ext4,1)
 - endif
++  AUTOLOAD:=$(call AutoLoad,30,jbd2 ext4,1)
    $(call AddDepends/crc16)
  endef
-@@ -181,4 +176,23 @@
  
+@@ -193,6 +188,25 @@
  $(eval $(call KernelPackage,fs-isofs))
-+
-+
+ 
+ 
 +define KernelPackage/fs-mbcache
 +  SUBMENU:=$(FS_MENU)
@@ -56 +61 @@
 +
 +$(eval $(call KernelPackage,fs-mbcache))
- 
- 
++
++
+ define KernelPackage/fs-minix
+   SUBMENU:=$(FS_MENU)
+   TITLE:=Minix filesystem support