From patchwork Fri Jun 11 10:01:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AceLan Kao X-Patchwork-Id: 1490873 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=MkWWn6xk; 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 4G1bwb4z1lz9sRf; Fri, 11 Jun 2021 20:01:51 +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 1lrdz2-0000Bb-2X; Fri, 11 Jun 2021 10:01:48 +0000 Received: from mail-pg1-f178.google.com ([209.85.215.178]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lrdz0-0000A7-9C for kernel-team@lists.ubuntu.com; Fri, 11 Jun 2021 10:01:46 +0000 Received: by mail-pg1-f178.google.com with SMTP id 27so2047703pgy.3 for ; Fri, 11 Jun 2021 03:01:45 -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=MkWWn6xkz0qdSBn7Q9jIQAHwbGqbIsnQX00EunKieZSTbrk5yGRhqF2AQcK+PyI0/j K8meQZxHP6/4KjbraZ6VTYEuvgLgcWpuwBh7iz4SOsekTyp2myPFQ4myw5PdcduFYBEL 2e7UgtQbDV3btQfdi1XZNxCopCj9283z21OQlx0Q0BA/pjksURCOhQZDifsAx2cpWGJ9 mZS53AyKXukDjrs9j7K4mTFuq++2jYUZANx1Z5gxVrjZD0dH7lURmUVrUHatMqIqKaWk maDRBKKvxE9d8vkn/DXpBD3VK02M1q4VpEE80F97p0UYxB7Q9nbjfmUY/85aJhu0l1hu ZMKQ== 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=fQt3+U9kSDL5kkujrJ8XVcV7n1LoVh319KvP1v9F1Rkf8WhUQnyDuv9OCZYf1IHD+v rqLcHQ7CVkshfiIUYd9HLLMgjypbnA3Bil1uZcEjVPoyUqGSUEbWgruxgsYZYu3FACuf Y7rYPZ5/I0WTi7htKh0gGH6WQhuiVDd6AAEFBpdg+7QUth+WLXcn9k3ouWykxRTgVEZL NWLZaHkUJeWQUFxiU+dH5eTWdTHc+zr50Pq5vYpjIN8b+bXXrM2j3XgMSosoYwawmgAQ qClfEvkVz2ooI3sI6kOjwaM356ivzeFWBYwyiIcPJe62uATx1YexZZZeq2MNR/tP9s0o Eoaw== X-Gm-Message-State: AOAM530JtX5rTo0CSp8R3K3lIKNYTBIw+2CzaVKALKI8nk5p10XlMGV3 uxcJhPLjdRevVOb+vVSUVLdSCTLcq3g9Zg== X-Google-Smtp-Source: ABdhPJxJIV+zkZI7xDoSfcjmTANZaBeJ1t5JdBwokWyA4s6pfB/7FSN1Sagz+7AdDGIQFHKV48r26w== X-Received: by 2002:a05:6a00:bc1:b029:2f4:3461:c2ae with SMTP id x1-20020a056a000bc1b02902f43461c2aemr7544710pfu.9.1623405703429; Fri, 11 Jun 2021 03:01:43 -0700 (PDT) Received: from localhost (220-135-95-34.HINET-IP.hinet.net. [220.135.95.34]) by smtp.gmail.com with ESMTPSA id j4sm9943912pjv.7.2021.06.11.03.01.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Jun 2021 03:01:42 -0700 (PDT) From: AceLan Kao To: kernel-team@lists.ubuntu.com Subject: [PATCH 3/4][SRU][H] UBUNTU: [Packaging] Fix ODM support in actual build Date: Fri, 11 Jun 2021 18:01:26 +0800 Message-Id: <20210611100131.15133-4-acelan.kao@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210611100131.15133-1-acelan.kao@canonical.com> References: <20210611100131.15133-1-acelan.kao@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.215.178; envelope-from=acelan@gmail.com; helo=mail-pg1-f178.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