From patchwork Fri Jun 11 10:01:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AceLan Kao X-Patchwork-Id: 1490871 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=G985EWfb; 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 4G1bwT537Nz9sXM; Fri, 11 Jun 2021 20:01:45 +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 1lrdyw-000088-6Y; Fri, 11 Jun 2021 10:01:42 +0000 Received: from mail-pf1-f179.google.com ([209.85.210.179]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lrdyt-00007M-RQ for kernel-team@lists.ubuntu.com; Fri, 11 Jun 2021 10:01:40 +0000 Received: by mail-pf1-f179.google.com with SMTP id m7so4033169pfa.10 for ; Fri, 11 Jun 2021 03:01:39 -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=O6XOXy1l1xq/HUlW37gtDennQUZ0/+u91009IyX+ge8=; b=G985EWfb3KWbGGyg4K/ODVTDHL+GczceLZ+vdG0GBTOY+hTBGK/eyaIxXkMgrHCg1F lQinQPL/g5a74AUJNoNwuf/NCMtWsEz0yTAvA0dtYa1wx6VYb+N4ObZ/8ClKoqzjgWnM 9JezLnoZbs1rud0sy8HDK2DsYEYAMge/nYPK4JOlyhXyLVbEzWziA+rXcUVPJVJAXiGH L2ZW5ezzLlxQPbNxk2aOy6OZWFC1ppiXHDunllfm1DbkJXVU65rWjMCa2XjbetV22wYU fZAPp8ZbPBrTREXM4+pTauN6oRRLc9yAng9tW+rL6KXA9lW/7SwP+bf7dPhO7NU1odd7 tN/Q== 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=O6XOXy1l1xq/HUlW37gtDennQUZ0/+u91009IyX+ge8=; b=A10+Fs5KScJl8pXp/0xbVmgOhjTD2wGLh/hH16q1RBNa1IJHHRr7+14yYfwYarXCgc 9RSzE1NkIKdLsu+XlInihM1xNA2PFLbCLPpJr+6uBxShqZjagphKYeo3GtaZ8wUK5GaM k+1w6iCUzBFlUQ2cbUG4kZLyn40e+Pl55uSo+TsGaCa7e+euIE4NSo4XoOsmVMFZ4MAN 8hfqHV0Q1HzlkXSD/+zk/fZgFbXy4tqf2h0vXBNYFghNY/k9f0o/fPOXNfnFwTDE9UtO GVp0c+qS/1trCEbvYtrhwdS/Ddu4ipmZXoyQGttm0OpmPugXD8+FCjH0jW3L8npC3b8w UWUw== X-Gm-Message-State: AOAM532n5+6vCmlevNIhH9Orl3IrUdEPJ8wqcC1DOnqTJJ9gf1yLagO+ wBkgRB3EyboSobV6SEOvFpYsiQq8p2BzFw== X-Google-Smtp-Source: ABdhPJzTPD+ouXNYfOIPMPE4mznGmW3C56lR0/Wfy27aVQPcKB61piK6vTmkdQHiDOM+va8giPHOIw== X-Received: by 2002:a62:1743:0:b029:2ef:6014:62d5 with SMTP id 64-20020a6217430000b02902ef601462d5mr7666448pfx.63.1623405697225; Fri, 11 Jun 2021 03:01:37 -0700 (PDT) Received: from localhost (220-135-95-34.HINET-IP.hinet.net. [220.135.95.34]) by smtp.gmail.com with ESMTPSA id h21sm4498998pfv.190.2021.06.11.03.01.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Jun 2021 03:01:36 -0700 (PDT) From: AceLan Kao To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/4][SRU][H] UBUNTU: [Packaging] Add support for ODM drivers Date: Fri, 11 Jun 2021 18:01:24 +0800 Message-Id: <20210611100131.15133-2-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.210.179; envelope-from=acelan@gmail.com; helo=mail-pf1-f179.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 We want to be able to selectively turn on ODM driver support for those kernels/arches we have to but otherwise not inherit this to other derivatives. This is done by a new config option which we will have to depend on in the new drivers config options. Support is toggled by changing a makefile rule variable. The new config option will be hidden as long as not at least one of the arches supported turns on the rule variable. Signed-off-by: Stefan Bader Acked-by: Marcelo Henrique Cerri Acked-by: Andy Whitcroft Signed-off-by: Kelsey Skunberg (cherry picked from commit 4aeffc246531a666c1fad1925ebf1a6e68a704e4 focal) Signed-off-by: Chia-Lin Kao (AceLan) --- debian/rules.d/0-common-vars.mk | 4 ++++ debian/rules.d/1-maintainer.mk | 1 + debian/rules.d/2-binary-arch.mk | 3 +++ debian/scripts/misc/arch-has-odm-enabled.sh | 21 +++++++++++++++++++++ debian/scripts/misc/kernelconfig | 2 +- ubuntu/Kconfig | 6 ++++++ 6 files changed, 36 insertions(+), 1 deletion(-) create mode 100755 debian/scripts/misc/arch-has-odm-enabled.sh diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk index f642cda1a185..ad1c39b97bb3 100644 --- a/debian/rules.d/0-common-vars.mk +++ b/debian/rules.d/0-common-vars.mk @@ -187,6 +187,10 @@ do_common_headers_indep=true # add a 'full source' mode do_full_source=false +# Add an option to enable special drivers which should only be build when +# explicitly enabled. +do_odm_drivers=false + # build tools ifneq ($(wildcard $(CURDIR)/tools),) ifeq ($(do_tools),) diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk index a266b411ab50..48eb1441db15 100644 --- a/debian/rules.d/1-maintainer.mk +++ b/debian/rules.d/1-maintainer.mk @@ -86,6 +86,7 @@ printenv: @echo "do_flavour_header_package = $(do_flavour_header_package)" @echo "do_common_headers_indep = $(do_common_headers_indep)" @echo "do_full_source = $(do_full_source)" + @echo "do_odm_drivers = $(do_odm_drivers)" @echo "do_tools = $(do_tools)" @echo "do_any_tools = $(do_any_tools)" @echo "do_linux_tools = $(do_linux_tools)" diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 5ae9a989207c..453788fdba6b 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -31,6 +31,9 @@ $(stampdir)/stamp-prepare-tree-%: $(commonconfdir)/config.common.$(family) $(arc [ "$(do_full_source)" != 'true' ] && true || \ rsync -a --exclude debian --exclude debian.master --exclude $(DEBIAN) * $(builddir)/build-$* cat $(wordlist 1,3,$^) | sed -e 's/.*CONFIG_VERSION_SIGNATURE.*/CONFIG_VERSION_SIGNATURE="Ubuntu $(release)-$(revision)-$* $(raw_kernelversion)"/' > $(builddir)/build-$*/.config + [ "$(do_odm_drivers)" = 'true' ] && true || \ + sed -ie 's/.*CONFIG_UBUNTU_ODM_DRIVERS.*/# CONFIG_UBUNTU_ODM_DRIVERS is not set/' \ + $(builddir)/build-$*/.config find $(builddir)/build-$* -name "*.ko" | xargs rm -f $(build_cd) $(kmake) $(build_O) -j1 syncconfig prepare scripts touch $@ diff --git a/debian/scripts/misc/arch-has-odm-enabled.sh b/debian/scripts/misc/arch-has-odm-enabled.sh new file mode 100755 index 000000000000..7bc8a5db0db0 --- /dev/null +++ b/debian/scripts/misc/arch-has-odm-enabled.sh @@ -0,0 +1,21 @@ +#!/bin/sh +# Evaluate whether arch ($1) will be built with do_odm_drivers set to true. +set -e + +if [ "$1" = "" ]; then + return 1 +fi + +TOPDIR=$(dirname $0)/../../.. +. $TOPDIR/debian/debian.env +RULESDIR=$TOPDIR/$DEBIAN/rules.d + +do_odm_drivers=false +for f in $1.mk hooks.mk; do + eval $(cat $RULESDIR/$f | sed -n -e '/do_odm_drivers/s/ \+//gp') +done +if [ "$do_odm_drivers" != "true" ]; then + return 1 +fi + +return 0 diff --git a/debian/scripts/misc/kernelconfig b/debian/scripts/misc/kernelconfig index 888cc892d936..f95396e28f28 100755 --- a/debian/scripts/misc/kernelconfig +++ b/debian/scripts/misc/kernelconfig @@ -68,7 +68,7 @@ for arch in $archs; do # for i386 since it is no longer supported after 19.04, however # we maintain the configs for hwe. modify_config=true - env="ARCH=$kernarch" + env="ARCH=$kernarch DEB_ARCH=$arch" compiler_path=$(which "${cross_compile}gcc" || true) if [ "$compiler_path" != '' ]; then env="$env CROSS_COMPILE=$cross_compile" diff --git a/ubuntu/Kconfig b/ubuntu/Kconfig index 5056671223bb..5575ce574577 100644 --- a/ubuntu/Kconfig +++ b/ubuntu/Kconfig @@ -1,5 +1,11 @@ menu "Ubuntu Supplied Third-Party Device Drivers" + +config UBUNTU_ODM_DRIVERS + def_bool $(success,$(srctree)/debian/scripts/misc/arch-has-odm-enabled.sh $(DEB_ARCH)) + ---help--- + Turn on support for Ubuntu ODM supplied drivers + # # NOTE: to allow drivers to be added and removed without causing merge # collisions you should add new entries in the middle of the six lines From patchwork Fri Jun 11 10:01:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AceLan Kao X-Patchwork-Id: 1490872 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=m9gpPds8; 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 4G1bwZ1QBYz9sSn; Fri, 11 Jun 2021 20:01:50 +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 1lrdz0-0000Aj-OY; Fri, 11 Jun 2021 10:01:46 +0000 Received: from mail-pg1-f172.google.com ([209.85.215.172]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lrdyy-00009J-G9 for kernel-team@lists.ubuntu.com; Fri, 11 Jun 2021 10:01:44 +0000 Received: by mail-pg1-f172.google.com with SMTP id e20so2079861pgg.0 for ; Fri, 11 Jun 2021 03:01:44 -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=BhZ9rYW9kCQ7mBzIxk1Eg7/LyE9229G2IPrL80dN85s=; b=m9gpPds8Rimf2q8sHCQoksRT5jfyma6m6CJ1t5Eqeok6uqowM5uf0awCpqtsgbmYMF OGwFy6piJwSBoVF1Y074/S/hG3B6IqYTu9VBuzXTpxd1g/r0wYx+23uTUdLDlm9lhogS TyTN/iMK7uBZyENVlMRpa/03yywkRyVKs/54+GaNqILMK2KifvzwrUtzQijlCpMiL7wc kO2r2wcqcnFo1oV3Q3vZSF3+upqxK8dp2mnz0GJbms+v4e+Qc21h/vT2WAwQThd0jWHH DYoArFH5mX2/C9BtgattKxy93lSyrhQHd0BWx7qlQ/xjZpUNDz6wMnEdMApmmTuDUE+9 taow== 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=BhZ9rYW9kCQ7mBzIxk1Eg7/LyE9229G2IPrL80dN85s=; b=aHdA+cYHoYCyjhOqc9BKt0MO1qBsUGEjoIMGgiXC5hP5vEHcCmLFoMU36Eb0oNhCb0 P/lhD+Hzexrb3u1WkphkCUG4k2yvwLnD63dgPn4LiIgkG8nSkiO7WWDrK7iMJTWms8RD rR6Hff1XPOLJM9ri5ZGxJR9DMyiEKks4AYQswTv5bvrn/8yCuBFuMTXrE4Ggru35zwPt QbM3X7B2jMLGjbmXmRupUJiTEZA1SSowVtX8adh6+6gCFkcYZTBm+2YApqJ6OGg5/MaC uj2XOlLhmLl7ZNu/R2/OSxLAj2slE0D6ThQ6exbw4cX0cpJXa7tlMZkw/fog9fqUnz3l eAzw== X-Gm-Message-State: AOAM5320nclgMykGlE8SfTgw+A7+2U/nSWVy76TGvsWYOLPpCE052hhz XLHDcQBtZfG7wuZ14LG/SK6y1R11mXjAMg== X-Google-Smtp-Source: ABdhPJwUzNatiXViYgRG4d5eAfDIdRkw5MVHlMvjFNXL6k3tID7AucOxJxKsZ4rY6ekE9CpKOp24KQ== X-Received: by 2002:a63:7945:: with SMTP id u66mr2766742pgc.200.1623405700358; Fri, 11 Jun 2021 03:01:40 -0700 (PDT) Received: from localhost (220-135-95-34.HINET-IP.hinet.net. [220.135.95.34]) by smtp.gmail.com with ESMTPSA id w206sm4719328pff.1.2021.06.11.03.01.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Jun 2021 03:01:39 -0700 (PDT) From: AceLan Kao To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/4][SRU][H] UBUNTU: [Packaging] Turn on ODM support for amd64 Date: Fri, 11 Jun 2021 18:01:25 +0800 Message-Id: <20210611100131.15133-3-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.172; envelope-from=acelan@gmail.com; helo=mail-pg1-f172.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/1912789 Now there is the support in place let us turn this on for amd64. This is added as enabled generally in the config because otherwise updating the config for drivers depending on it would not work. It is changed at build time for arches which have not enabled it. Also it will automatically go away for backports. Signed-off-by: Stefan Bader Acked-by: Marcelo Henrique Cerri Acked-by: Andy Whitcroft Signed-off-by: Kelsey Skunberg (backported from commit 4aeffc246531a666c1fad1925ebf1a6e68a704e4 focal) Signed-off-by: Chia-Lin Kao (AceLan) --- debian.master/config/config.common.ubuntu | 1 + debian.master/rules.d/amd64.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 19f44f82748a..7937c0b8cdef 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -11032,6 +11032,7 @@ CONFIG_UBIFS_FS_ZLIB=y CONFIG_UBIFS_FS_ZSTD=y # CONFIG_UBSAN is not set CONFIG_UBUNTU_HOST=m +CONFIG_UBUNTU_ODM_DRIVERS=y CONFIG_UCB1400_CORE=m CONFIG_UCC=y CONFIG_UCC_FAST=y diff --git a/debian.master/rules.d/amd64.mk b/debian.master/rules.d/amd64.mk index 5c039a8da72c..9794ca84df21 100644 --- a/debian.master/rules.d/amd64.mk +++ b/debian.master/rules.d/amd64.mk @@ -21,3 +21,4 @@ do_extras_package = true do_tools_common = true do_tools_acpidbg = true do_zfs = true +do_odm_drivers = true 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 From patchwork Fri Jun 11 10:01:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AceLan Kao X-Patchwork-Id: 1490874 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=HlXOySyx; 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 4G1bwh06RXz9sSn; Fri, 11 Jun 2021 20:01:56 +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 1lrdz6-0000Eo-GG; Fri, 11 Jun 2021 10:01:52 +0000 Received: from mail-pf1-f169.google.com ([209.85.210.169]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lrdz3-0000C0-Tb for kernel-team@lists.ubuntu.com; Fri, 11 Jun 2021 10:01:50 +0000 Received: by mail-pf1-f169.google.com with SMTP id u18so4023463pfk.11 for ; Fri, 11 Jun 2021 03:01:49 -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=zH6CwvyTk38B5uGjRAk20TLwxuErSjNs9R88jokm4aA=; b=HlXOySyxZEX8e0/EPiWFIb4g3KIaznThKhim9yFJHwCSTI8JvMtU2Bt9NNuIqOs9Sx mT4lR6bYw4zVpZ8FljZhFwa6d3ibjC5xFXK6MUu5ifPfC3J8F3nkuqD2odRnuUzMOVZa OMlJXEWmySbS5jObuQpw2SrGpXuUGc8wrfIx4HwhggM4zRjM5SJts6zHp4FhpkIdbcok Uc1WFby0MSIS2AjvvNC8h0wGHg3wIVK0BHjxCQcpSSo3mgRq8Ax+/sBVEzJkOKBhP+PH 693WLkt3aKok10BXMfB2cXEuThz3li83rBIwWypfuCIPVTaHW4iTcjuw9Us43rS9I1aw Z/FQ== 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=zH6CwvyTk38B5uGjRAk20TLwxuErSjNs9R88jokm4aA=; b=lPBNca6heu/mV/C2lqcPSC23w3W9NWow0BqetzAwrNiG4niFnuyDfk3BZ/0OdYG+Pc nc2ceEZ8hVv0O4pTdrgE4KUtVTs8e8drnhHoDuxTDmm0S3PJItGt0LGrZ+SCIZ+V241x ZSVNB7f9z6RpVzj2ZJvLjn1CvTuBt5U84JtTXlvrcGexqO2vZ4jc6wPKtu9U2Bdy9Cc1 ovhTnS7rSiFvrNy+peXoyrZOg+wVoFLpnUUJy/YSNYptPuSVoCMyMz9j/idmmYLGsmy8 Cr318WIewra6ltyrLiIoerT6D4JaAzVG6ukZBSuP98/0d4toKfM8zmmqh7pJlfVykLF/ HkAQ== X-Gm-Message-State: AOAM5300oqtnmJrs7wEbGVhqpatk+yJmPh7fStV6xd3VeUVQEMFvkSpd pudyHtK3jZTCWOOv5zWPSpz/bEQUrn88Ag== X-Google-Smtp-Source: ABdhPJxVcNjSyQPCMVBIi4z0jpzMonZAh3Bs+kL0pxPG7JrarxLakNTRpKK3H2Nu+BXa0gry6UcoEw== X-Received: by 2002:a63:30d:: with SMTP id 13mr2803319pgd.204.1623405707000; Fri, 11 Jun 2021 03:01:47 -0700 (PDT) Received: from localhost (220-135-95-34.HINET-IP.hinet.net. [220.135.95.34]) by smtp.gmail.com with ESMTPSA id o10sm4567409pjr.2.2021.06.11.03.01.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Jun 2021 03:01:46 -0700 (PDT) From: AceLan Kao To: kernel-team@lists.ubuntu.com Subject: [PATCH 4/4][SRU][H] UBUNTU: [Packaging] Fix ODM DRIVERS Kconfig Date: Fri, 11 Jun 2021 18:01:27 +0800 Message-Id: <20210611100131.15133-5-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.210.169; envelope-from=acelan@gmail.com; helo=mail-pf1-f169.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: "Chia-Lin Kao (AceLan)" BugLink: https://bugs.launchpad.net/bugs/1912789 Encounted below errors, prefer 'help' over '---help---' for new help texts ubuntu/Kconfig:7: syntax error ubuntu/Kconfig:6: unknown statement "---help---" ubuntu/Kconfig:7: unknown statement "Turn" Signed-off-by: Chia-Lin Kao (AceLan) --- ubuntu/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu/Kconfig b/ubuntu/Kconfig index 5575ce574577..110b7122dc97 100644 --- a/ubuntu/Kconfig +++ b/ubuntu/Kconfig @@ -3,7 +3,7 @@ menu "Ubuntu Supplied Third-Party Device Drivers" config UBUNTU_ODM_DRIVERS def_bool $(success,$(srctree)/debian/scripts/misc/arch-has-odm-enabled.sh $(DEB_ARCH)) - ---help--- + help Turn on support for Ubuntu ODM supplied drivers #