From patchwork Mon Jun 28 16:31:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kleber Sacilotto de Souza X-Patchwork-Id: 1498056 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GDCmT0GJLz9sVp; Tue, 29 Jun 2021 02:31:35 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1lxuAU-00032H-R5; Mon, 28 Jun 2021 16:31:30 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lxuAT-00031e-31 for kernel-team@lists.ubuntu.com; Mon, 28 Jun 2021 16:31:29 +0000 Received: from mail-ej1-f72.google.com ([209.85.218.72]) by youngberry.canonical.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lxuAS-0004Z1-Rl for kernel-team@lists.ubuntu.com; Mon, 28 Jun 2021 16:31:28 +0000 Received: by mail-ej1-f72.google.com with SMTP id gn22-20020a1709070d16b02904baf8000951so1047481ejc.10 for ; Mon, 28 Jun 2021 09:31:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=W51DR6FqKRAMTT/QiU+JsOqADwtA650ECP+DyJeySD0=; b=jwz4UKXT2CuiRzgWnRhYVO8d7BUgAQWlxl+R45hGUMpXdHy2sNtq2SolvLvQPabPPn Tl+bAX52Z3h3EO3EoUi0tNl6dHQCKmvEu15GlfT6EVaxvjVBXGF+jnAQ/NSj8NlRWOo0 ExjYcbuDklV5TVsmBU6SQ8dahY7+W04ms50NrG781IPhHyTn+2NL8Wjb5Qu0GQkSjc1I XgaF/kUX/7dtlNPauRqLFyrSb7jpJ1qO19yTMQDLD9fNv9Wd9cfALhZt9uKp54tQbHjW PrQzzAQURuFUFBWIZ3alonPcM0CvwmU0O5FxGBDlGXyyVr/Olb/Nz+JgK+3iUFAEmOOL nuLQ== X-Gm-Message-State: AOAM531S9Jh/yZ8MDr2W8scRylZJ71gw3yU4ZDxt3U+NjPkml5jgk2Jo dDVQIwXcua2nvUyBrIZGMeWGWLjg3N9Xy9xAqV3ctTQO7db+sB4LW8JjQxQAcJgE6q+wlGivZId pwx2CJ59aX8Js7XBNsyGigEYajrxHtYHH5irrd/C03g== X-Received: by 2002:aa7:d3c2:: with SMTP id o2mr34474298edr.358.1624897888497; Mon, 28 Jun 2021 09:31:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy3V41FyLTpzD3Ooav2sAWCcCF/jhfSJlbvC7vzgxThUA3RmAYAc1y25NdlmXcLwAy1HdEgwA== X-Received: by 2002:aa7:d3c2:: with SMTP id o2mr34474282edr.358.1624897888314; Mon, 28 Jun 2021 09:31:28 -0700 (PDT) Received: from localhost.localdomain (ipbcc333e7.dynamic.kabel-deutschland.de. [188.195.51.231]) by smtp.gmail.com with ESMTPSA id zd21sm14785ejb.50.2021.06.28.09.31.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Jun 2021 09:31:28 -0700 (PDT) From: Kleber Sacilotto de Souza To: kernel-team@lists.ubuntu.com Subject: [SRU][focal/linux-riscv-5.8][PATCH 1/1] UBUNTU: [Packaging] Use gcc-10 for riscv-5.8 kernel configs Date: Mon, 28 Jun 2021 18:31:25 +0200 Message-Id: <20210628163125.1342496-2-kleber.souza@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210628163125.1342496-1-kleber.souza@canonical.com> References: <20210628163125.1342496-1-kleber.souza@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/1933856 With "UBUNTU: [Packaging] Use gcc-10 for riscv 5.8 kernel build", gcc-10 is used instead of the default gcc version in Focal for the kernel builds. The same compiler version is also needed to generate the kernel configs. Pass the "gcc" variable value set in debian/rules down to debian/scripts/misc/kernelconfig so the same string is used. Signed-off-by: Kleber Sacilotto de Souza --- debian/rules.d/1-maintainer.mk | 4 ++-- debian/scripts/misc/kernelconfig | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk index 5944ca526703..549fe95232b3 100644 --- a/debian/rules.d/1-maintainer.mk +++ b/debian/rules.d/1-maintainer.mk @@ -45,12 +45,12 @@ printdebian: updateconfigs defaultconfigs editconfigs genconfigs dumpconfigs: dh_testdir; - $(SHELL) $(DROOT)/scripts/misc/kernelconfig $@ "$(do_enforce_all)" + GCC=$(gcc) $(SHELL) $(DROOT)/scripts/misc/kernelconfig $@ "$(do_enforce_all)" rm -rf build updateportsconfigs defaultportsconfigs editportsconfigs genportsconfigs askconfigs: dh_testdir; - $(SHELL) $(DROOT)/scripts/misc/kernelconfig $@ ports + GCC=$(gcc) $(SHELL) $(DROOT)/scripts/misc/kernelconfig $@ ports rm -rf build printenv: diff --git a/debian/scripts/misc/kernelconfig b/debian/scripts/misc/kernelconfig index f95396e28f28..1077afd22396 100755 --- a/debian/scripts/misc/kernelconfig +++ b/debian/scripts/misc/kernelconfig @@ -69,11 +69,12 @@ for arch in $archs; do # we maintain the configs for hwe. modify_config=true env="ARCH=$kernarch DEB_ARCH=$arch" - compiler_path=$(which "${cross_compile}gcc" || true) + gcc=${GCC:-gcc} + compiler_path=$(which "${cross_compile}${gcc}" || true) if [ "$compiler_path" != '' ]; then - env="$env CROSS_COMPILE=$cross_compile" + env="$env CC=${cross_compile}${gcc} CROSS_COMPILE=$cross_compile" else - echo "WARNING: ${cross_compile}gcc not installed" + echo "WARNING: ${cross_compile}${gcc} not installed" modify_config= warning_partial="$warning_partial $arch" fi