This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".
The branch, master has been updated via b289d8329aa21b11f3dd992eb7d4b26de6717b29 (commit) from bf0d0d23a4b790f926456474dc2ba6090d77db8f (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit b289d8329aa21b11f3dd992eb7d4b26de6717b29 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Dec 12 22:20:36 2010 +0100
naoki: Add support for patches with level 0.
They must end with ".patch0".
-----------------------------------------------------------------------
Summary of changes: pkgs/Constants | 2 ++ tools/patch | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletions(-)
Difference in files: diff --git a/pkgs/Constants b/pkgs/Constants index 92d6477..3dc7239 100644 --- 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 93be79a..68fef90 100755 --- 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
hooks/post-receive -- IPFire 3.x development tree