From patchwork Tue Oct 4 13:54:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1685959 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=jkTJaWLO; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MhfNK5CYLz1ypH for ; Wed, 5 Oct 2022 00:55:12 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1ofiNy-0007yM-7a; Tue, 04 Oct 2022 13:55:02 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1ofiNv-0007xD-Rm for kernel-team@lists.ubuntu.com; Tue, 04 Oct 2022 13:54:59 +0000 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id B1DFB3F133 for ; Tue, 4 Oct 2022 13:54:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1664891699; bh=nI9a4RhXCKW7WZjo4aRwziEd4ATTxdj6nV+bMUfRwJQ=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=jkTJaWLO6Xgk8Jspu4CDmF0PzKIrXJO8BDWlFNBp4GQ2rfJq3nwbgAxDYfs8WSfev LjZbDcYu8Tup+WFRINajkzK5nyV0You8mQ7hCQVVLW8XmnziWlj8MjbXP46ATVGb85 4ogd+Kyaxf8vSGSo3zMUcJcPGFCdjEtWfJxiJ1l8NmJXFe29c+5ux5AmLUR7dlf9mQ j/jP8kQkb1uQd/JwwWe8lwa588SOzyqXdMwziJqdp/WSdDH8u4tzwBLrYw7+pdr0nj kR0Xdgv6YHkQW+okVl0vVNQMOvuoiyh54hyVAa9R4hTLHxbuZCALucXIcbHHgpqpDb R/E3C/FiqmQYQ== Received: by mail-wr1-f69.google.com with SMTP id q28-20020adfab1c000000b0022e0399964dso2917046wrc.8 for ; Tue, 04 Oct 2022 06:54:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date; bh=nI9a4RhXCKW7WZjo4aRwziEd4ATTxdj6nV+bMUfRwJQ=; b=2aSCg7OIDzwZ1kt6i2s/wzAg6rhKvYqi+LIoxW7rFluCVXu2nz+mpVrhA0kEiQUawC oNJ1527G3s/jG9v6L2kaQ8VNhpcSGxR2lQZVLMooxswJJ2GG3vZkR3wgZC4dff3Uhjc1 IadUDyMEUOks/cBKPK1NFWYXbKHtjSP1wfjeTzjsE+nsHuUX1V0XJNUUOxEE5sycNXgu GpcUv4PDAoXqLfh/2aV6+zXqYKC9mENGUkTPyHqedpFQq2wzFlyLC5OuChmr6eKS9/Sg GGlHvcHHUd/e+x0OEsNUhB/iBBDm3JxolSclJ2Rp7Q0nV+0vVWRiVOKCQX2t2awGs+/o 978w== X-Gm-Message-State: ACrzQf1pBehWGmYN+F5AJQN1zmovmTiV5B4j3ZinML+zEidnJ+eDCDbN NmIl4lKDki5u141G2ZISpf86Y+nrqCKA77otkc7tBdBtw0ApJ0EFet1XlAp0kmL1f+uOCvuf1kY IbZLU5zrDWqw0oIZNkLQqnv+3EDffrLXL7EYMC3tYbw== X-Received: by 2002:a05:6000:186d:b0:22a:f6ce:72d9 with SMTP id d13-20020a056000186d00b0022af6ce72d9mr16173209wri.426.1664891699010; Tue, 04 Oct 2022 06:54:59 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5ODTRPmq6gfhcZ3SUACsJksJTXyT1k0QBIyjhkHoh1LM4esdoHLJXp5VaZ8iGFhnJU7ewAXA== X-Received: by 2002:a05:6000:186d:b0:22a:f6ce:72d9 with SMTP id d13-20020a056000186d00b0022af6ce72d9mr16173193wri.426.1664891698693; Tue, 04 Oct 2022 06:54:58 -0700 (PDT) Received: from localhost ([2a01:4b00:85fd:d700:9a6:7435:7523:aa89]) by smtp.gmail.com with ESMTPSA id f11-20020a05600c154b00b003a3442f1229sm21016583wmg.29.2022.10.04.06.54.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Oct 2022 06:54:57 -0700 (PDT) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [KINETIC][UNSTABLE][PATCH 1/2] UBUNTU: [Packaging] use versioned gcc-12 Date: Tue, 4 Oct 2022 14:54:55 +0100 Message-Id: <20221004135456.243087-1-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" 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 --- debian/rules.d/0-common-vars.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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] , $(gcc)-arm-linux-gnueabihf [armhf] , $(gcc)-powerpc64le-linux-gnu [ppc64el] , $(gcc)-riscv64-linux-gnu [riscv64] , $(gcc)-s390x-linux-gnu [s390x] , $(gcc)-x86-64-linux-gnu [amd64] , abidir := $(CURDIR)/$(DEBIAN)/__abi.current/$(arch) From patchwork Tue Oct 4 13:54:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1685958 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=XWW3V/Xp; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MhfNK61VNz23jR for ; Wed, 5 Oct 2022 00:55:12 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1ofiO0-0007yd-D6; Tue, 04 Oct 2022 13:55:04 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1ofiNx-0007y8-Ny for kernel-team@lists.ubuntu.com; Tue, 04 Oct 2022 13:55:01 +0000 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 76E2840795 for ; Tue, 4 Oct 2022 13:55:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1664891701; bh=E9Uhchaxgh2jUg3xAvHtBgU+sw6oI+uGcxI35m/mCEo=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=XWW3V/XpHMC1yK3MyhC8ntslZsEKZ3yT9/vVI/GHVTBECYkovZeB46MT0VUTw2t9k So+b9B/UWW8jCmu6NvfgipK4FOdAcvfafBFGC1r4OM+wkOTwUyL+Uik1WCYYeoYjyg +cbkdaH0A2LPYyS1vgaBlCg8fVBXKkreOOTDDNxl7COF9nrmYcOzrZbeEVFEoqkwWQ Ih4zp6DPx4qVIOI0VOzEflKSvsGWFrSiY/mXnixOJOEeDDOZBWkDxIXVffuRmqF/wC 1R4/EsUwZEXN5rrgh5s6msWZQSRXgi1lpQ0zTgvvicjir3gxb3kOdeTtx3tcYARdN3 7J1LqShUG8r+Q== Received: by mail-wm1-f70.google.com with SMTP id f25-20020a7bc8d9000000b003b4768dcd9cso3584747wml.9 for ; Tue, 04 Oct 2022 06:55:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date; bh=E9Uhchaxgh2jUg3xAvHtBgU+sw6oI+uGcxI35m/mCEo=; b=vfngG+jUpNVPnU/QFCycvfVniRo0T+ZjClY1kSQQE72tNDvmaO/ecBRSrYzrA4McL8 HrdCSdhMqfQ/y6EqDo418Yh2HEkP1EHCCXeLJJe4mV63mEawwWWb1DSE3sMtGSR/ppiP YwUtuV9wjUO+iFtB0cWd4870DH5dm2KL0nhXNNRsFOCY7BrKMLtavQYZS+uca3+33Ysm nxbBWqQn1zRUhZoQ/xcVEWrc9W7o4j9I7VsJl99R85JJM7NYYuSWwMDOEDXCaK+pCYC3 5r3atyoFdfbzIMKbGsT3p2r2DvFBg7VYm5cbzVwKJvc6uyW9tMBQDb1up0c9qnwEGi03 DIRw== X-Gm-Message-State: ACrzQf0lZTbmiZvO6/CEQamHOWo6GTKYCvcC8udW1Yn5pvsDdo22EIz8 Er0UWazsOv3vNrJEo89kKjrIxFbMzG4LbXkNlK48TwMl0dMixpcry/FbXD6rSq1iDNEUz7y2fZB hWaRJRgCzAiQryNXbEBETCj3ICCGV3a45Io0dn48vAw== X-Received: by 2002:a05:600c:3541:b0:3b4:c0fd:9182 with SMTP id i1-20020a05600c354100b003b4c0fd9182mr9767713wmq.142.1664891700628; Tue, 04 Oct 2022 06:55:00 -0700 (PDT) X-Google-Smtp-Source: AMsMyM75N98Z5Nyxj+fU081T5xryN88vuQ9wDmUIBSHKJRZdbi5x+UBy8awWMDikh4MzhBMLFWGnuA== X-Received: by 2002:a05:600c:3541:b0:3b4:c0fd:9182 with SMTP id i1-20020a05600c354100b003b4c0fd9182mr9767700wmq.142.1664891700306; Tue, 04 Oct 2022 06:55:00 -0700 (PDT) Received: from localhost ([2a01:4b00:85fd:d700:9a6:7435:7523:aa89]) by smtp.gmail.com with ESMTPSA id w10-20020a05600c474a00b003b4ac05a8a4sm25513591wmo.27.2022.10.04.06.54.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Oct 2022 06:54:59 -0700 (PDT) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [KINETIC][UNSTABLE][PATCH 2/2] UBUNTU: [Packaging] Update configs with versioned compiler version Date: Tue, 4 Oct 2022 14:54:56 +0100 Message-Id: <20221004135456.243087-2-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221004135456.243087-1-dimitri.ledkov@canonical.com> References: <20221004135456.243087-1-dimitri.ledkov@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1991664 Update configs with versioned compiler version, no other config key changes. Signed-off-by: Dimitri John Ledkov --- debian.master/config/amd64/config.common.amd64 | 2 +- debian.master/config/arm64/config.common.arm64 | 2 +- debian.master/config/armhf/config.common.armhf | 2 +- debian.master/config/ppc64el/config.common.ppc64el | 2 +- debian.master/config/riscv64/config.common.riscv64 | 2 +- debian.master/config/s390x/config.common.s390x | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 4a8cf4ad15..d4b95ea5d8 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -59,7 +59,7 @@ CONFIG_CADENCE_WATCHDOG=m CONFIG_CAIF=m CONFIG_CAN=m CONFIG_CB710_CORE=m -CONFIG_CC_VERSION_TEXT="x86_64-linux-gnu-gcc (Ubuntu 12.2.0-2ubuntu1) 12.2.0" +CONFIG_CC_VERSION_TEXT="x86_64-linux-gnu-gcc-12 (Ubuntu 12.2.0-3ubuntu1) 12.2.0" CONFIG_CDROM_PKTCDVD=m # CONFIG_CMA is not set CONFIG_CMDLINE_PARTITION=y diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index 069dd332e7..83d1069657 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -61,7 +61,7 @@ CONFIG_CADENCE_WATCHDOG=m CONFIG_CAIF=m CONFIG_CAN=m CONFIG_CB710_CORE=m -CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 12.2.0-2ubuntu1) 12.2.0" +CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc-12 (Ubuntu 12.2.0-3ubuntu1) 12.2.0" CONFIG_CDROM_PKTCDVD=m CONFIG_CMA=y CONFIG_CMDLINE="console=ttyAMA0" diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 4f5a5227c6..99c558ac5a 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -56,7 +56,7 @@ CONFIG_CADENCE_WATCHDOG=m CONFIG_CAIF=m CONFIG_CAN=m CONFIG_CB710_CORE=m -CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (Ubuntu 12.2.0-2ubuntu1) 12.2.0" +CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc-12 (Ubuntu 12.2.0-3ubuntu1) 12.2.0" CONFIG_CDROM_PKTCDVD=m CONFIG_CMA=y CONFIG_CMDLINE="" diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index 541dbc5fb7..eac947605d 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -55,7 +55,7 @@ CONFIG_CADENCE_WATCHDOG=m CONFIG_CAIF=m CONFIG_CAN=m CONFIG_CB710_CORE=m -CONFIG_CC_VERSION_TEXT="powerpc64le-linux-gnu-gcc (Ubuntu 12.2.0-2ubuntu1) 12.2.0" +CONFIG_CC_VERSION_TEXT="powerpc64le-linux-gnu-gcc-12 (Ubuntu 12.2.0-3ubuntu1) 12.2.0" CONFIG_CDROM_PKTCDVD=m CONFIG_CMA=y CONFIG_CMDLINE="" diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64 index e722a28949..ac54b870dd 100644 --- a/debian.master/config/riscv64/config.common.riscv64 +++ b/debian.master/config/riscv64/config.common.riscv64 @@ -54,7 +54,7 @@ CONFIG_CADENCE_WATCHDOG=m CONFIG_CAIF=m CONFIG_CAN=m CONFIG_CB710_CORE=m -CONFIG_CC_VERSION_TEXT="riscv64-linux-gnu-gcc (Ubuntu 12.2.0-2ubuntu1) 12.2.0" +CONFIG_CC_VERSION_TEXT="riscv64-linux-gnu-gcc-12 (Ubuntu 12.2.0-3ubuntu1) 12.2.0" CONFIG_CDROM_PKTCDVD=m CONFIG_CMA=y CONFIG_CMDLINE="" diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x index 517340af32..2e40e3d523 100644 --- a/debian.master/config/s390x/config.common.s390x +++ b/debian.master/config/s390x/config.common.s390x @@ -45,7 +45,7 @@ CONFIG_AUTOFS_FS=y # CONFIG_CAIF is not set # CONFIG_CAN is not set # CONFIG_CB710_CORE is not set -CONFIG_CC_VERSION_TEXT="s390x-linux-gnu-gcc (Ubuntu 12.2.0-2ubuntu1) 12.2.0" +CONFIG_CC_VERSION_TEXT="s390x-linux-gnu-gcc-12 (Ubuntu 12.2.0-3ubuntu1) 12.2.0" # CONFIG_CDROM_PKTCDVD is not set CONFIG_CMA=y # CONFIG_CMDLINE_PARTITION is not set