diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2013-05-31 22:52:54 +0200 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2013-05-31 22:52:54 +0200 |
| commit | accfdb5cba698fdaa2c9aeef4a745d47fdd059e8 (patch) | |
| tree | f85c263d5ab46842b0118190beaaa53ddfb8d123 /Makefile.am | |
| parent | b4180f474808646265f94a8de3ab6e7f683acee9 (diff) | |
ipset standalone package needs to ship em_ipset.c
Due to the ipset kernel API changes, em_ipset.c needs to be provided
in the ipset package, reported by Jan Engelhardt:
WARNING: //lib/modules/3.7.10-jng15-default/kernel/net/sched/em_ipset.ko
disagrees about version of symbol ip_set_test
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index c84a425..3fc9cb9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,7 @@ sparse-check: modules_sparse: if WITH_KMOD - ${MAKE} -C $(KBUILD_OUTPUT) M=$$PWD/kernel/net/netfilter \ + ${MAKE} -C $(KBUILD_OUTPUT) M=$$PWD/kernel/net \ V=$V W=1 C=2 CF="-D__CHECK_ENDIAN__ -Wsparse-all" \ KCFLAGS="-DPACKAGE_VERSION=$(PACKAGE_VERSION) -DCHECK_KCONFIG -Wextra" \ IP_SET_MAX=$(IP_SET_MAX) KDIR=$$PWD/kernel modules @@ -33,7 +33,7 @@ endif modules: if WITH_KMOD - ${MAKE} -C $(KBUILD_OUTPUT) M=$$PWD/kernel/net/netfilter V=$V \ + ${MAKE} -C $(KBUILD_OUTPUT) M=$$PWD/kernel/net V=$V \ KCFLAGS="-DPACKAGE_VERSION=$(PACKAGE_VERSION)" \ IP_SET_MAX=$(IP_SET_MAX) KDIR=$$PWD/kernel modules else @@ -59,7 +59,7 @@ export DEPMOD_WARNING modules_install: if WITH_KMOD - ${MAKE} -C $(KBUILD_OUTPUT) M=$$PWD/kernel/net/netfilter \ + ${MAKE} -C $(KBUILD_OUTPUT) M=$$PWD/kernel/net \ KDIR=$$PWD/kernel modules_install @modinfo ip_set_hash_ip | ${GREP} extra/ipset/ip_set_hash_ip >/dev/null || echo "$$DEPMOD_WARNING" else @@ -68,7 +68,7 @@ endif modules_clean: if WITH_KMOD - ${MAKE} -C $(KBUILD_OUTPUT) M=$$PWD/kernel/net/netfilter \ + ${MAKE} -C $(KBUILD_OUTPUT) M=$$PWD/kernel/net \ KDIR=$$PWD/kernel clean else @echo Skipping kernel modules due to --with-kmod=no |