diff --git a/debian.master/config/annotations b/debian.master/config/annotations index a118c98f43d0..9111a2b92f06 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -519,12 +519,6 @@ CONFIG_RTC_DRV_TWL4030 note<'boot essential on OMAP3/OM CONFIG_RT_GROUP_SCHED policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': 'n'}> CONFIG_RT_GROUP_SCHED note<'LP: #1875665'> -CONFIG_RUST policy<{'amd64': 'y'}> -CONFIG_RUST note<'required to enable Rust support, LP: #1993183'> - -CONFIG_RUST_IS_AVAILABLE policy<{'amd64': 'y', 'arm64': '-', 'armhf': '-', 'ppc64el': '-', 'riscv64': '-', 's390x': '-'}> -CONFIG_RUST_IS_AVAILABLE note<'required to enable Rust support, LP: #1993183'> - CONFIG_SAMPLE_TRACE_PRINTK policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}> CONFIG_SAMPLE_TRACE_PRINTK note<'Required for ftrace selftests'> @@ -2067,7 +2061,6 @@ CONFIG_BH1750 policy<{'amd64': 'm', 'arm64': ' CONFIG_BH1780 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}> CONFIG_BIG_LITTLE policy<{'armhf': 'y'}> CONFIG_BINARY_PRINTF policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> -CONFIG_BINDGEN_VERSION_TEXT policy<{'amd64': '"bindgen 0.56.0"'}> CONFIG_BINFMT_ELF policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_BINFMT_ELF_FDPIC policy<{'armhf': 'y'}> CONFIG_BINFMT_FLAT policy<{'armhf': 'y', 'riscv64': 'y'}> @@ -3067,7 +3060,6 @@ CONFIG_CONSOLE_LOGLEVEL_DEFAULT policy<{'amd64': '7', 'arm64': ' CONFIG_CONSOLE_LOGLEVEL_QUIET policy<{'amd64': '4', 'arm64': '4', 'armhf': '4', 'ppc64el': '4', 'riscv64': '4', 's390x': '4'}> CONFIG_CONSOLE_POLL policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y'}> CONFIG_CONSOLE_TRANSLATIONS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> -CONFIG_CONSTRUCTORS policy<{'amd64': 'y'}> CONFIG_CONTEXT_SWITCH_TRACER policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_CONTEXT_TRACKING policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_CONTEXT_TRACKING_IDLE policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> @@ -11021,10 +11013,6 @@ CONFIG_RTW89_DEBUGMSG policy<{'amd64': 'y', 'arm64': ' CONFIG_RTW89_PCI policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}> CONFIG_RT_MUTEXES policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_RUNTIME_TESTING_MENU policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> -CONFIG_RUSTC_VERSION_TEXT policy<{'amd64': '"rustc 1.68.2 (9eb3afe9e 2023-03-27) (built from a source tarball)"'}> -CONFIG_RUST_BUILD_ASSERT_ALLOW policy<{'amd64': 'n'}> -CONFIG_RUST_DEBUG_ASSERTIONS policy<{'amd64': 'n'}> -CONFIG_RUST_OVERFLOW_CHECKS policy<{'amd64': 'y'}> CONFIG_RV policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_RV_MON_WWNR policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_RV_REACTORS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> @@ -11053,7 +11041,6 @@ CONFIG_S390_VMUR policy<{'s390x': 'm'}> CONFIG_S3C2410_WATCHDOG policy<{'armhf': 'n'}> CONFIG_S5P_DEV_MFC policy<{'armhf': 'y'}> CONFIG_SAMPLES policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> -CONFIG_SAMPLES_RUST policy<{'amd64': 'n'}> CONFIG_SAMPLE_AUXDISPLAY policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': 'n'}> CONFIG_SAMPLE_CONFIGFS policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': 'n'}> CONFIG_SAMPLE_FPROBE policy<{'amd64': 'n', 'riscv64': 'n', 's390x': 'n'}> diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in index 5b98a45e40cf..589488cc9a22 100644 --- a/debian.master/control.stub.in +++ b/debian.master/control.stub.in @@ -39,12 +39,6 @@ Build-Depends: curl , zstd , pahole [amd64 arm64 armhf ppc64el s390x riscv64] | dwarves (>= 1.21) [amd64 arm64 armhf ppc64el s390x riscv64] , - clang-15 [amd64], - libclang-15 [amd64], - rustc-1.68 [amd64], - rust-1.68-src [amd64], - rustfmt-1.68 [amd64], - bindgen-0.56 [amd64], libstdc++-dev, Build-Depends-Indep: xmlto , diff --git a/debian.master/rules.d/amd64.mk b/debian.master/rules.d/amd64.mk index a005382134aa..2a643082f3d9 100644 --- a/debian.master/rules.d/amd64.mk +++ b/debian.master/rules.d/amd64.mk @@ -20,4 +20,4 @@ do_extras_package = true do_tools_common = true do_tools_acpidbg = true do_odm_drivers = true -do_lib_rust = true +do_lib_rust = false diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk index 410de315afba..d62a9b063241 100644 --- a/debian/rules.d/0-common-vars.mk +++ b/debian/rules.d/0-common-vars.mk @@ -238,8 +238,6 @@ kmake = make ARCH=$(build_arch) \ CROSS_COMPILE=$(CROSS_COMPILE) \ HOSTCC=$(HOSTCC) \ CC=$(CROSS_COMPILE)$(gcc) \ - RUSTC=rustc-1.68 HOSTRUSTC=rustc-1.68 BINDGEN=bindgen-0.56 RUSTFMT=/usr/lib/rust-1.68/bin/rustfmt RUST_LIB_SRC=/usr/src/rustc-1.68.2/library \ - CLANG_PATH=clang-15 LIBCLANG_PATH=/usr/lib/llvm-15/lib \ KERNELVERSION=$(abi_release)-$(target_flavour) \ CONFIG_DEBUG_SECTION_MISMATCH=y \ KBUILD_BUILD_VERSION="$(uploadnum)" \