主要是改了Makefile适配新的编译系统,次要是优化了一丢丢写法

This commit is contained in:
chn
2020-07-31 20:21:03 +08:00
parent 01fd2480d5
commit 75fdf912a5
3 changed files with 18 additions and 15 deletions

View File

@@ -6,16 +6,6 @@ PKG_RELEASE:=99
include $(INCLUDE_DIR)/package.mk
EXTRA_CFLAGS:= \
$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(EXTRA_KCONFIG)))) \
$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(EXTRA_KCONFIG)))) \
-DVERSION="\"\\\"$(PKG_RELEASE)\\\"\"" --verbose
MAKE_OPTS:=$(KERNEL_MAKE_FLAGS) \
SUBDIRS="$(PKG_BUILD_DIR)" \
EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
CONFIG_XMURP_UA=m
define KernelPackage/xmurp-ua
SUBMENU:=Other modules
TITLE:=xmurp-ua
@@ -24,6 +14,19 @@ define KernelPackage/xmurp-ua
KCONFIG:=
endef
EXTRA_KCONFIG:= \
CONFIG_XMURP_UA=m
EXTRA_CFLAGS:= \
$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(EXTRA_KCONFIG)))) \
$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(EXTRA_KCONFIG)))) \
-DVERSION=$(PKG_RELEASE) --verbose
MAKE_OPTS:=$(KERNEL_MAKE_FLAGS) \
M="$(PKG_BUILD_DIR)" \
EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
$(EXTRA_KCONFIG)
define Build/Compile
$(MAKE) -C "$(LINUX_DIR)" $(MAKE_OPTS) modules
endef

View File

@@ -16,7 +16,9 @@
#include <linux/mutex.h>
typedef _Bool bool;
#define static_assert _Static_assert
#ifndef static_assert
#define static_assert _Static_assert
#endif
const static unsigned char* str_uaBegin = "User-Agent: ";
const static unsigned char* str_uaEnd = "\r\n";

View File

@@ -30,9 +30,7 @@ static int __init hook_init(void)
rkpm = rkpManager_new();
memcpy(str_uaRkp, "RKP/", 4);
memcpy(str_uaRkp + 4, VERSION, 2);
memcpy(str_uaRkp + 6, ".0", 3);
sprintf(str_uaRkp, "RKP/%d.0", VERSION);
nfho[0].hooknum = NF_INET_LOCAL_IN;
nfho[1].hooknum = NF_INET_LOCAL_OUT;
@@ -49,7 +47,7 @@ static int __init hook_init(void)
ret = nf_register_hooks(nfho, 3);
#endif
printk("rkp-ua: Started, version %s\n", VERSION);
printk("rkp-ua: Started, version %d\n", VERSION);
printk("rkp-ua: nf_register_hook returnd %d.\n", ret);
printk("rkp-ua: autocapture=%c, mark_capture=0x%x, mark_ack=0x%x\n",
'n' + autocapture * ('y' - 'n'), mark_capture, mark_ack);