From 15470a972bf7aaf3ef16863d2453e2ee4aff686d Mon Sep 17 00:00:00 2001 From: Joseph Salisbury Date: Tue, 16 Apr 2024 14:37:14 -0400 Subject: [PATCH] UBUNTU: [Packaging] realtime: Disable RUST for real-time BugLink: https://bugs.launchpad.net/bugs/1786013 Stop the check for RUST everytime cranky close is run. Signed-off-by: Joseph Salisbury --- debian.realtime/config/annotations | 6 +++--- init/Kconfig | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian.realtime/config/annotations b/debian.realtime/config/annotations index a0b8b47adeb6..a08e890761d1 100644 --- a/debian.realtime/config/annotations +++ b/debian.realtime/config/annotations @@ -41,8 +41,8 @@ CONFIG_RCU_LAZY_DEFAULT_OFF note<'LP: #2051342'> CONFIG_RUST policy<{'amd64': '-'}> CONFIG_RUST note<'Disable Rust for realtime'> -CONFIG_RUST_IS_AVAILABLE policy<{'amd64': '-', 'arm64': '-'}> -CONFIG_RUST_IS_AVAILABLE note<'Disable Rust for realtime'> +CONFIG_RUST_IS_AVAILABLE policy<{'amd64': '-', 'arm64': '-'}> +CONFIG_RUST_IS_AVAILABLE note<'Disable Rust for realtime'> CONFIG_TIMERLAT_TRACER policy<{'amd64': 'y', 'arm64': 'y'}> CONFIG_TIMERLAT_TRACER note<'LP: #1961588'> @@ -86,7 +86,7 @@ CONFIG_ARCH_WANT_PMD_MKWRITE policy<{'amd64': '-', 'arm64': ' CONFIG_ARM64_ERRATUM_834220 policy<{'arm64': '-'}> CONFIG_AX88796B_RUST_PHY policy<{'amd64': '-'}> CONFIG_BINDGEN_VERSION_TEXT policy<{'amd64': '-'}> -CONFIG_CC_VERSION_TEXT policy<{'amd64': '"x86_64-linux-gnu-gcc-13 (Ubuntu 13.2.0-17ubuntu2) 13.2.0"', 'arm64': '"aarch64-linux-gnu-gcc-13 (Ubuntu 13.2.0-11ubuntu1) 13.2.0"'}> +CONFIG_CC_VERSION_TEXT policy<{'amd64': '"x86_64-linux-gnu-gcc-13 (Ubuntu 13.2.0-23ubuntu4) 13.2.0"', 'arm64': '"aarch64-linux-gnu-gcc-13 (Ubuntu 13.2.0-23ubuntu2) 13.2.0"'}> CONFIG_CEC_GPIO policy<{'amd64': 'm', 'arm64': 'n'}> CONFIG_CEC_PIN policy<{'amd64': 'y', 'arm64': '-'}> CONFIG_CEC_PIN_ERROR_INJ policy<{'amd64': 'y', 'arm64': '-'}> diff --git a/init/Kconfig b/init/Kconfig index 227b0d8b4d76..f3aac6dd2153 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -62,6 +62,7 @@ config LLD_VERSION config RUST_IS_AVAILABLE def_bool $(success,$(srctree)/scripts/rust_is_available.sh) + depends on !PREEMPT_RT help This shows whether a suitable Rust toolchain is available (found). @@ -1902,6 +1903,7 @@ config PROFILING config RUST bool "Rust support" + depends on !PREEMPT_RT depends on HAVE_RUST depends on RUST_IS_AVAILABLE depends on !CFI_CLANG