From patchwork Tue Nov 8 10:46:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1701226 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=NLjKREWe; 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 4N64Xv0Jhzz23mG for ; Tue, 8 Nov 2022 21:46:53 +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 1osM7s-00048g-Mb; Tue, 08 Nov 2022 10:46:40 +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 1osM7q-000473-Su for kernel-team@lists.ubuntu.com; Tue, 08 Nov 2022 10:46:38 +0000 Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.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 8C60C412C7 for ; Tue, 8 Nov 2022 10:46:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1667904398; bh=1OAkxds0NLWF2XAxz19eFkvvqwuADA/5kyULV6UwyMw=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=NLjKREWeVW1nzwzRsc0fVNnKVE+jnWscXLbpQlsd6B+x25Ns0omuUwOXw6XyEGqWQ uUOdPGqVXJUpOrRFnaYrreJkWf8pDvvmxscthj7aMTbbyVNntrVTAKpwv0uI6ncXk7 sUrSgccLiUSH+/scOBWN+w+v/1Et46Z9O7Dd7Ta8lBruAUeiQbOGWwlJnEiZuOkqrk lbrZ56zlfdaD4eIc5odzFyVbExCwhT2g23YDUGEcPnw/Ef7ROqGqK2rpKYmhKXzcI3 bQB2EsWn1JYQJ0Jr5GRlbWjqiNqHt9T6tHlWTYL9FE8wPBjCql0JkpVysTrtCCuZMF Gq5Pbc2EIlqiA== Received: by mail-ed1-f69.google.com with SMTP id w17-20020a056402269100b00461e28a75ccso10228418edd.8 for ; Tue, 08 Nov 2022 02:46:38 -0800 (PST) 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:message-id:reply-to; bh=1OAkxds0NLWF2XAxz19eFkvvqwuADA/5kyULV6UwyMw=; b=Ldl+pHhs5GmlRT9aiDOF59YY46rrIhjmVDKWbTEf6QAJQj7KbmO+BX5BRqL6M67J3l FlpOJYzhhR+AiSFp+R7Xpba3dUsQzMJbVWyBcjS1/nBskXUw8e1j9Wb10Ul/UI6BrXqO 2yXpanBv5oxKx+07v6oGndkW884NDhKZkzL93zn644v6IQ7jK13nCsUhjCU+zQjPw1Yc D72OG69KxPaxjUF5d2a80mY8WI3Ho/qvaK8ti0ee/F+PTr/HYX9bR62y90QbgPF/fOg8 cUv+EKhNkbJqDOAedMQcTv9nmFx3XoxJhZ44rcFpvLdBGQDDnpjBdr4bwPC3AIEJCq2P bYrg== X-Gm-Message-State: ACrzQf2MjvlocrHFiYbi2w/HcElWI659n4zN5nBamVq9zX4jXUc//1P1 Mq2zpkPPOWh86Qc42pmKeoeeq+cUs8elYBCyu1Qhq+iZZdlUgb24VzCsTkeqADvBPt4V8T5t6kn B+YSTGS43XMTMYwkbwQ0QOFrkoD7T5iq/rhd6k4IAAw== X-Received: by 2002:a17:906:846a:b0:7ad:84cd:f2a9 with SMTP id hx10-20020a170906846a00b007ad84cdf2a9mr51163008ejc.244.1667904397607; Tue, 08 Nov 2022 02:46:37 -0800 (PST) X-Google-Smtp-Source: AMsMyM4M51Eh2P7jqeevbqcNJNWr1vZcZjM/A30QWkuBZfFu/l8cti5mRjwURYrORReGPXP87gpLCg== X-Received: by 2002:a17:906:846a:b0:7ad:84cd:f2a9 with SMTP id hx10-20020a170906846a00b007ad84cdf2a9mr51162993ejc.244.1667904397366; Tue, 08 Nov 2022 02:46:37 -0800 (PST) Received: from localhost.localdomain ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id kv15-20020a17090778cf00b007adf125cde4sm4609012ejc.13.2022.11.08.02.46.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Nov 2022 02:46:37 -0800 (PST) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][K/raspi][PATCH 2/3] UBUNTU: Revert "UBUNTU: [Packaging] raspi: Use gcc-11 for armhf" Date: Tue, 8 Nov 2022 11:46:31 +0100 Message-Id: <20221108104632.12140-3-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221108104632.12140-1-juerg.haefliger@canonical.com> References: <20221108104632.12140-1-juerg.haefliger@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/1995853 This reverts commit 3d15b0e601a672a7f915cf15f071ef59fd4e9090. Signed-off-by: Juerg Haefliger --- debian/rules.d/0-common-vars.mk | 9 ++------- debian/scripts/misc/kernelconfig | 9 +-------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk index f7a0bdc41a22..1d8f8b85772f 100644 --- a/debian/rules.d/0-common-vars.mk +++ b/debian/rules.d/0-common-vars.mk @@ -119,13 +119,8 @@ 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 # -# FIXME (juergh): Use gcc-11 for armhf -ifeq ($(arch),armhf) -export gcc := gcc-11 -else -export gcc := gcc-12 -endif -GCC_BUILD_DEPENDS=\ gcc-12 [arm64], gcc-11 [armhf], gcc-12-aarch64-linux-gnu [arm64] , gcc-11-arm-linux-gnueabihf [armhf] , +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) prev_abidir := $(CURDIR)/$(DEBIAN)/abi/$(arch) diff --git a/debian/scripts/misc/kernelconfig b/debian/scripts/misc/kernelconfig index 2db4b719db6d..44c1b79d9765 100755 --- a/debian/scripts/misc/kernelconfig +++ b/debian/scripts/misc/kernelconfig @@ -67,13 +67,6 @@ for arch in $archs; do # Determine cross toolchain to use for Kconfig compiler tests cross_compile="$(dpkg-architecture -qDEB_HOST_GNU_TYPE -a$arch 2>/dev/null)-" - # FIXME (juergh): Use gcc-11 for armhf - if [ "${kernarch}" = "arm" ] ; then - gcc=gcc-11 - else - gcc=gcc-12 - fi - # Environment variables for 'make *config'. We omit CROSS_COMPILE # for i386 since it is no longer supported after 19.04, however # we maintain the configs for hwe. @@ -83,7 +76,7 @@ for arch in $archs; do if [ "$compiler_path" != '' ]; then env="$env CROSS_COMPILE=$cross_compile CC=$compiler_path" else - echo "WARNING: ${cross_compile}${gcc} not installed" + echo "WARNING: ${cross_compile}gcc not installed" modify_config= warning_partial="$warning_partial $arch" fi