Changeset 348


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/contrib/openwrt/openwrt.mk

    r347 r348  
    8585        patch -d $(OPENWRT_BUILD_DIR) -p 0 -N \
    8686          < $(PATCHES_DIR_OPENWRT)/trunk/005_make_empty_rootfs
    87         #patch -d $(OPENWRT_BUILD_DIR) -p 1 -N  < $(PATCHES_DIR_OPENWRT)/trunk/006_reverse-changeset27849-changes.patch
     87        #patch -d $(OPENWRT_BUILD_DIR) -p 0 -N  < $(PATCHES_DIR_OPENWRT)/trunk/006_reverse-changeset27849-changes.patch
    8888else ifeq ($(OPENWRT_BRANCH),backfire)
    8989        patch -d $(OPENWRT_BUILD_DIR) -p 0 -N \
     
    106106        -patch -R -d $(OPENWRT_BUILD_DIR) -p 0 -N \
    107107          < $(PATCHES_DIR_OPENWRT)/trunk/005_make_empty_rootfs
    108         #-patch -R -d $(OPENWRT_BUILD_DIR) -p 1 -N  < $(PATCHES_DIR_OPENWRT)/trunk/006_reverse-changeset27849-changes.patch
     108        #-patch -R -d $(OPENWRT_BUILD_DIR) -p 0 -N  < $(PATCHES_DIR_OPENWRT)/trunk/006_reverse-changeset27849-changes.patch
    109109else ifeq ($(OPENWRT_BRANCH),backfire)
    110110        -patch -R -d $(OPENWRT_BUILD_DIR) -p 0 -N \
  • branches/contrib/openwrt/patches/trunk/006_reverse-changeset27849-changes.patch

    r302 r348  
    1 Index: openwrt/package/kernel/modules/fs.mk
     1Index: package/kernel/modules/fs.mk
    22===================================================================
    3 --- openwrt.orig/package/kernel/modules/fs.mk   (revision 26901)
    4 +++ oenwrt/package/kernel/modules/fs.mk (revision 27849)
    5 @@ -77,5 +77,5 @@
     3--- package/kernel/modules/fs.mk        (revision 31633)
     4+++ package/kernel/modules/fs.mk        (working copy)
     5@@ -87,7 +87,7 @@
     6   SUBMENU:=$(FS_MENU)
    67   TITLE:=EXT2 filesystem support
    78   KCONFIG:=CONFIG_EXT2_FS
     
    1011   FILES:=$(LINUX_DIR)/fs/ext2/ext2.ko
    1112   AUTOLOAD:=$(call AutoLoad,32,ext2,1)
    12 @@ -95,5 +95,5 @@
     13 endef
     14@@ -105,7 +105,7 @@
     15   KCONFIG:= \
    1316        CONFIG_EXT3_FS \
    1417        CONFIG_JBD
     
    1720   FILES:= \
    1821        $(LINUX_DIR)/fs/ext3/ext3.ko \
    19 @@ -115,14 +115,9 @@
     22        $(LINUX_DIR)/fs/jbd/jbd.ko
     23@@ -125,16 +125,11 @@
     24   KCONFIG:= \
    2025        CONFIG_EXT4_FS \
    2126        CONFIG_JBD2
     
    2429        $(LINUX_DIR)/fs/ext4/ext4.ko \
    2530        $(LINUX_DIR)/fs/jbd2/jbd2.ko
    26 +  AUTOLOAD:=$(call AutoLoad,30,jbd2 ext4,1)
    2731- ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.37)),1)
    2832-    FILES+= \
     
    3236-    AUTOLOAD:=$(call AutoLoad,30,jbd2 ext4,1)
    3337- endif
     38+  AUTOLOAD:=$(call AutoLoad,30,jbd2 ext4,1)
    3439   $(call AddDepends/crc16)
    3540 endef
    36 @@ -181,4 +176,23 @@
    3741 
     42@@ -193,6 +188,25 @@
    3843 $(eval $(call KernelPackage,fs-isofs))
    39 +
    40 +
     44 
     45 
    4146+define KernelPackage/fs-mbcache
    4247+  SUBMENU:=$(FS_MENU)
     
    5661+
    5762+$(eval $(call KernelPackage,fs-mbcache))
    58  
    59  
     63+
     64+
     65 define KernelPackage/fs-minix
     66   SUBMENU:=$(FS_MENU)
     67   TITLE:=Minix filesystem support
Note: See TracChangeset for help on using the changeset viewer.