summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2008-12-17 10:32:06 +0000
committerPeter Korsgaard <jacmet@sunsite.dk>2008-12-17 10:32:06 +0000
commit2be151db5dcf41e006a3519a3f1512b0d90ac8be (patch)
treec4ebf4c7a6778ab66278146703fb913a6f3c36f6
parent7591247d51cec39a8434ceae549719a40387a006 (diff)
openswan: revert $(strip ...) change (r24307) on patches
Thanks to Markus for noticing.
-rw-r--r--package/openswan/linux-2.6.20-openswan-2.4.7.kernel-2.6-klips.patch6
-rw-r--r--package/openswan/linux-2.6.20.4-openswan-2.4.7.kernel-2.6-klips.patch6
-rw-r--r--package/openswan/linux-2.6.21.5-openswan-2.4.8.kernel-2.6-klips.patch6
-rw-r--r--package/openswan/linux-2.6.22.6-openswan-2.4.9.kernel-2.6-klips.patch6
4 files changed, 12 insertions, 12 deletions
diff --git a/package/openswan/linux-2.6.20-openswan-2.4.7.kernel-2.6-klips.patch b/package/openswan/linux-2.6.20-openswan-2.4.7.kernel-2.6-klips.patch
index 1fba869ac..4a3338d20 100644
--- a/package/openswan/linux-2.6.20-openswan-2.4.7.kernel-2.6-klips.patch
+++ b/package/openswan/linux-2.6.20-openswan-2.4.7.kernel-2.6-klips.patch
@@ -9774,7 +9774,7 @@ packaging/utils/kernelpatch 2.6
+asm-obj-$(CONFIG_MWINCHIP3D) += match686.o
+
+obj-y += $(asm-obj-y)
-+ifneq ($(asm-obj-y),)
++ifneq ($(strip $(asm-obj-y)),)
+ EXTRA_CFLAGS += -DASMV
+endif
+
@@ -13864,12 +13864,12 @@ packaging/utils/kernelpatch 2.6
+++ linux/net/ipsec/alg/Makefile Mon Feb 9 13:51:03 2004
@@ -0,0 +1,112 @@
+# Makefile,v 1.1.2.1 2003/11/21 18:12:23 jjo Exp
-+ifeq ($(KLIPSMODULE),)
++ifeq ($(strip $(KLIPSMODULE)),)
+FREESWANSRCDIR=.
+else
+FREESWANSRCDIR=../../../..
+endif
-+ifeq ($(KLIPS_TOP),)
++ifeq ($(strip $(KLIPS_TOP)),)
+KLIPS_TOP=../../..
+override EXTRA_CFLAGS += -I$(KLIPS_TOP)/include
+endif
diff --git a/package/openswan/linux-2.6.20.4-openswan-2.4.7.kernel-2.6-klips.patch b/package/openswan/linux-2.6.20.4-openswan-2.4.7.kernel-2.6-klips.patch
index 1fba869ac..4a3338d20 100644
--- a/package/openswan/linux-2.6.20.4-openswan-2.4.7.kernel-2.6-klips.patch
+++ b/package/openswan/linux-2.6.20.4-openswan-2.4.7.kernel-2.6-klips.patch
@@ -9774,7 +9774,7 @@ packaging/utils/kernelpatch 2.6
+asm-obj-$(CONFIG_MWINCHIP3D) += match686.o
+
+obj-y += $(asm-obj-y)
-+ifneq ($(asm-obj-y),)
++ifneq ($(strip $(asm-obj-y)),)
+ EXTRA_CFLAGS += -DASMV
+endif
+
@@ -13864,12 +13864,12 @@ packaging/utils/kernelpatch 2.6
+++ linux/net/ipsec/alg/Makefile Mon Feb 9 13:51:03 2004
@@ -0,0 +1,112 @@
+# Makefile,v 1.1.2.1 2003/11/21 18:12:23 jjo Exp
-+ifeq ($(KLIPSMODULE),)
++ifeq ($(strip $(KLIPSMODULE)),)
+FREESWANSRCDIR=.
+else
+FREESWANSRCDIR=../../../..
+endif
-+ifeq ($(KLIPS_TOP),)
++ifeq ($(strip $(KLIPS_TOP)),)
+KLIPS_TOP=../../..
+override EXTRA_CFLAGS += -I$(KLIPS_TOP)/include
+endif
diff --git a/package/openswan/linux-2.6.21.5-openswan-2.4.8.kernel-2.6-klips.patch b/package/openswan/linux-2.6.21.5-openswan-2.4.8.kernel-2.6-klips.patch
index c3541bcd9..7f2520237 100644
--- a/package/openswan/linux-2.6.21.5-openswan-2.4.8.kernel-2.6-klips.patch
+++ b/package/openswan/linux-2.6.21.5-openswan-2.4.8.kernel-2.6-klips.patch
@@ -9785,7 +9785,7 @@ packaging/utils/kernelpatch 2.6
+asm-obj-$(CONFIG_MWINCHIP3D) += match686.o
+
+obj-y += $(asm-obj-y)
-+ifneq ($(asm-obj-y),)
++ifneq ($(strip $(asm-obj-y)),)
+ EXTRA_CFLAGS += -DASMV
+endif
+
@@ -13875,12 +13875,12 @@ packaging/utils/kernelpatch 2.6
+++ linux/net/ipsec/alg/Makefile Mon Feb 9 13:51:03 2004
@@ -0,0 +1,112 @@
+# Makefile,v 1.1.2.1 2003/11/21 18:12:23 jjo Exp
-+ifeq ($(KLIPSMODULE),)
++ifeq ($(strip $(KLIPSMODULE)),)
+FREESWANSRCDIR=.
+else
+FREESWANSRCDIR=../../../..
+endif
-+ifeq ($(KLIPS_TOP),)
++ifeq ($(strip $(KLIPS_TOP)),)
+KLIPS_TOP=../../..
+override EXTRA_CFLAGS += -I$(KLIPS_TOP)/include
+endif
diff --git a/package/openswan/linux-2.6.22.6-openswan-2.4.9.kernel-2.6-klips.patch b/package/openswan/linux-2.6.22.6-openswan-2.4.9.kernel-2.6-klips.patch
index 751eb2ba8..0b8257ab8 100644
--- a/package/openswan/linux-2.6.22.6-openswan-2.4.9.kernel-2.6-klips.patch
+++ b/package/openswan/linux-2.6.22.6-openswan-2.4.9.kernel-2.6-klips.patch
@@ -9785,7 +9785,7 @@ packaging/utils/kernelpatch 2.6
+asm-obj-$(CONFIG_MWINCHIP3D) += match686.o
+
+obj-y += $(asm-obj-y)
-+ifneq ($(asm-obj-y),)
++ifneq ($(strip $(asm-obj-y)),)
+ EXTRA_CFLAGS += -DASMV
+endif
+
@@ -13875,12 +13875,12 @@ packaging/utils/kernelpatch 2.6
+++ linux/net/ipsec/alg/Makefile Mon Feb 9 13:51:03 2004
@@ -0,0 +1,112 @@
+# Makefile,v 1.1.2.1 2003/11/21 18:12:23 jjo Exp
-+ifeq ($(KLIPSMODULE),)
++ifeq ($(strip $(KLIPSMODULE)),)
+FREESWANSRCDIR=.
+else
+FREESWANSRCDIR=../../../..
+endif
-+ifeq ($(KLIPS_TOP),)
++ifeq ($(strip $(KLIPS_TOP)),)
+KLIPS_TOP=../../..
+override EXTRA_CFLAGS += -I$(KLIPS_TOP)/include
+endif