From patchwork Fri Jun 11 09:57:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AceLan Kao X-Patchwork-Id: 1490866 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=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=C9UatRoI; dkim-atps=neutral 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 4G1brR2c71z9sSn; Fri, 11 Jun 2021 19:58:15 +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 1lrdvX-00089j-8h; Fri, 11 Jun 2021 09:58:11 +0000 Received: from mail-pg1-f174.google.com ([209.85.215.174]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lrdvU-00087R-43 for kernel-team@lists.ubuntu.com; Fri, 11 Jun 2021 09:58:08 +0000 Received: by mail-pg1-f174.google.com with SMTP id j12so2030359pgh.7 for ; Fri, 11 Jun 2021 02:58:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AKEKCSgEAP074MlWs5XGZnnJjLjCHNL2uAMLXfzkgxk=; b=C9UatRoIF2Rp92oG0XZ5CwgNjp9spZmoymo9bCYV8fQ1t+I57oabhLIJyyvF3Amz/0 nwoI8XbgECfFpwGSJRp+SuI2UogtzKqZeF6tHQGvgg4M3vVxu5MQ1Yl59MNybEhlRd8V fdVJOQnM1JaSyoufCnOAppZO1FGrTP1UDL97IlyKyduYdcmwCtOHarPU+N9KL8rVYP2/ LBXPaFDCHNB/vXcT1/krTIcRmR9DSxU952LpC43rtWpfXr64/MIsjvbfBG7k8mzdfWsF kXv7sxD+nFoDvYinVsU6xqIWd2rGanfQP84yImrl6A9rAfKsPzPvUBZFXr6KtT3y0MzE LCIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=AKEKCSgEAP074MlWs5XGZnnJjLjCHNL2uAMLXfzkgxk=; b=mlxpJQBF4QW4hE4RU+wvPKyQcsJObmKrgLlmOgjkcD2VYQOHXTY2tQj3D0dnbZ99lX uqCRud1ygHD1CSd7IRasW7o4CBmQkgmAtdzFsk4rUPpYBKLlJjj6sGnB5ftuD9YuWUVu ZoXhe4bt5OEFjLkHuTtyzkYuwNVO3aRzAhS0He+eNm/kCkimzicG1o9rKx6T5IECBx4k qg1OJZ7MYKsHOvL8E59u/ozy3epAFoYTd0Qi5a1qFhXlhiDh6GQ1tkHx0RRSJTrb4poz 7tnXZk28dwHTnG5ENfi67hJMjxT7P4mzEIGuMZxv1hDxsioj5HNzchY35CGbwSe8TdCS BEoA== X-Gm-Message-State: AOAM530PH2HHx82CNVQ28dICMLipoupRuGSx3d13JcyySC9HTpN7ViZT LSeUqSfa+Uz/x4WrDhtFRP80z1n10JWiMw== X-Google-Smtp-Source: ABdhPJwtr75dY/LSPtot7GsDd6NNLeTkqzPLC8TzZ7h8GUzoJJvkwGzLYtGYXQR49aJZmNurvEJaJQ== X-Received: by 2002:a65:64c8:: with SMTP id t8mr2818853pgv.96.1623405485603; Fri, 11 Jun 2021 02:58:05 -0700 (PDT) Received: from localhost (220-135-95-34.HINET-IP.hinet.net. [220.135.95.34]) by smtp.gmail.com with ESMTPSA id v14sm5259746pgo.89.2021.06.11.02.58.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Jun 2021 02:58:04 -0700 (PDT) From: AceLan Kao To: kernel-team@lists.ubuntu.com Subject: [PATCH 3/3][SRU][G] UBUNTU: [Packaging] Fix ODM support in actual build Date: Fri, 11 Jun 2021 17:57:51 +0800 Message-Id: <20210611095751.14524-4-acelan.kao@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210611095751.14524-1-acelan.kao@canonical.com> References: <20210611095751.14524-1-acelan.kao@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.215.174; envelope-from=acelan@gmail.com; helo=mail-pg1-f174.google.com 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" From: Stefan Bader BugLink: https://bugs.launchpad.net/bugs/1912789 The config update was working with the conditional entry but the actual build is different and was just ignoring everything. Signed-off-by: Stefan Bader (cherry picked commit from 198971108d5dfe12b9846bf0d115accc3d1c3fe8 focal) Signed-off-by: Chia-Lin Kao (AceLan) --- debian/scripts/misc/arch-has-odm-enabled.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/debian/scripts/misc/arch-has-odm-enabled.sh b/debian/scripts/misc/arch-has-odm-enabled.sh index 7bc8a5db0db0..23fe34a868a7 100755 --- a/debian/scripts/misc/arch-has-odm-enabled.sh +++ b/debian/scripts/misc/arch-has-odm-enabled.sh @@ -3,7 +3,16 @@ set -e if [ "$1" = "" ]; then - return 1 + # This would be set doing the actual kernel build + if [ "$KBUILD_VERBOSE" = "" ]; then + return 1 + fi + case $ARCH in + x86) ARCH=amd64;; + *) ;; + esac +else + ARCH=$1 fi TOPDIR=$(dirname $0)/../../.. @@ -11,7 +20,7 @@ TOPDIR=$(dirname $0)/../../.. RULESDIR=$TOPDIR/$DEBIAN/rules.d do_odm_drivers=false -for f in $1.mk hooks.mk; do +for f in $ARCH.mk hooks.mk; do eval $(cat $RULESDIR/$f | sed -n -e '/do_odm_drivers/s/ \+//gp') done if [ "$do_odm_drivers" != "true" ]; then