From ddab758997440758b140e42c03ed29a42f6be99b Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 27 Oct 2019 18:18:29 +0100 Subject: [PATCH] lantiq: Allow PKG_ASLR_PIE for DSL and voice drivers When ASLR_PIE was activated globally these drivers failed to build because the user space LDFLAGS leaked into the kernel build process. This was fixed in upstream Linux kernel commit ce99d0bf312d ("kbuild: clear LDFLAGS in the top Makefile") which went into Linux 4.17. The lantiq target is now on Linux 4.19 only and these exceptions are not needed any more. Signed-off-by: Hauke Mehrtens --- package/kernel/lantiq/ltq-adsl/Makefile | 1 - package/kernel/lantiq/ltq-ifxos/Makefile | 1 - package/kernel/lantiq/ltq-tapi/Makefile | 1 - package/kernel/lantiq/ltq-vdsl-mei/Makefile | 2 -- package/kernel/lantiq/ltq-vdsl/Makefile | 1 - package/kernel/lantiq/ltq-vmmc/Makefile | 1 - package/network/config/ltq-vdsl-app/Makefile | 1 - 7 files changed, 8 deletions(-) diff --git a/package/kernel/lantiq/ltq-adsl/Makefile b/package/kernel/lantiq/ltq-adsl/Makefile index 0fbda34ff9..e6817efffc 100644 --- a/package/kernel/lantiq/ltq-adsl/Makefile +++ b/package/kernel/lantiq/ltq-adsl/Makefile @@ -18,7 +18,6 @@ PKG_HASH:=eb2ed59715d3bf4e8a1460bbbe2f1660039e0a9f9d72afb1b2b16590094eb33c PKG_MAINTAINER:=John Crispin PKG_CHECK_FORMAT_SECURITY:=0 -PKG_ASLR_PIE:=0 PKG_FIXUP:=autoreconf include $(INCLUDE_DIR)/package.mk diff --git a/package/kernel/lantiq/ltq-ifxos/Makefile b/package/kernel/lantiq/ltq-ifxos/Makefile index 4771fda20a..4a368309d3 100644 --- a/package/kernel/lantiq/ltq-ifxos/Makefile +++ b/package/kernel/lantiq/ltq-ifxos/Makefile @@ -17,7 +17,6 @@ PKG_MAINTAINER:=John Crispin PKG_LICENSE:=GPL-2.0 BSD-2-Clause PKG_LICENSE_FILES:=LICENSE -PKG_ASLR_PIE:=0 PKG_FIXUP:=autoreconf include $(INCLUDE_DIR)/package.mk diff --git a/package/kernel/lantiq/ltq-tapi/Makefile b/package/kernel/lantiq/ltq-tapi/Makefile index 171103350e..072041c589 100644 --- a/package/kernel/lantiq/ltq-tapi/Makefile +++ b/package/kernel/lantiq/ltq-tapi/Makefile @@ -17,7 +17,6 @@ PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources PKG_HASH:=109374d52872716570fca3fef3b93c9a93159a804dfd42484b19152b825af5c0 PKG_MAINTAINER:=John Crispin -PKG_ASLR_PIE:=0 PKG_CHECK_FORMAT_SECURITY:=0 PKG_FIXUP:=autoreconf diff --git a/package/kernel/lantiq/ltq-vdsl-mei/Makefile b/package/kernel/lantiq/ltq-vdsl-mei/Makefile index 9597de0072..b8d75a8b2b 100644 --- a/package/kernel/lantiq/ltq-vdsl-mei/Makefile +++ b/package/kernel/lantiq/ltq-vdsl-mei/Makefile @@ -22,8 +22,6 @@ PKG_MAINTAINER:=John Crispin PKG_LICENSE:=GPL-2.0 BSD-2-Clause PKG_LICENSE_FILES:=LICENSE -PKG_ASLR_PIE:=0 - include $(INCLUDE_DIR)/package.mk define KernelPackage/ltq-vdsl-vr9-mei diff --git a/package/kernel/lantiq/ltq-vdsl/Makefile b/package/kernel/lantiq/ltq-vdsl/Makefile index cf3711beb7..d518bd647d 100644 --- a/package/kernel/lantiq/ltq-vdsl/Makefile +++ b/package/kernel/lantiq/ltq-vdsl/Makefile @@ -19,7 +19,6 @@ PKG_HASH:=b4966a60653acc49254b168c6cc9c49eb36c54548e763617788aa4f252a29f21 PKG_LICENSE:=GPL-2.0 BSD-2-Clause PKG_LICENSE_FILES:=LICENSE -PKG_ASLR_PIE:=0 PKG_FIXUP:=autoreconf PKG_MAINTAINER:=John Crispin diff --git a/package/kernel/lantiq/ltq-vmmc/Makefile b/package/kernel/lantiq/ltq-vmmc/Makefile index e44b509b2e..99263cce43 100644 --- a/package/kernel/lantiq/ltq-vmmc/Makefile +++ b/package/kernel/lantiq/ltq-vmmc/Makefile @@ -17,7 +17,6 @@ PKG_HASH:=707f515eb727c032418c4da67d7e86884bb56cdc2a606e8f6ded6057d8767e57 PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources PKG_MAINTAINER:=John Crispin -PKG_ASLR_PIE:=0 PKG_CHECK_FORMAT_SECURITY:=0 PKG_FIXUP:=autoreconf diff --git a/package/network/config/ltq-vdsl-app/Makefile b/package/network/config/ltq-vdsl-app/Makefile index 198841977c..670f720e29 100644 --- a/package/network/config/ltq-vdsl-app/Makefile +++ b/package/network/config/ltq-vdsl-app/Makefile @@ -19,7 +19,6 @@ PKG_LICENSE:=BSD-2-Clause PKG_BUILD_DEPENDS:=ltq-vdsl -PKG_ASLR_PIE:=0 PKG_FLAGS:=nonshared include $(INCLUDE_DIR)/package.mk