From 0dce6a85e90a00952c97a17518ab5c974b475dfb Mon Sep 17 00:00:00 2001 From: Joseph Salisbury Date: Thu, 1 Feb 2024 12:48:56 -0500 Subject: [PATCH] Revert "UBUNTU: [Packaging] re-enable Rust support" Rust is not avaiable for real-time as of yet. This reverts commit 3da834257a4ec8962820b7e3cd490566a6433871. Signed-off-by: Joseph Salisbury --- debian.realtime/config/annotations | 4 +++- debian.realtime/rules.d/amd64.mk | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian.realtime/config/annotations b/debian.realtime/config/annotations index fefab7911e0a..c9bb6bc07aa8 100644 --- a/debian.realtime/config/annotations +++ b/debian.realtime/config/annotations @@ -26,6 +26,9 @@ CONFIG_OSNOISE_TRACER note<'LP: #1961588'> CONFIG_PREEMPT_RT policy<{'amd64': 'y', 'arm64': 'y'}> CONFIG_PREEMPT_RT note<'must be enabled in the real-time kernel'> +CONFIG_RUST policy<{'amd64': 'n'}> +CONFIG_RUST note<'{Disable Rust in linux-realtime}'> + CONFIG_TIMERLAT_TRACER policy<{'amd64': 'y', 'arm64': 'y'}> CONFIG_TIMERLAT_TRACER note<'LP: #1961588'> @@ -161,7 +164,6 @@ CONFIG_RCU_NOCB_CPU_CB_BOOST policy<{'amd64': 'y', 'arm64': ' CONFIG_RCU_NOCB_CPU_DEFAULT_ALL policy<{'amd64': 'n', 'arm64': 'n'}> CONFIG_READ_ONLY_THP_FOR_FS policy<{'amd64': '-', 'arm64': '-'}> CONFIG_RING_BUFFER_ALLOW_SWAP policy<{'amd64': 'y'}> -CONFIG_RUSTC_VERSION_TEXT policy<{'amd64': '"rustc 1.74.1 (a28077b28 2023-12-04) (built from a source tarball)"'}> CONFIG_RV_MON_WIP policy<{'amd64': 'n'}> CONFIG_SENSORS_AAEON policy<{'amd64': 'n'}> CONFIG_SLAB policy<{'amd64': '-', 'arm64': '-'}> diff --git a/debian.realtime/rules.d/amd64.mk b/debian.realtime/rules.d/amd64.mk index 26ef4886e6e5..ead4da70395d 100644 --- a/debian.realtime/rules.d/amd64.mk +++ b/debian.realtime/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