diff --git a/Makefile b/Makefile index 873b42f..1bb2bc1 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ EXTRA_CFLAGS:= \ MAKE_OPTS:=$(KERNEL_MAKE_FLAGS) \ SUBDIRS="$(PKG_BUILD_DIR)" \ EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \ - CONFIG_xmurp-ua=m + CONFIG_XMURP_UA=m define KernelPackage/xmurp-ua SUBMENU:=Other modules diff --git a/Makefile.cc b/Makefile.cc new file mode 100644 index 0000000..3b9a5c1 --- /dev/null +++ b/Makefile.cc @@ -0,0 +1,45 @@ +include $(TOPDIR)/rules.mk +include $(INCLUDE_DIR)/kernel.mk + +PKG_NAME:=xmurp-ua +PKG_RELEASE:=27 + +include $(INCLUDE_DIR)/package.mk + +define KernelPackage/xmurp-ua + SUBMENU:=Other modules + TITLE:=XMURP UA + FILES:=$(PKG_BUILD_DIR)/xmurp-ua.ko + AUTOLOAD:=$(call AutoLoad,99,xmurp-ua,1) +endef + +define KernelPackage/xmurp-ua/description + Modify UA in HTTP for anti-detection of router in XMU. +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)))) \ + +MAKE_OPTS:= \ + ARCH="$(LINUX_KARCH)" \ + CROSS_COMPILE="$(TARGET_CROSS)" \ + SUBDIRS="$(PKG_BUILD_DIR)" \ + EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \ + $(EXTRA_KCONFIG) + +define Build/Prepare + mkdir -p $(PKG_BUILD_DIR) + $(CP) ./src/* $(PKG_BUILD_DIR)/ +endef + +define Build/Compile + $(MAKE) -C "$(LINUX_DIR)" \ + $(MAKE_OPTS) \ + modules +endef + +$(eval $(call KernelPackage,xmurp-ua)) diff --git a/README.md b/README.md index 19a6831..7ffa922 100644 --- a/README.md +++ b/README.md @@ -27,27 +27,15 @@ iptables -t filter -I FORWARD -p tcp ! --dport 80 -m conntrack --ctstate RELATED --- -有小伙子反映说 15.05.1 编译不了。其实是可以的。方法如下: +在老旧版本(15.05)上编译时,尝试用 Makefile.cc 替换 Makefile。方法如下: -* 删除或者注释掉 `include/package.mk` 的下面几行: - - ```makefile - ifdef DESCRIPTION - $$(error DESCRIPTION:= is obsolete, use Package/PKG_NAME/description) - endif - ``` - -* 然后使用下面的命令编译(不要照搬哦,根据自己情况修改): - - ```bash - ln -s ../feeds/base/package/utils package/utils - make defconfig - git clone git@github.com:CHN-beta/xmurp-ua.git package/xmurp-ua - make package/xmurp-ua/compile V=sc ARCH=mips - # 这里会报错,没关系 - cp -r package/xmurp-ua build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic - make package/xmurp-ua/compile V=sc ARCH=mips - ``` +```bash +git clone git@github.com:CHN-beta/xmurp-ua.git package/xmurp-ua +cp package/xmurp-ua/Makefile.cc package/xmurp-ua/Makefile +ln -s ../feeds/base/package/utils package/utils +make defconfig +make package/xmurp-ua/compile V=sc ARCH=mips +``` diff --git a/src/Kconfig b/src/Kconfig index 6397d30..f0fc458 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -1,2 +1,2 @@ -config xmurp-ua +config XMURP_UA tristate "xmurp-ua" \ No newline at end of file diff --git a/src/Makefile b/src/Makefile index 6b570fb..8f4ff90 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1 +1 @@ -obj-${CONFIG_xmurp-ua} += xmurp-ua.o \ No newline at end of file +obj-${CONFIG_XMURP_UA} += xmurp-ua.o \ No newline at end of file