diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-10-23 20:11:44 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-10-23 20:11:44 +0200 |
| commit | b6f9b99a95d9937dbb7d38cfc792f304af60d5b1 (patch) | |
| tree | 1a6e97384cd118bc61a0e3742b1624821b9e4ee4 | |
| parent | f45d1a3f26255ec6b65e8a4d3145eb495786558e (diff) | |
| parent | e0ab58405982a858f0e9d4c16c456131c7ba791d (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | mk/vars.mk | 6 | ||||
| -rw-r--r-- | package/ipset/patches/patch-kernel_ipt_SET_c | 30 | ||||
| -rw-r--r-- | target/config/Config.in.tools | 1 |
3 files changed, 4 insertions, 33 deletions
diff --git a/mk/vars.mk b/mk/vars.mk index 1d36b633e..18a0d6199 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) diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index bdfca0606..965a9125e 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -34,6 +34,7 @@ config ADK_HOST_BUILD_LIBTOOL config ADK_HOST_BUILD_U_BOOT boolean default n if ADK_HOST_DARWIN + default n if ADK_HOST_CYGWIN default y # always required, but can be provided by host |