diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-03-03 00:51:40 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-03-03 12:58:55 +0100 |
| commit | 58ad312755ff4a0c50fd55f758bbb2453a296380 (patch) | |
| tree | 4ac9465ff3a95ceb2311aaa5f4ffa04e20568f4f | |
| parent | 4d90887496b43b1db9f48ccdc9fe823b5371e323 (diff) | |
| download | upstream-58ad312755ff4a0c50fd55f758bbb2453a296380.tar.gz upstream-58ad312755ff4a0c50fd55f758bbb2453a296380.tar.bz2 upstream-58ad312755ff4a0c50fd55f758bbb2453a296380.zip | |
lantiq: ltq-tapi: Do not leak user space CFLAGS into kernel space
Do not leak the user space CFLAGS into the kernel space any more, this
allows us to activate the MIPS16 build.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
| -rw-r--r-- | package/kernel/lantiq/ltq-tapi/Makefile | 3 | ||||
| -rw-r--r-- | package/kernel/lantiq/ltq-tapi/patches/020-not-leak-cflags.patch | 27 |
2 files changed, 28 insertions, 2 deletions
diff --git a/package/kernel/lantiq/ltq-tapi/Makefile b/package/kernel/lantiq/ltq-tapi/Makefile index be7fd2aa0a..072041c589 100644 --- a/package/kernel/lantiq/ltq-tapi/Makefile +++ b/package/kernel/lantiq/ltq-tapi/Makefile @@ -10,14 +10,13 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=drv_tapi PKG_VERSION:=3.13.0 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=drv_tapi-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources PKG_HASH:=109374d52872716570fca3fef3b93c9a93159a804dfd42484b19152b825af5c0 PKG_MAINTAINER:=John Crispin <john@phrozen.org> -PKG_USE_MIPS16:=0 PKG_CHECK_FORMAT_SECURITY:=0 PKG_FIXUP:=autoreconf diff --git a/package/kernel/lantiq/ltq-tapi/patches/020-not-leak-cflags.patch b/package/kernel/lantiq/ltq-tapi/patches/020-not-leak-cflags.patch new file mode 100644 index 0000000000..e1aac21f9f --- /dev/null +++ b/package/kernel/lantiq/ltq-tapi/patches/020-not-leak-cflags.patch @@ -0,0 +1,27 @@ +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -122,13 +122,9 @@ endif + + ## flags for the driver + if USE_MODULE +-drv_tapi_CFLAGS = -DLINUX -D__KERNEL__ -DMODULE -Wno-format -DEXPORT_SYMTAB $(AM_CFLAGS) ++drv_tapi_CFLAGS = -DLINUX -D__KERNEL__ -DMODULE -DEXPORT_SYMTAB $(AM_CFLAGS) + else +-drv_tapi_CFLAGS = -DLINUX -D__KERNEL__ -Wno-format -DEXPORT_SYMTAB $(AM_CFLAGS) +-endif +- +-if KERNEL_2_6 +-drv_tapi_CFLAGS += -fno-common ++drv_tapi_CFLAGS = -DLINUX -D__KERNEL__ -DEXPORT_SYMTAB $(AM_CFLAGS) + endif + + +@@ -165,7 +161,7 @@ drv_tapi.ko: $(drv_tapi_SOURCES) $(EXTRA + @echo "# drv_tapi: Generated to build Linux 2.6.x kernel object" > $(PWD)/Kbuild + @echo "obj-m := $(subst .ko,.o,$@)" >> $(PWD)/Kbuild + @echo "$(subst .ko,,$@)-y := $(drv_tapi_OBJS)" >> $(PWD)/Kbuild +- @echo "EXTRA_CFLAGS := -DHAVE_CONFIG_H $(CFLAGS) $(drv_tapi_CFLAGS) $(INCLUDES)" >> $(PWD)/Kbuild ++ @echo "EXTRA_CFLAGS := -DHAVE_CONFIG_H $(drv_tapi_CFLAGS) $(INCLUDES)" >> $(PWD)/Kbuild + $(MAKE) ARCH=@KERNEL_ARCH@ -C @KERNEL_BUILD_PATH@ O=@KERNEL_BUILD_PATH@ M=$(PWD) modules + + clean-generic: |