summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-10-07 07:26:10 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-10-07 07:26:10 +0200
commit618e0b61bc296740d04485167f8370536a25e7fd (patch)
tree9794f596d1861cf13938ebc79b7ec02c26034911
parent4a3faaba0887f8d79b055864ec43054ba0820666 (diff)
quote PATH, might contain white spaces
-rw-r--r--mk/vars.mk6
-rw-r--r--package/ipset/patches/patch-kernel_ipt_SET_c30
2 files changed, 3 insertions, 33 deletions
diff --git a/mk/vars.mk b/mk/vars.mk
index 0e699a9b9..c6e92a02c 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -201,8 +201,8 @@ HOST_CFLAGS:= -O0 -g0
HOST_CXXFLAGS:= -O0 -g0
HOST_LDFLAGS:= -L$(STAGING_HOST_DIR)/usr/lib -Wl,-rpath -Wl,${STAGING_HOST_DIR}/usr/lib
-PATCH= PATH=${HOST_PATH} ${BASH} $(SCRIPT_DIR)/patch.sh
-PATCHP0= PATH=${HOST_PATH} patch -p0
+PATCH= PATH='${HOST_PATH}' ${BASH} $(SCRIPT_DIR)/patch.sh
+PATCHP0= PATH='${HOST_PATH}' patch -p0
ifeq ($(ADK_STATIC_TOOLCHAIN),y)
HOST_STATIC_CFLAGS:= -static -Wl,-static
@@ -211,7 +211,7 @@ HOST_STATIC_LDFLAGS:= -Wl,-static
HOST_STATIC_LLDFLAGS:= -all-static
endif
-SED:= PATH=${HOST_PATH} sed -i -e
+SED:= PATH='${HOST_PATH}' sed -i -e
LINUX_DIR:= $(BUILD_DIR)/linux
KERNEL_MODULE_FLAGS:= ARCH=${ADK_TARGET_ARCH} \
PREFIX=/usr \
diff --git a/package/ipset/patches/patch-kernel_ipt_SET_c b/package/ipset/patches/patch-kernel_ipt_SET_c
deleted file mode 100644
index 22c1aff14..000000000
--- a/package/ipset/patches/patch-kernel_ipt_SET_c
+++ /dev/null
@@ -1,30 +0,0 @@
---- ipset-4.1.orig/kernel/ipt_SET.c 2009-11-10 21:45:41.000000000 +0100
-+++ ipset-4.1/kernel/ipt_SET.c 2010-08-29 14:45:51.863658421 +0200
-@@ -64,9 +64,12 @@ target(struct sk_buff *skb,
- unsigned int hooknum,
- const struct xt_target *target,
- const void *targinfo)
--#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) */
-+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)
- target(struct sk_buff *skb,
- const struct xt_target_param *par)
-+#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35) */
-+target(struct sk_buff *skb,
-+ const struct xt_action_param *par)
- #endif
- {
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
-@@ -127,9 +130,12 @@ checkentry(const char *tablename,
- const struct xt_target *target,
- void *targinfo,
- unsigned int hook_mask)
--#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) */
-+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)
- static bool
- checkentry(const struct xt_tgchk_param *par)
-+#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35) */
-+static int
-+checkentry(const struct xt_tgchk_param *par)
- #endif
- {
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)