naoki: Add support for patches with level 0.

They must end with ".patch0".

diff --git a/pkgs/Constants b/pkgs/Constants
index 92d64775652901ecfae1fd4753709e458328e4f5..3dc72399b11335612f618fd3c0cba4b0aefc5cf0 100644 (file)
--- a/pkgs/Constants
+++ b/pkgs/Constants
@@ -118,6 +118,8 @@ PKG_PACKAGES_FILES = $(foreach package,$(PKG_PACKAGES),$(call DO_PACKAGE_FILENAM
 # Automatically detect all patches in "patches"
 PKG_PATCHES = \
        $(foreach patch,$(wildcard $(DIR_PATCHES)/*.patch),$(notdir $(patch)))
+PKG_PATCHES += \
+       $(foreach patch,$(wildcard $(DIR_PATCHES)/*.patch0),$(notdir $(patch)))
 
 # Dynamic command that applies all patches
 DO_PATCHES = cd $(DIR_APP) && $(DIR_TOOLS)/patch $(foreach patch,$(PKG_PATCHES),$(DIR_PATCHES)/$(patch))

diff --git a/tools/patch b/tools/patch
index 93be79a0a8109f98ac02ac0189f54fd960e6d786..68fef901aff236f147a7681d887cc4b3efc1ac43 100755 (executable)
--- a/tools/patch
+++ b/tools/patch
@@ -3,7 +3,13 @@
 for patch in $@; do
        echo "Applying file ${patch}..."
 
-       patch -Np1 -i ${patch}
+       if [ "${patch##*/*.}" = "patch0" ]; then
+               cmd="patch -Np0"
+       else
+               cmd="patch -Np1"
+       fi
+
+       ${cmd} -i ${patch}
        ret=$?
 
        if [ ${ret} -ne 0 ]; then