]> git.ipfire.org Git - thirdparty/ipset.git/commitdiff
Add ipset package version to external module description
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Tue, 27 Nov 2012 13:58:03 +0000 (14:58 +0100)
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Tue, 27 Nov 2012 13:58:03 +0000 (14:58 +0100)
Makefile.am
kernel/net/netfilter/ipset/ip_set_core.c

index f4fd978dc7085831aa89c89a9e4c352ff4724e4f..9e2d59b44e50c765d9abe62d9d8649ba43bac646 100644 (file)
@@ -21,6 +21,7 @@ modules_sparse:
 if WITH_KMOD
        ${MAKE} -C $(KBUILD_OUTPUT) M=$$PWD/kernel/net/netfilter \
                        V=$V C=2 CF=-D__CHECK_ENDIAN__ \
+                       KCFLAGS="-DPACKAGE_VERSION=$(PACKAGE_VERSION)" \
                        IP_SET_MAX=$(IP_SET_MAX) KDIR=$$PWD/kernel modules
 else
        @echo Skipping kernel modules due to --with-kmod=no
@@ -29,6 +30,7 @@ endif
 modules:
 if WITH_KMOD
        ${MAKE} -C $(KBUILD_OUTPUT) M=$$PWD/kernel/net/netfilter V=$V \
+                       KCFLAGS="-DPACKAGE_VERSION=$(PACKAGE_VERSION)" \
                        IP_SET_MAX=$(IP_SET_MAX) KDIR=$$PWD/kernel modules
 else
        @echo Skipping kernel modules due to --with-kmod=no
index b32912fa8f7ff185fe06d28e6eb957f80afc6008..bd87ef862774e1c6b3523e18c3209f1cef8879c6 100644 (file)
@@ -43,11 +43,16 @@ static ip_set_id_t ip_set_max = CONFIG_IP_SET_MAX; /* max number of sets */
 
 static unsigned int max_sets;
 
+#define _IP_SET_CORE_MODULE_DESC(a)    \
+       MODULE_DESCRIPTION("core IP set support (v" a ")")
+#define IP_SET_CORE_MODULE_DESC(a)     \
+       _IP_SET_CORE_MODULE_DESC(__stringify(a))
+
 module_param(max_sets, int, 0600);
 MODULE_PARM_DESC(max_sets, "maximal number of sets");
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>");
-MODULE_DESCRIPTION("core IP set support");
+IP_SET_CORE_MODULE_DESC(PACKAGE_VERSION);
 MODULE_ALIAS_NFNL_SUBSYS(NFNL_SUBSYS_IPSET);
 
 #ifndef rcu_dereference_protected