Changeset 430


Ignore:
Timestamp:
Oct 10, 2012, 8:08:35 PM (7 years ago)
Author:
ehem
Message:

Switch to using -p1 for applying OpenWRT patches. This matches the way most
things are distributed as patches, even though not needed for DebWRT.

Location:
branches/contrib/openwrt
Files:
11 edited

Legend:

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

    r425 r430  
    103103        do \
    104104                pati=$$(echo $${pat} | sed -e's!$(TOPDIR)/!!') ; \
    105                 if ! patch -d "$(OPENWRT_BUILD_DIR)" -p 0 -N < $${pat} ; \
     105                if ! patch -d "$(OPENWRT_BUILD_DIR)" -p1 -N < "$${pat}" ; \
    106106                then \
    107107                        echo ">> fail: $${pati}" > /dev/stderr ; \
     
    121121
    122122openwrt/unpatch: openwrt/patch
     123        if [ ! -f openwrt/patch ]; then exit 0; fi; \
    123124        rev=$(call get_svn_revision,$(OPENWRT_BUILD_DIR)) ; \
    124125        find \
     
    132133        do \
    133134                pati=$$(echo $${pat} | sed -e's!$(TOPDIR)/!!') ; \
    134                 if ! patch -d "$(OPENWRT_BUILD_DIR)" -p 0 -R < $${pat} ; \
     135                if ! patch -d "$(OPENWRT_BUILD_DIR)" -p1 -R < "$${pat}" ; \
    135136                then \
    136137                        echo ">> fail: $${pati}" > /dev/stderr ; \
     
    144145        rm -f openwrt/patch ; \
    145146        touch $@
     147
    146148
    147149openwrt/files-copy: openwrt/patch
  • branches/contrib/openwrt/patches/all/012_disable_all_openwrt_packages

    r382 r430  
    1 --- include/toplevel.mk.org     2010-01-02 00:28:44.000000000 +0100
    2 +++ include/toplevel.mk 2010-01-02 00:14:07.000000000 +0100
     1--- openwrt/include/toplevel.mk.org     2010-01-02 00:28:44.000000000 +0100
     2+++ openwrt/include/toplevel.mk 2010-01-02 00:14:07.000000000 +0100
    33@@ -49,6 +49,11 @@
    44                f=tmp/.$${type}info; t=tmp/.config-$${type}.in; \
  • branches/contrib/openwrt/patches/all/031.set_kernel_version.DISABLED

    r349 r430  
    1 --- include/target.mk.org       2010-01-09 13:31:26.122174490 +0100
    2 +++ include/target.mk   2010-01-09 13:30:59.542175216 +0100
     1--- openwrt/include/target.mk.org       2010-01-09 13:31:26.122174490 +0100
     2+++ openwrt/include/target.mk   2010-01-09 13:30:59.542175216 +0100
    33@@ -8,6 +8,11 @@
    44 ifneq ($(__target_inc),1)
  • branches/contrib/openwrt/patches/all/041-backfire_save_environment_variables

    r413 r430  
    1 --- Makefile.org        2010-01-24 18:57:24.720963292 +0100
    2 +++ Makefile    2010-01-24 19:29:28.751015782 +0100
     1--- openwrt/Makefile.org        2010-01-24 18:57:24.720963292 +0100
     2+++ openwrt/Makefile    2010-01-24 19:29:28.751015782 +0100
    33@@ -72,8 +72,16 @@
    44 # check prerequisites before starting to build
  • branches/contrib/openwrt/patches/all/041-trunk-33632:_save_environment_variables

    r413 r430  
    1 --- Makefile.org        2012-10-06 22:19:55.000000000 +0200
    2 +++ Makefile    2012-10-06 22:23:53.000000000 +0200
     1--- openwrt/Makefile.org        2012-10-06 22:19:55.000000000 +0200
     2+++ openwrt/Makefile    2012-10-06 22:23:53.000000000 +0200
    33@@ -83,8 +83,16 @@
    44                exit 1; \
  • branches/contrib/openwrt/patches/all/041-trunk-:33631_save_environment_variables

    r413 r430  
    1 --- Makefile.org        2010-01-24 18:57:24.720963292 +0100
    2 +++ Makefile    2010-01-24 19:29:28.751015782 +0100
     1--- openwrt/Makefile.org        2010-01-24 18:57:24.720963292 +0100
     2+++ openwrt/Makefile    2010-01-24 19:29:28.751015782 +0100
    33@@ -72,8 +72,16 @@
    44 # check prerequisites before starting to build
  • branches/contrib/openwrt/patches/backfire/021_install_kernel_modules_and_merge_debwrt_config

    r349 r430  
    1 --- include/kernel-defaults.mk.org      2010-01-24 18:54:27.180961698 +0100
    2 +++ include/kernel-defaults.mk  2010-01-24 18:54:16.741060956 +0100
     1--- openwrt/include/kernel-defaults.mk.org      2010-01-24 18:54:27.180961698 +0100
     2+++ openwrt/include/kernel-defaults.mk  2010-01-24 18:54:16.741060956 +0100
    33@@ -96,7 +96,9 @@
    44        -$(_SINGLE)$(MAKE) $(KERNEL_MAKEOPTS) oldconfig prepare scripts
  • branches/contrib/openwrt/patches/backfire/025_make_empty_rootfs

    r349 r430  
    1 --- include/image.mk.org        2010-06-26 12:39:55.741248267 +0200
    2 +++ include/image.mk    2010-06-26 12:38:15.301415960 +0200
     1--- openwrt/include/image.mk.org        2010-06-26 12:39:55.741248267 +0200
     2+++ openwrt/include/image.mk    2010-06-26 12:38:15.301415960 +0200
    33@@ -99,7 +99,9 @@
    44   ifneq ($(CONFIG_TARGET_ROOTFS_SQUASHFS),)
  • branches/contrib/openwrt/patches/trunk/021_install_kernel_modules_and_merge_debwrt_config

    r377 r430  
    1 --- include/kernel-defaults.mk  2012-09-30 00:14:28.601162927 +0200
    2 +++ include/kernel-defaults.mk.new      2012-09-30 00:14:17.834676182 +0200
     1--- openwrt/include/kernel-defaults.mk  2012-09-30 00:14:28.601162927 +0200
     2+++ openwrt/include/kernel-defaults.mk.new      2012-09-30 00:14:17.834676182 +0200
    33@@ -96,9 +96,11 @@
    44 endif
  • branches/contrib/openwrt/patches/trunk/025_make_empty_rootfs

    r349 r430  
    1 --- include/image.mk.org        2012-02-15 20:30:10.713220246 +0100
    2 +++ include/image.mk    2012-02-15 20:41:49.980687722 +0100
     1--- openwrt/include/image.mk.org        2012-02-15 20:30:10.713220246 +0100
     2+++ openwrt/include/image.mk    2012-02-15 20:41:49.980687722 +0100
    33@@ -87,12 +87,26 @@
    44   endif
  • branches/contrib/openwrt/patches/trunk/027-27849:31633_reverse-changeset27849-changes.patch

    r349 r430  
    11Index: package/kernel/modules/fs.mk
    22===================================================================
    3 --- package/kernel/modules/fs.mk        (revision 31633)
    4 +++ package/kernel/modules/fs.mk        (working copy)
     3--- openwrt/package/kernel/modules/fs.mk        (revision 31633)
     4+++ openwrt/package/kernel/modules/fs.mk        (working copy)
    55@@ -87,7 +87,7 @@
    66   SUBMENU:=$(FS_MENU)
Note: See TracChangeset for help on using the changeset viewer.