Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add gcc dependency to headers package for dkms #313

Merged
merged 2 commits into from
Apr 25, 2024
Merged

Add gcc dependency to headers package for dkms #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd9f0da
Add gcc dependency to headers package for dkms
jackpot51 Apr 25, 2024
c977498
Relax bindgen version requirement
jackpot51 Apr 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions debian.master/control.stub.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <!stage1>,
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <!stage1>,
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion debian/rules.d/0-common-vars.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)" \
Expand Down