From d9095bcc5f82cd7db0b61c81acd696882d005afa Mon Sep 17 00:00:00 2001 From: Andrea Righi Date: Mon, 31 Jul 2023 08:32:41 +0200 Subject: [PATCH] UBUNTU: [Packaging] temporarily disable Rust support Kernel 6.5 requires rustc-1.68, but this version is not currently available in the archive, so disable Rust support for now. Signed-off-by: Andrea Righi --- debian.master/control.stub.in | 3 --- debian.master/rules.d/amd64.mk | 2 +- debian/rules.d/0-common-vars.mk | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in index 5b659ef7180a8..eff0732c4cbc8 100644 --- a/debian.master/control.stub.in +++ b/debian.master/control.stub.in @@ -39,9 +39,6 @@ Build-Depends: curl , zstd , pahole [amd64 arm64 armhf ppc64el s390x riscv64] | dwarves (>= 1.21) [amd64 arm64 armhf ppc64el s390x riscv64] , - rustc (= 1.69.0+dfsg0ubuntu1-0ubuntu1) [amd64], - rust-src (= 1.69.0+dfsg0ubuntu1-0ubuntu1) [amd64], - rustfmt (= 1.69.0+dfsg0ubuntu1-0ubuntu1) [amd64], bindgen-0.56 [amd64], libstdc++-dev, Build-Depends-Indep: diff --git a/debian.master/rules.d/amd64.mk b/debian.master/rules.d/amd64.mk index a005382134aa1..2a643082f3d93 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 12a5caf2440b3..d62a9b063241b 100644 --- a/debian/rules.d/0-common-vars.mk +++ b/debian/rules.d/0-common-vars.mk @@ -238,7 +238,6 @@ 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 \ KERNELVERSION=$(abi_release)-$(target_flavour) \ CONFIG_DEBUG_SECTION_MISMATCH=y \ KBUILD_BUILD_VERSION="$(uploadnum)" \