diff --git a/debian/bin/refine-configs b/debian/bin/refine-configs index d739a90..ed2fc35 100755 --- a/debian/bin/refine-configs +++ b/debian/bin/refine-configs @@ -53,8 +53,8 @@ find debian/build/ -name 'config.*' -type f -exec \ sed -i -E \ -e '/CONFIG_BUILD_SALT/d' \ -e '/CONFIG_(AS|CC|PAHOLE)_((CAN|HAS)_)/d' \ - -e '/CONFIG_(AS|CLANG|GCC|LD|LLD|PAHOLE)_VERSION/d' \ - -e '/CONFIG_(BINDGEN|CC|RUSTC)_VERSION_TEXT/d' \ + -e '/CONFIG_(AS|BINDGEN|CC|CLANG|GCC|LD|LLD|PAHOLE|RUSTC)_VERSION/d' \ + -e '/CONFIG_RUSTC_LLVM_VERSION/d' \ -e '/CONFIG_AS_(AVX512|GFNI|SHA(1|256)_NI|TPAUSE|VAES|VPCLMULQDQ|WRUSS)/d' \ -e '/CONFIG_CC_(IMPLICIT_FALLTHROUGH)/d' \ -e '/CONFIG_(CC|GCC10)_NO_ARRAY_BOUNDS/d' \ diff --git a/debian/config/config b/debian/config/config index c69ed46..b1526a7 100644 --- a/debian/config/config +++ b/debian/config/config @@ -4070,8 +4070,6 @@ CONFIG_RPMSG=m CONFIG_RTC_LIB=y CONFIG_RTC_MC146818_LIB=y CONFIG_RT_MUTEXES=y -CONFIG_RUSTC_LLVM_VERSION=0 -CONFIG_RUSTC_VERSION=0 CONFIG_RWSEM_SPIN_ON_OWNER=y CONFIG_SATA_HOST=y CONFIG_SBITMAP=y diff --git a/debian/rules.real b/debian/rules.real index 2b289d2..c2acffa 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -32,7 +32,7 @@ export DEB_RULES_REQUIRES_ROOT ?= no stamp = [ -d $(dir $@) ] || mkdir $(dir $@); touch $@ -cleanup_config = sed -E -e '/CONFIG_(BUILD_SALT|MODULE_SIG_(ALL|KEY)|SYSTEM_TRUSTED_KEYS|(AS|CLANG|GCC|LD|LLD|PAHOLE)_VERSION|(BINDGEN|CC|RUSTC)_VERSION_TEXT)[ =]/d' +cleanup_config = sed -E -e '/CONFIG_(BUILD_SALT|MODULE_SIG_(ALL|KEY)|SYSTEM_TRUSTED_KEYS)[ =]/d' -e '/CONFIG_((AS|BINDGEN|CC|CLANG|GCC|LD|LLD|PAHOLE|RUSTC)_VERSION|RUSTC_LLVM_VERSION)/d' setup_env := env -u ABINAME -u ARCH -u FEATURESET -u FLAVOUR -u VERSION -u LOCALVERSION # XXX: All the tools leak flags between host and build all the time, just don't care. See #1050991.