]> granicus.if.org Git - ipset/commitdiff
Support chroot buildroots
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Sun, 13 Mar 2016 14:18:58 +0000 (15:18 +0100)
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Sun, 13 Mar 2016 14:18:58 +0000 (15:18 +0100)
The calling of modinfo at `make modules_install` did not take into
account chroot buildroots (reported by Jan Engelhardt).

Makefile.am

index 684ebee5b100b936022443b625c7b606bf640287..e3404fae6a98b374ab1925835d428af578f6986b 100644 (file)
@@ -16,6 +16,7 @@ IP_SET_MAX=$(MAXSETS)
 endif
 
 SUBDIRS                = include/libipset lib src utils
+INSTALL_MOD_PATH = /
 
 sparse:
        $(MAKE) -C lib sparse-check
@@ -71,7 +72,7 @@ modules_install:
 if WITH_KMOD
        ${MAKE} -C $(KBUILD_OUTPUT) M=$$PWD/kernel/net \
                        KDIR=$$PWD/kernel modules_install
-       @modinfo ip_set_hash_ip | ${GREP} /extra/ >/dev/null || echo "$$DEPMOD_WARNING"
+       @modinfo -b ${INSTALL_MOD_PATH} ip_set_hash_ip | ${GREP} /extra/ >/dev/null || echo "$$DEPMOD_WARNING"
        @lsmod | ${GREP} '^ip_set' >/dev/null && echo "$$MODULE_WARNING"
 else
        @echo Skipping kernel modules due to --with-kmod=no