[kernel] r6241 - in dists/sid/linux-2.6/debian/patches: . series

[Bastian Blank]

Author: waldi
Date: Mon Mar 20 15:50:32 2006
New Revision: 6241

Added:
   dists/sid/linux-2.6/debian/patches/scripts-newmake.patch   (contents, props changed)
Modified:
   dists/sid/linux-2.6/debian/patches/series/1
Log:
Add patch to fix recent incompatibilities between make and kbuild.

* debian/patches/series/1: Add scripts-newmake.patch.
* debian/patches/scripts-newmake.patch: Add.


Added: dists/sid/linux-2.6/debian/patches/scripts-newmake.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/scripts-newmake.patch	Mon Mar 20 15:50:32 2006
@@ -0,0 +1,30 @@
+diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
+index 0168d6c..d774b0e 100644
+--- a/scripts/Kbuild.include
++++ b/scripts/Kbuild.include
+@@ -79,7 +79,7 @@ echo-cmd = $(if $($(quiet)cmd_$(1)), \
+ # >'< substitution is for echo to work, >$< substitution to preserve $ when reloading .cmd file
+ # note: when using inline perl scripts [perl -e '...$$t=1;...'] in $(cmd_xxx) double $$ your perl vars
+ # 
+-if_changed = $(if $(strip $? $(call arg-check, $(cmd_$(1)), $(cmd_$@)) ), \
++if_changed = $(if $(strip $(filter-out FORCE, $?) $(call arg-check, $(cmd_$(1)), $(cmd_$@)) ), \
+ 	@set -e; \
+ 	$(echo-cmd) \
+ 	$(cmd_$(1)); \
+@@ -87,7 +87,7 @@ if_changed = $(if $(strip $? $(call arg-
+ 
+ # execute the command and also postprocess generated .d dependencies
+ # file
+-if_changed_dep = $(if $(strip $? $(filter-out FORCE $(wildcard $^),$^)\
++if_changed_dep = $(if $(strip $(filter-out FORCE, $?) $(filter-out FORCE $(wildcard $^),$^)\
+ 	$(call arg-check, $(cmd_$(1)), $(cmd_$@)) ),                  \
+ 	@set -e; \
+ 	$(echo-cmd) \
+@@ -99,6 +99,6 @@ if_changed_dep = $(if $(strip $? $(filte
+ # Usage: $(call if_changed_rule,foo)
+ # will check if $(cmd_foo) changed, or any of the prequisites changed,
+ # and if so will execute $(rule_foo)
+-if_changed_rule = $(if $(strip $? $(call arg-check, $(cmd_$(1)), $(cmd_$@)) ),\
++if_changed_rule = $(if $(strip $(filter-out FORCE, $?) $(call arg-check, $(cmd_$(1)), $(cmd_$@)) ),\
+ 			@set -e; \
+ 			$(rule_$(1)))

Modified: dists/sid/linux-2.6/debian/patches/series/1
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/1	(original)
+++ dists/sid/linux-2.6/debian/patches/series/1	Mon Mar 20 15:50:32 2006
@@ -25,3 +25,4 @@
 + video-vino-64-bit-fix-kernel.diff
 + s390-drivers-ccw-uevent-modalias.patch
 + s390-drivers-ccw-uevent-cleanup.patch
++ scripts-newmake.patch