Message ID | 20221004135456.243087-1-dimitri.ledkov@canonical.com |
---|---|
State | New |
Headers | show |
Series | [KINETIC,UNSTABLE,1/2] UBUNTU: [Packaging] use versioned gcc-12 | expand |
On Tue, Oct 04, 2022 at 02:54:55PM +0100, Dimitri John Ledkov wrote: > BugLink: https://bugs.launchpad.net/bugs/1991664 > > cbd/kteam-tools have been updated to install gcc-12 toolchain. dkms > dynamically checks and tries to use the same compiler version as the > kernel build. When backporting, the toolchain version should be set in > full to the versioned gcc-12, make it so. This is to support building > dkms modules with matching gcc in jammy. > > Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com> Makes sense to me (both patches). Applied to kinetic/linux and kinetic/linux-unstable. Thanks, -Andrea
diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk index a37befa240..1d8f8b8577 100644 --- a/debian/rules.d/0-common-vars.mk +++ b/debian/rules.d/0-common-vars.mk @@ -119,7 +119,7 @@ CROSS_COMPILE ?= $(DEB_HOST_GNU_TYPE)- # If a given kernel wants to change this, they can do so via their own # $(DEBIAN)/rules.d/hooks.mk and $(DEBIAN)/rules.d/$(arch).mk files # -export gcc?=gcc +export gcc?=gcc-12 GCC_BUILD_DEPENDS=\ $(gcc), $(gcc)-aarch64-linux-gnu [arm64] <cross>, $(gcc)-arm-linux-gnueabihf [armhf] <cross>, $(gcc)-powerpc64le-linux-gnu [ppc64el] <cross>, $(gcc)-riscv64-linux-gnu [riscv64] <cross>, $(gcc)-s390x-linux-gnu [s390x] <cross>, $(gcc)-x86-64-linux-gnu [amd64] <cross>, abidir := $(CURDIR)/$(DEBIAN)/__abi.current/$(arch)
BugLink: https://bugs.launchpad.net/bugs/1991664 cbd/kteam-tools have been updated to install gcc-12 toolchain. dkms dynamically checks and tries to use the same compiler version as the kernel build. When backporting, the toolchain version should be set in full to the versioned gcc-12, make it so. This is to support building dkms modules with matching gcc in jammy. Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com> --- debian/rules.d/0-common-vars.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)