From 634f47674093c73315ca387dfb91bdbd7e244338 Mon Sep 17 00:00:00 2001 From: Andrea Righi Date: Thu, 4 Jan 2024 21:13:57 +0100 Subject: [PATCH] UBUNTU: [Packaging] re-enable Rust support Now that the toolchain dependencies are all satisfied we can re-enable Rust support. Signed-off-by: Andrea Righi --- debian.master/config/annotations | 15 ++++++++++++--- debian.master/control.stub.in | 6 ++++++ debian.master/rules.d/amd64.mk | 2 +- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 33ee7c1024e8..7ee55b65fbfc 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -1789,7 +1789,7 @@ CONFIG_AS_IS_GNU policy<{'amd64': 'y', 'arm64': ' CONFIG_AS_SHA1_NI policy<{'amd64': 'y'}> CONFIG_AS_SHA256_NI policy<{'amd64': 'y'}> CONFIG_AS_TPAUSE policy<{'amd64': 'y'}> -CONFIG_AS_VERSION policy<{'amd64': '24100', 'arm64': '24100', 'armhf': '24100', 'ppc64el': '24100', 'riscv64': '24100', 's390x': '24100'}> +CONFIG_AS_VERSION policy<{'amd64': '24150', 'arm64': '24150', 'armhf': '24150', 'ppc64el': '24150', 'riscv64': '24150', 's390x': '24150'}> CONFIG_AS_VFP_VMRS_FPINST policy<{'armhf': 'y'}> CONFIG_AS_WRUSS policy<{'amd64': 'y'}> CONFIG_AT76C50X_USB policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}> @@ -2095,6 +2095,7 @@ 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.65.1"'}> 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'}> @@ -2493,7 +2494,7 @@ CONFIG_CC_IS_GCC policy<{'amd64': 'y', 'arm64': ' CONFIG_CC_NO_ARRAY_BOUNDS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_CC_OPTIMIZE_FOR_SIZE policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': 'n'}> -CONFIG_CC_VERSION_TEXT policy<{'amd64': '"x86_64-linux-gnu-gcc-13 (Ubuntu 13.2.0-7ubuntu1) 13.2.0"', 'arm64': '"aarch64-linux-gnu-gcc-13 (Ubuntu 13.2.0-6ubuntu1) 13.2.0"', 'armhf': '"arm-linux-gnueabihf-gcc-13 (Ubuntu 13.2.0-6ubuntu1) 13.2.0"', 'ppc64el': '"powerpc64le-linux-gnu-gcc-13 (Ubuntu 13.2.0-6ubuntu1) 13.2.0"', 'riscv64': '"riscv64-linux-gnu-gcc-13 (Ubuntu 13.2.0-6ubuntu1) 13.2.0"', 's390x': '"s390x-linux-gnu-gcc-13 (Ubuntu 13.2.0-6ubuntu1) 13.2.0"'}> +CONFIG_CC_VERSION_TEXT policy<{'amd64': '"x86_64-linux-gnu-gcc-13 (Ubuntu 13.2.0-9ubuntu1) 13.2.0"', 'arm64': '"aarch64-linux-gnu-gcc-13 (Ubuntu 13.2.0-7ubuntu1) 13.2.0"', 'armhf': '"arm-linux-gnueabihf-gcc-13 (Ubuntu 13.2.0-7ubuntu1) 13.2.0"', 'ppc64el': '"powerpc64le-linux-gnu-gcc-13 (Ubuntu 13.2.0-7ubuntu1) 13.2.0"', 'riscv64': '"riscv64-linux-gnu-gcc-13 (Ubuntu 13.2.0-7ubuntu1) 13.2.0"', 's390x': '"s390x-linux-gnu-gcc-13 (Ubuntu 13.2.0-7ubuntu1) 13.2.0"'}> CONFIG_CDNS_I3C_MASTER policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}> CONFIG_CDROM policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_CDROM_PKTCDVD policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': 'n'}> @@ -3174,6 +3175,7 @@ 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'}> @@ -7187,7 +7189,7 @@ CONFIG_LD_HEAD_STUB_CATCH policy<{'ppc64el': 'n'}> CONFIG_LD_IS_BFD policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_LD_ORPHAN_WARN policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y'}> CONFIG_LD_ORPHAN_WARN_LEVEL policy<{'amd64': '"warn"', 'arm64': '"warn"', 'armhf': '"warn"', 'ppc64el': '"warn"', 'riscv64': '"warn"'}> -CONFIG_LD_VERSION policy<{'amd64': '24100', 'arm64': '24100', 'armhf': '24100', 'ppc64el': '24100', 'riscv64': '24100', 's390x': '24100'}> +CONFIG_LD_VERSION policy<{'amd64': '24150', 'arm64': '24150', 'armhf': '24150', 'ppc64el': '24150', 'riscv64': '24150', 's390x': '24150'}> CONFIG_LEDS_88PM860X policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': '-'}> CONFIG_LEDS_AAEON policy<{'amd64': 'm'}> CONFIG_LEDS_AAT1290 policy<{'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}> @@ -11228,6 +11230,12 @@ CONFIG_RTW89_PCI policy<{'amd64': 'm', 'arm64': ' CONFIG_RT_MUTEXES policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_RUNTIME_KERNEL_TESTING_MENU policy<{'riscv64': 'n'}> CONFIG_RUNTIME_TESTING_MENU policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> +CONFIG_RUST policy<{'amd64': 'y'}> +CONFIG_RUSTC_VERSION_TEXT policy<{'amd64': '"rustc 1.73.0 (cc66ad468 2023-10-03) (built from a source tarball)"'}> +CONFIG_RUST_BUILD_ASSERT_ALLOW policy<{'amd64': 'n'}> +CONFIG_RUST_DEBUG_ASSERTIONS policy<{'amd64': 'n'}> +CONFIG_RUST_IS_AVAILABLE policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> +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'}> @@ -11257,6 +11265,7 @@ 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': '-', 's390x': 'n'}> diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in index 0a1f830cbf79..a486b4410195 100644 --- a/debian.master/control.stub.in +++ b/debian.master/control.stub.in @@ -40,6 +40,12 @@ Build-Depends: curl , zstd , pahole [amd64 arm64 armhf ppc64el s390x riscv64] | dwarves (>= 1.21) [amd64 arm64 armhf ppc64el s390x riscv64] , + clang-17, + libclang1-17, + rustc, + rust-src, + rustfmt, + bindgen-0.65, libstdc++-dev, Build-Depends-Indep: xmlto , diff --git a/debian.master/rules.d/amd64.mk b/debian.master/rules.d/amd64.mk index 2a643082f3d9..a005382134aa 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 = false +do_lib_rust = true