tmakin/tegra-linux-noble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UBUNTU: [Packaging] rust: use Rust 1.68.2

Browse Source 
Add Rust 1.68.2 dependency (required by kernel 6.5) and re-enable Rust
support in the kernel.

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
This commit is contained in:
Andrea Righi
2023-08-15 08:08:20 +02:00
committed by Paolo Pisati
parent e9851ded1d
commit 4cfe71a697
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
debian.master/config/annotations
+13
View File
@@ -519,6 +519,12 @@ 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'>
@@ -2061,6 +2067,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.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'}>
@@ -3060,6 +3067,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'}>
@@ -11010,6 +11018,10 @@ 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'}>
@@ -11038,6 +11050,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': 'n', 's390x': 'n'}>
debian.master/control.stub.in
+3 -3
View File
@@ -39,9 +39,9 @@ Build-Depends:
curl <!stage1>,
zstd <!stage1>,
pahole [amd64 arm64 armhf ppc64el s390x riscv64] | dwarves (>= 1.21) [amd64 arm64 armhf ppc64el s390x riscv64] <!stage1>,
rustc [amd64],
rust-src [amd64],
rustfmt [amd64],
rustc-1.68 [amd64],
rust-1.68-src [amd64],
rustfmt-1.68 [amd64],
bindgen-0.56 [amd64],
libstdc++-dev,
Build-Depends-Indep:
debian/rules.d/0-common-vars.mk
Vendored
+2 -1
View File
@@ -238,7 +238,8 @@ kmake = make ARCH=$(build_arch) \
CROSS_COMPILE=$(CROSS_COMPILE) \
HOSTCC=$(HOSTCC) \
CC=$(CROSS_COMPILE)$(gcc) \
BINDGEN=bindgen-0.56 CLANG_PATH=clang-14 LIBCLANG_PATH=/usr/lib/llvm-14/lib \
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-14 LIBCLANG_PATH=/usr/lib/llvm-14/lib \
KERNELVERSION=$(abi_release)-$(target_flavour) \
CONFIG_DEBUG_SECTION_MISMATCH=y \
KBUILD_BUILD_VERSION="$(uploadnum)" \