From fd9f0da8ce1b70df90f52c88322673b8e284b354 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 25 Apr 2024 08:39:52 -0600 Subject: [PATCH 1/2] Add gcc dependency to headers package for dkms --- debian.master/control.stub.in | 2 +- debian/control | 2 +- debian/rules | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in index 92d884c5173a2a..347ce9a744b816 100644 --- a/debian.master/control.stub.in +++ b/debian.master/control.stub.in @@ -62,7 +62,7 @@ Architecture: all Multi-Arch: foreign Section: devel Priority: optional -Depends: ${misc:Depends}, coreutils +Depends: ${misc:Depends}, coreutils, GCC Description: Header files related to Linux kernel version PKGVER This package provides kernel header files for version PKGVER, for sites that want the latest kernel headers. Please read diff --git a/debian/control b/debian/control index deefb9f20a711b..72284f4db26da1 100644 --- a/debian/control +++ b/debian/control @@ -64,7 +64,7 @@ Architecture: all Multi-Arch: foreign Section: devel Priority: optional -Depends: ${misc:Depends}, coreutils +Depends: ${misc:Depends}, coreutils, gcc-12 Description: Header files related to Linux kernel version 6.8.0 This package provides kernel header files for version 6.8.0, for sites that want the latest kernel headers. Please read diff --git a/debian/rules b/debian/rules index 9b4b2fcf04ebd6..64db6de620c59c 100755 --- a/debian/rules +++ b/debian/rules @@ -196,6 +196,7 @@ $(DEBIAN)/control.stub: \ -e 's/=SERIES=/$(series)/g' \ -e 's|\(^Maintainer:.*\)|\1\nXSC-Ubuntu-Compatible-Signing: $(UBUNTU_COMPATIBLE_SIGNING)|g' \ -e 's/\(^Build-Depends:$$\)/\1\n$(GCC_BUILD_DEPENDS)/g' \ + -e 's/GCC/$(gcc)/g' \ > $(DEBIAN)/control.stub; flavours="$(sort $(wildcard $(DEBIAN)/control.d/vars.*))";\ for i in $$flavours; do \ From c977498b1e9ae00e3e03716cf810c84cebb46c42 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 25 Apr 2024 09:09:21 -0600 Subject: [PATCH 2/2] Relax bindgen version requirement --- debian.master/control.stub.in | 2 +- debian/control | 2 +- debian/rules.d/0-common-vars.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in index 347ce9a744b816..55b7e6c01c94cf 100644 --- a/debian.master/control.stub.in +++ b/debian.master/control.stub.in @@ -44,7 +44,7 @@ Build-Depends: libclang1-15 [amd64 arm64 armhf ppc64el riscv64 s390x], rustc [amd64 arm64 armhf ppc64el riscv64 s390x], rust-src [amd64 arm64 armhf ppc64el riscv64 s390x], - bindgen-0.56 [amd64 arm64 armhf ppc64el riscv64 s390x], + bindgen [amd64 arm64 armhf ppc64el riscv64 s390x], libstdc++-12-dev, Build-Depends-Indep: xmlto , diff --git a/debian/control b/debian/control index 72284f4db26da1..a646d3388e0fa9 100644 --- a/debian/control +++ b/debian/control @@ -46,7 +46,7 @@ Build-Depends: libclang1-15 [amd64 arm64 armhf ppc64el riscv64 s390x], rustc [amd64 arm64 armhf ppc64el riscv64 s390x], rust-src [amd64 arm64 armhf ppc64el riscv64 s390x], - bindgen-0.56 [amd64 arm64 armhf ppc64el riscv64 s390x], + bindgen [amd64 arm64 armhf ppc64el riscv64 s390x], libstdc++-12-dev, Build-Depends-Indep: xmlto , diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk index 80d82311779a56..f259251d6b8a06 100644 --- a/debian/rules.d/0-common-vars.mk +++ b/debian/rules.d/0-common-vars.mk @@ -200,7 +200,7 @@ kmake = make ARCH=$(build_arch) \ CROSS_COMPILE=$(CROSS_COMPILE) \ HOSTCC=$(HOSTCC) \ CC=$(CROSS_COMPILE)$(gcc) \ - BINDGEN=bindgen-0.65 \ + BINDGEN=bindgen \ KERNELRELEASE=$(abi_release)-$(target_flavour) \ CONFIG_DEBUG_SECTION_MISMATCH=y \ KBUILD_BUILD_VERSION="$(uploadnum)" \