diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-03-03 00:52:16 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-03-03 12:58:55 +0100 |
| commit | d67b3d0df871b289f7541139b5e8c7fb561a360e (patch) | |
| tree | d4329a7eaca4a9235ec16c8db75d68604dbd2946 | |
| parent | 58ad312755ff4a0c50fd55f758bbb2453a296380 (diff) | |
| download | upstream-d67b3d0df871b289f7541139b5e8c7fb561a360e.tar.gz upstream-d67b3d0df871b289f7541139b5e8c7fb561a360e.tar.bz2 upstream-d67b3d0df871b289f7541139b5e8c7fb561a360e.zip | |
lantiq: ltq-vmmc: 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-vmmc/Makefile | 3 | ||||
| -rw-r--r-- | package/kernel/lantiq/ltq-vmmc/patches/020-not-leak-cflags.patch | 19 |
2 files changed, 20 insertions, 2 deletions
diff --git a/package/kernel/lantiq/ltq-vmmc/Makefile b/package/kernel/lantiq/ltq-vmmc/Makefile index e42d5c0719..99263cce43 100644 --- a/package/kernel/lantiq/ltq-vmmc/Makefile +++ b/package/kernel/lantiq/ltq-vmmc/Makefile @@ -10,14 +10,13 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=drv_vmmc PKG_VERSION:=1.9.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_HASH:=707f515eb727c032418c4da67d7e86884bb56cdc2a606e8f6ded6057d8767e57 PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources 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-vmmc/patches/020-not-leak-cflags.patch b/package/kernel/lantiq/ltq-vmmc/patches/020-not-leak-cflags.patch new file mode 100644 index 0000000000..1a79daae24 --- /dev/null +++ b/package/kernel/lantiq/ltq-vmmc/patches/020-not-leak-cflags.patch @@ -0,0 +1,19 @@ +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -224,7 +224,6 @@ install-exec-hook: $(bin_PROGRAMS) + + # Extra rule for linux-2.6 kernel object + if KERNEL_2_6 +-drv_vmmc_CFLAGS += -fno-common + drv_vmmc_OBJS = "$(subst .c,.o, $(drv_vmmc_SOURCES) $(nodist_drv_vmmc_SOURCES))" + + drv_vmmc.ko: $(drv_vmmc_SOURCES) $(EXTRA_DIST) +@@ -239,7 +238,7 @@ drv_vmmc.ko: $(drv_vmmc_SOURCES) $(EXTRA + @echo "# drv_vmmc: Generated to build Linux 2.6.x kernel object" > $(PWD)/Kbuild + @echo "obj-m := $(subst .ko,.o,$@)" >> $(PWD)/Kbuild + @echo "$(subst .ko,,$@)-y := $(drv_vmmc_OBJS)" >> $(PWD)/Kbuild +- @echo "EXTRA_CFLAGS := -DHAVE_CONFIG_H $(CFLAGS) $(drv_vmmc_CFLAGS) $(INCLUDES)" >> $(PWD)/Kbuild ++ @echo "EXTRA_CFLAGS := -DHAVE_CONFIG_H $(drv_vmmc_CFLAGS) $(INCLUDES)" >> $(PWD)/Kbuild + $(MAKE) ARCH=@KERNEL_ARCH@ -C @KERNEL_BUILD_PATH@ O=@KERNEL_BUILD_PATH@ M=$(PWD) modules + + clean-generic: |