From patchwork Thu Feb 28 16:15:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Henrique Cerri X-Patchwork-Id: 1049610 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) 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; dmarc=fail (p=none dis=none) header.from=canonical.com 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 449JL63S53z9s1b; Fri, 1 Mar 2019 03:44:30 +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 1gzOLC-0001AO-1a; Thu, 28 Feb 2019 16:15:22 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1gzOLA-00019R-Ih for kernel-team@lists.ubuntu.com; Thu, 28 Feb 2019 16:15:20 +0000 Received: from mail-qk1-f200.google.com ([209.85.222.200]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1gzOLA-00009Y-8m for kernel-team@lists.ubuntu.com; Thu, 28 Feb 2019 16:15:20 +0000 Received: by mail-qk1-f200.google.com with SMTP id y6so16437294qke.1 for ; Thu, 28 Feb 2019 08:15:20 -0800 (PST) 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; bh=MpIHbKltJJKJLpVM7+ebC3T3QiSduPdWgVyHmOsVIcM=; b=B9v6AJSPMcYoi3jfy2H8+R4TBFErwrXAGtPu1NEqG7f30ogKEG4a9U5GXNSNoMR8Qg 9FsM6PeHjvHA7bEtlU/mfc7d6FUpGjqEYZggg3Xse3cqFMHJIX+NXFrbGirzK9nCOUXQ offN16PnEW/Sjd6cIEjv3c16QzZD0kaAnBXAAAzZV2x2qN6Ol1GI9iUxyxsxtioBQL4G eIhhoG8162TVwVLkVdiG6LXiBecmE8yEMWxYdEXgrAMxSaIUiBkbf3WFDqAMisETeuxY fkZoM355HF87cD4eODEKuNDTsdLZB+oDKXzyt2kyCuGVetau7sjDku7JDqqWgF7qre2Z FlFg== X-Gm-Message-State: APjAAAWc6tJeepwcmEZ4yocGrI0wd+Tg46xO9JXkbcbQXvxcVbghA6eq zaejRh9V3RJgRoGXSJiTxlf3pfLu+NdjoAMNqtWc8TH7/psUa9W9GYl/zPpFRyUgdulezAXZPWC Tq3A7n21/66I4+h/fCNvrUaM2B+yUPXfqRTn7v5gV X-Received: by 2002:ac8:2b34:: with SMTP id 49mr60203qtu.32.1551370518732; Thu, 28 Feb 2019 08:15:18 -0800 (PST) X-Google-Smtp-Source: APXvYqxGFJ84YDIIgYnpmIXtiDWnV86E9q5gCN4cNSv8ExFdd4Y8QDXUOprFxJYmb7p/6PYGpK4Kww== X-Received: by 2002:ac8:2b34:: with SMTP id 49mr60188qtu.32.1551370518419; Thu, 28 Feb 2019 08:15:18 -0800 (PST) Received: from gallifrey.lan ([2804:14c:4e3:4a76:8437:8a5d:504f:a207]) by smtp.gmail.com with ESMTPSA id t38sm15783339qtc.12.2019.02.28.08.15.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Feb 2019 08:15:17 -0800 (PST) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [bionic/linux-gcp][PATCH 1/5] Revert "UBUNTU: [Packaging] config-check: allow overlay annotations files" Date: Thu, 28 Feb 2019 13:15:07 -0300 Message-Id: <20190228161511.22659-2-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190228161511.22659-1-marcelo.cerri@canonical.com> References: <20190228161511.22659-1-marcelo.cerri@canonical.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: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: http://bugs.launchpad.net/bugs/1752072 This reverts commit 680157d558f254645f81e417cf905a14b309ba75. Signed-off-by: Marcelo Henrique Cerri --- debian/scripts/config-check | 45 +++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/debian/scripts/config-check b/debian/scripts/config-check index 9caf1e85db93..224be080514a 100755 --- a/debian/scripts/config-check +++ b/debian/scripts/config-check @@ -41,38 +41,33 @@ close(CONFIG); # ANNOTATIONS: check any annotations marked for enforcement my $pass = 0; my $total = 0; +my $annotations = "$commonconfig/annotations"; my ($config, $value, $options, $option, $value, $check, $policy); - +print "$P: $annotations loading annotations\n"; my %annot; -my @annotations_list = ("$commonconfig/annotations", glob("$commonconfig/*.annotations")); -for my $annotations (@annotations_list) { - print "$P: $annotations loading annotations\n"; - my %current_annot; - my $form = 1; - open(ANNOTATIONS, "<$annotations") || die "$P: $annotations: open failed -- $! -- aborting\n"; - while () { - if (/^# FORMAT: (\S+)/) { - die "$P: $1: unknown annotations format\n" if ($1 != 2); - $form = $1; - } - - /^#/ && next; - chomp; - /^$/ && next; +my $form = 1; +open(ANNOTATIONS, "<$annotations") || die "$P: $annotations: open failed -- $! -- aborting\n"; +while () { + if (/^# FORMAT: (\S+)/) { + die "$P: $1: unknown annotations format\n" if ($1 != 2); + $form = $1; + } - /^CONFIG_/ || next; + /^#/ && next; + chomp; + /^$/ && next; - if ($form == 1) { - ($config, $value, $options) = split(' ', $_, 3); - } elsif ($form == 2) { - ($config, $options) = split(' ', $_, 2); - } + /^CONFIG_/ || next; - $current_annot{$config} = $current_annot{$config} . ' ' . $options; + if ($form == 1) { + ($config, $value, $options) = split(' ', $_, 3); + } elsif ($form == 2) { + ($config, $options) = split(' ', $_, 2); } - close(ANNOTATIONS); - %annot = ( %annot, %current_annot ); + + $annot{$config} = $annot{$config} . ' ' . $options; } +close(ANNOTATIONS); my $config; for $config (keys %annot) { From patchwork Thu Feb 28 16:15:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Henrique Cerri X-Patchwork-Id: 1049607 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) 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; dmarc=fail (p=none dis=none) header.from=canonical.com 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 449JGS4dZxz9s47; Fri, 1 Mar 2019 03:41:18 +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 1gzOLE-0001BW-90; Thu, 28 Feb 2019 16:15:24 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1gzOLC-0001An-Rb for kernel-team@lists.ubuntu.com; Thu, 28 Feb 2019 16:15:22 +0000 Received: from mail-qk1-f197.google.com ([209.85.222.197]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1gzOLC-00009h-BS for kernel-team@lists.ubuntu.com; Thu, 28 Feb 2019 16:15:22 +0000 Received: by mail-qk1-f197.google.com with SMTP id y6so16437397qke.1 for ; Thu, 28 Feb 2019 08:15:22 -0800 (PST) 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; bh=ERt+5OzPJq0y2f3zxl8CQMj3dc37RzBiAz9ZgtEN/K8=; b=FxV/deNWi4hhufykhiMzGihHtZ8pOfi7nrQMBEKwv8JAgfS99hCUWrTtqgn3QRHp67 wCEF/SFwU3y3D9YrJKEphg1UVeV4vce9jlgcKdBW7BOEj9hOtRB8/vw+eMyRDaLOLSA8 vo68w6dfNH4Xzpwgk4x+0fTBIFafCMqekFy2HVWOLAFVhzYBbFVJJZrRYM7gGp01Ns5V BvaNqHcY/GnT+3lvVL553NMkQmYka3KsDzMFldSW6A1/99J5kS9eO7jBIxApGOsBds2E RiXnbjhT2AyPb37an0ykrdxWhtfgBgDbnGLTZ36WVwoI7ZX7xQw/bVpI15xpTxnNtnCK GZPQ== X-Gm-Message-State: APjAAAXvYxn3n28agW+q8qdnyBfp6IGVCDcqrOhvxSxJ8eJEL4uDA0gV 6nPh3enNHZq3RBjAbbMcr/yZcbvXqsp0hBthbtkkG81ByaRqo6vDosAw6es3cz/KP7wM1TVA0zd L77WPFr/A1XhbUNrB8hqivMIS9dkWinuk4OBlafMU X-Received: by 2002:ac8:354c:: with SMTP id z12mr44893qtb.92.1551370520879; Thu, 28 Feb 2019 08:15:20 -0800 (PST) X-Google-Smtp-Source: APXvYqzC73Js7LTOCpQ98D+gLKhiMn9eem1TjIQsjjFMfI+q4VDwC4WUeuPcRjBqYsI40GGmCKGayw== X-Received: by 2002:ac8:354c:: with SMTP id z12mr44873qtb.92.1551370520570; Thu, 28 Feb 2019 08:15:20 -0800 (PST) Received: from gallifrey.lan ([2804:14c:4e3:4a76:8437:8a5d:504f:a207]) by smtp.gmail.com with ESMTPSA id t38sm15783339qtc.12.2019.02.28.08.15.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Feb 2019 08:15:19 -0800 (PST) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [bionic/linux-gcp][PATCH 2/5] UBUNTU: [Packaging] config-check: Add an include directive Date: Thu, 28 Feb 2019 13:15:08 -0300 Message-Id: <20190228161511.22659-3-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190228161511.22659-1-marcelo.cerri@canonical.com> References: <20190228161511.22659-1-marcelo.cerri@canonical.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: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: http://bugs.launchpad.net/bugs/1752072 Update the config-check script to support a new include directive, that can be used to override annotations from another file. For instance, with this change a custom kernel can include the annotation file from "debian.master/" and override some of it policies. The directive is only available when using the file format 3, that extends format 2. The new directive follows the systax: include FILEPATH Quotes are also accepted: include "FILEPATH" `FILENAME` is always relative to the current annotations file location. So, assuming a custom kernel, the following directive will include the annotations file from the generic kernel: include "../../debian.master/config/annotations" To avoid mistakes, any reference to a config in the base annotations file AFTER the include directive will completely override the references from the included file. For instance, the following: # FORMAT: 3 include "../../debian.master/config/annotations" CONFIG_X note Will cause any line related to CONFIG_X in the included annotations file to be ignored. The patch also includes smalls changes to avoid warning due to duplicate variable declarations. Signed-off-by: Marcelo Henrique Cerri --- debian/scripts/config-check | 80 +++++++++++++++++++++++++++---------- 1 file changed, 59 insertions(+), 21 deletions(-) diff --git a/debian/scripts/config-check b/debian/scripts/config-check index 224be080514a..843f5999006b 100755 --- a/debian/scripts/config-check +++ b/debian/scripts/config-check @@ -3,6 +3,8 @@ # check-config -- check the current config for issues # use strict; +use File::Basename; +use File::Spec; my $P = 'check-config'; @@ -13,7 +15,7 @@ if ($ARGV[0] eq '--test') { die "Usage: $P \n"; } -my ($config, $arch, $flavour, $commonconfig, $warn_only) = @ARGV; +my ($configfile, $arch, $flavour, $commonconfig, $warn_only) = @ARGV; my %values = (); @@ -25,8 +27,8 @@ $fail_exit = 0 if ($warn_only eq 'true' || $warn_only eq '1'); my $exit_val = 0; # Load up the current configuration values -- FATAL if this fails -print "$P: $config: loading config\n"; -open(CONFIG, "<$config") || die "$P: $config: open failed -- $! -- aborting\n"; +print "$P: $configfile: loading config\n"; +open(CONFIG, "<$configfile") || die "$P: $configfile: open failed -- $! -- aborting\n"; while () { # Pull out values. /^#*\s*(CONFIG_\w+)[\s=](.*)$/ or next; @@ -38,38 +40,74 @@ while () { } close(CONFIG); -# ANNOTATIONS: check any annotations marked for enforcement -my $pass = 0; -my $total = 0; -my $annotations = "$commonconfig/annotations"; -my ($config, $value, $options, $option, $value, $check, $policy); -print "$P: $annotations loading annotations\n"; -my %annot; -my $form = 1; -open(ANNOTATIONS, "<$annotations") || die "$P: $annotations: open failed -- $! -- aborting\n"; -while () { +sub read_annotations { + my ($filename) = @_; + my %annot; + my $form = 1; + my ($config, $value, $options); + + # Keep track of the configs that shouldn't be appended because + # they were include_annot from another annotations file. + # That's a hash of undefs, aka a set. + my %noappend; + + print "$P: $filename loading annotations\n"; + open(my $fd, "<$filename") || + die "$P: $filename: open failed -- $! -- aborting\n"; + while (<$fd>) { if (/^# FORMAT: (\S+)/) { - die "$P: $1: unknown annotations format\n" if ($1 != 2); - $form = $1; + die "$P: $1: unknown annotations format\n" if ($1 != 2 && $1 != 3); + $form = $1; + } + + # Format #3 adds the include directive on top of format #2: + if ($form == 3 && /^\s*include(\s|$)/) { + # Include quoted or unquoted files: + if (/^\s*include\s+"(.*)"\s*$/ || /^\s*include\s+(.*)$/) { + # The include is relative to the current file + my $include_filename = File::Spec->join(dirname($filename), $1); + # Append the include files + my %include_annot = read_annotations($include_filename); + %annot = ( %annot, %include_annot ); + # And marked them to not be appended: + my %included_noappend; + # Discard the values and keep only the keys + @included_noappend{keys %include_annot} = (); + %noappend = ( %noappend, %included_noappend ); + next; + } else { + die "$P: Invalid include: $_"; + } } /^#/ && next; chomp; /^$/ && next; - /^CONFIG_/ || next; if ($form == 1) { - ($config, $value, $options) = split(' ', $_, 3); - } elsif ($form == 2) { - ($config, $options) = split(' ', $_, 2); + ($config, $value, $options) = split(' ', $_, 3); + } elsif ($form >= 2) { + ($config, $options) = split(' ', $_, 2); } + if (exists $noappend{$config}) { + delete $annot{$config}; + delete $noappend{$config}; + } $annot{$config} = $annot{$config} . ' ' . $options; + } + close($fd); + return %annot; } -close(ANNOTATIONS); -my $config; +# ANNOTATIONS: check any annotations marked for enforcement +my $annotations = "$commonconfig/annotations"; +my %annot = read_annotations($annotations); + +my $pass = 0; +my $total = 0; +my ($config, $value, $options, $option, $check, $policy); for $config (keys %annot) { $check = 0; $options = $annot{$config}; From patchwork Thu Feb 28 16:15:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Henrique Cerri X-Patchwork-Id: 1049612 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) 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; dmarc=fail (p=none dis=none) header.from=canonical.com 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 449JMy23Zkz9s47; Fri, 1 Mar 2019 03:46:06 +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 1gzOLG-0001Cq-Jn; Thu, 28 Feb 2019 16:15:26 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1gzOLE-0001Bp-QG for kernel-team@lists.ubuntu.com; Thu, 28 Feb 2019 16:15:24 +0000 Received: from mail-qt1-f199.google.com ([209.85.160.199]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1gzOLE-00009o-BX for kernel-team@lists.ubuntu.com; Thu, 28 Feb 2019 16:15:24 +0000 Received: by mail-qt1-f199.google.com with SMTP id m37so18882473qte.10 for ; Thu, 28 Feb 2019 08:15:24 -0800 (PST) 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; bh=lQUpxPiCbtTKEZn01PFSy1Ryq1ErVsTHdA0YgAhNdwM=; b=ZJNitT6Cz7HLnym2I2TUZp46WlnXPgYIez9IUM4ehWAMO37EWmEmLn2+sJwCYUDurH 1nAG2OPkJ6Ql9JduQyl08xlykFljQ72xSYEDwriaqQfV8bvFJSFiAUE52YdhohHcHfGf UurdQ7HPSeyvOGq3muwhtFeWOl4ZSzkS7Y5sJu/40MQot4DD931ESeWdRprQPJNdJHwg jrjOHpsZuFdrUNiUEkj4wWUfTTc80QjWPmbz2lqTYPLyut01FzRjUNNpo/yP642GuwFf W9T0e/nXABqCi9+h+qfFMo/77bDtleQdAn6ABuWqlRA1ttHnGVf17Mo9cfORwN73JiVP A8yg== X-Gm-Message-State: AHQUAuYO8lBQI56M5cEhLdHPJd0dYm5g538hdcJhbJpwX59D+5idzDFL g08ZkQ3m3aRCZiKFmldWGq10SHaYhYxx1YLsh1Cg/DOQzGpp9468qFzB076FIZpP9SEjk5qok3p QvMVYNEvz+gmvoVu9BLkRwNZu3K0APdentvGQ3AkL X-Received: by 2002:ac8:1b6b:: with SMTP id p40mr6638680qtk.155.1551370523060; Thu, 28 Feb 2019 08:15:23 -0800 (PST) X-Google-Smtp-Source: AHgI3IZ1aX7f5Mty2adPZkSlKKXr2tcansIRr1nW75y8FP1reBbHyDXPT+2O/qDECANvYdtiZij9VA== X-Received: by 2002:ac8:1b6b:: with SMTP id p40mr6638647qtk.155.1551370522721; Thu, 28 Feb 2019 08:15:22 -0800 (PST) Received: from gallifrey.lan ([2804:14c:4e3:4a76:8437:8a5d:504f:a207]) by smtp.gmail.com with ESMTPSA id t38sm15783339qtc.12.2019.02.28.08.15.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Feb 2019 08:15:21 -0800 (PST) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [bionic/linux-gcp][PATCH 3/5] UBUNTU: [Config] linux-gcp: Replace annotations symlink with overlay Date: Thu, 28 Feb 2019 13:15:09 -0300 Message-Id: <20190228161511.22659-4-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190228161511.22659-1-marcelo.cerri@canonical.com> References: <20190228161511.22659-1-marcelo.cerri@canonical.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: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: http://bugs.launchpad.net/bugs/1752072 Discard the symlink to the master kernel annotations file and replace it with the overlay file. Signed-off-by: Marcelo Henrique Cerri --- debian.gcp/config/annotations | 44 ++++++++++++++++++++++++++- debian.gcp/config/overlay.annotations | 43 -------------------------- debian.gcp/reconstruct | 1 - debian/source/options | 1 - 4 files changed, 43 insertions(+), 46 deletions(-) mode change 120000 => 100644 debian.gcp/config/annotations delete mode 100644 debian.gcp/config/overlay.annotations diff --git a/debian.gcp/config/annotations b/debian.gcp/config/annotations deleted file mode 120000 index 770f90ce2847..000000000000 --- a/debian.gcp/config/annotations +++ /dev/null @@ -1 +0,0 @@ -../../debian.master/config/annotations \ No newline at end of file diff --git a/debian.gcp/config/annotations b/debian.gcp/config/annotations new file mode 100644 index 000000000000..6bbd2cbc22f5 --- /dev/null +++ b/debian.gcp/config/annotations @@ -0,0 +1,43 @@ +# Menu: HEADER +# FORMAT: 2 +# ARCH: x86 + +# Menu: Device Drivers >> PTP clock support +CONFIG_DP83640_PHY policy<{'amd64': 'n'}> +# + +# Menu: Device Drivers >> SCSI device support >> SCSI device support >> SCSI low-level drivers +CONFIG_SCSI_VIRTIO policy<{'amd64': 'y'}> +# +CONFIG_SCSI_VIRTIO note + +# Menu: Kernel hacking +CONFIG_PANIC_ON_OOPS policy<{'amd64': 'y'}> +# +CONFIG_PANIC_ON_OOPS note + +# Menu: Kernel hacking >> Debug Lockups and Hangs +CONFIG_BOOTPARAM_HARDLOCKUP_PANIC policy<{'amd64': 'y'}> +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC policy<{'amd64': 'y'}> +# + +# Menu: Networking support >> Networking options +CONFIG_NETWORK_PHY_TIMESTAMPING policy<{'amd64': 'n'}> +# + +# Menu: Networking support >> Networking options >> Network packet filtering framework (Netfilter) >> Core Netfilter Configuration +CONFIG_NETFILTER_NETLINK_QUEUE policy<{'amd64': 'y'}> +CONFIG_NETFILTER_NETLINK_LOG policy<{'amd64': 'y'}> +# + +# Menu: Networking support >> Networking options >> Network packet filtering framework (Netfilter) >> Core Netfilter Configuration >> Netfilter connection tracking support +CONFIG_NF_CONNTRACK policy<{'amd64': 'y'}> +CONFIG_NF_CONNTRACK_PROCFS policy<{'amd64': 'y'}> +CONFIG_NF_CT_NETLINK policy<{'amd64': 'y'}> +# +CONFIG_NF_CONNTRACK_PROCFS flag + +# Menu: Device Drivers >> Block devices +CONFIG_BLK_DEV_FD policy<{'amd64': 'n'}> +CONFIG_BLK_DEV_FD note + diff --git a/debian.gcp/config/overlay.annotations b/debian.gcp/config/overlay.annotations deleted file mode 100644 index 6bbd2cbc22f5..000000000000 --- a/debian.gcp/config/overlay.annotations +++ /dev/null @@ -1,43 +0,0 @@ -# Menu: HEADER -# FORMAT: 2 -# ARCH: x86 - -# Menu: Device Drivers >> PTP clock support -CONFIG_DP83640_PHY policy<{'amd64': 'n'}> -# - -# Menu: Device Drivers >> SCSI device support >> SCSI device support >> SCSI low-level drivers -CONFIG_SCSI_VIRTIO policy<{'amd64': 'y'}> -# -CONFIG_SCSI_VIRTIO note - -# Menu: Kernel hacking -CONFIG_PANIC_ON_OOPS policy<{'amd64': 'y'}> -# -CONFIG_PANIC_ON_OOPS note - -# Menu: Kernel hacking >> Debug Lockups and Hangs -CONFIG_BOOTPARAM_HARDLOCKUP_PANIC policy<{'amd64': 'y'}> -CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC policy<{'amd64': 'y'}> -# - -# Menu: Networking support >> Networking options -CONFIG_NETWORK_PHY_TIMESTAMPING policy<{'amd64': 'n'}> -# - -# Menu: Networking support >> Networking options >> Network packet filtering framework (Netfilter) >> Core Netfilter Configuration -CONFIG_NETFILTER_NETLINK_QUEUE policy<{'amd64': 'y'}> -CONFIG_NETFILTER_NETLINK_LOG policy<{'amd64': 'y'}> -# - -# Menu: Networking support >> Networking options >> Network packet filtering framework (Netfilter) >> Core Netfilter Configuration >> Netfilter connection tracking support -CONFIG_NF_CONNTRACK policy<{'amd64': 'y'}> -CONFIG_NF_CONNTRACK_PROCFS policy<{'amd64': 'y'}> -CONFIG_NF_CT_NETLINK policy<{'amd64': 'y'}> -# -CONFIG_NF_CONNTRACK_PROCFS flag - -# Menu: Device Drivers >> Block devices -CONFIG_BLK_DEV_FD policy<{'amd64': 'n'}> -CONFIG_BLK_DEV_FD note - diff --git a/debian.gcp/reconstruct b/debian.gcp/reconstruct index 3dedeff74be5..d460c13a6b85 100644 --- a/debian.gcp/reconstruct +++ b/debian.gcp/reconstruct @@ -1,5 +1,4 @@ # Recreate any symlinks created since the orig. -[ ! -L 'debian.gcp/config/annotations' ] && ln -sf '../../debian.master/config/annotations' 'debian.gcp/config/annotations' # Remove any files deleted from the orig. rm -f 'Documentation/devicetree/bindings/display/panel/toppoly,td028ttec1.txt' rm -f 'arch/arm/include/asm/kvm_psci.h' diff --git a/debian/source/options b/debian/source/options index 0bfba2c30c0c..b29684e49275 100644 --- a/debian/source/options +++ b/debian/source/options @@ -1,7 +1,6 @@ # Ignore vbox symlinks, we will regenerate these at clean (LP:1426113) ## autoreconstruct -- begin # Ignore any symlinks created since the orig which are rebuilt by reconstruct. -extend-diff-ignore=^debian.gcp/config/annotations$ ## autoreconstruct -- end # force "dpkg-source -I -i" behavior From patchwork Thu Feb 28 16:15:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Henrique Cerri X-Patchwork-Id: 1049609 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) 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; dmarc=fail (p=none dis=none) header.from=canonical.com 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 449JKy4Wryz9s1b; Fri, 1 Mar 2019 03:44:22 +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 1gzOLL-0001Fx-0d; Thu, 28 Feb 2019 16:15:31 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1gzOLI-0001ES-Ob for kernel-team@lists.ubuntu.com; Thu, 28 Feb 2019 16:15:28 +0000 Received: from mail-qk1-f199.google.com ([209.85.222.199]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1gzOLI-0000A5-Da for kernel-team@lists.ubuntu.com; Thu, 28 Feb 2019 16:15:28 +0000 Received: by mail-qk1-f199.google.com with SMTP id v67so16138336qkl.22 for ; Thu, 28 Feb 2019 08:15:28 -0800 (PST) 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; bh=uJ+gvkcsJe5DGlZRU1A9tVSBA6jedkVdblZ+hXmRjoY=; b=hiKThsw1d/oxpEeM8GFsuw2sRrInVkY6wg75acrGwLRaUniz1oorPTyHNvQF4I/l4k +YEmzfI2HSEi7XcLdxy26KpGOxJrut1NjB1MA1dBfD4qrOYnfiF4UCtuBNoewICpqYCQ vTYGSglRM5uSL5zlWSXF/jDtq3PeduYTObr3EtCenahTrAzBypaNyO6QmMAZ0c6Cjmg/ aQMqToaH9WDiuvTIBA3bGbT3iY6o7IUjBY0F8FcyMiwiIH1h7BqSrlNezJcOKp26ZQHO DTmHMbZgkiIfQL4E4rCNCvbnGX6jvwNJXFZV3/lWsIlKsaytSZFCbdZlQ+InkKoIFaT8 Jcng== X-Gm-Message-State: APjAAAUEFU1PXYD8x4xm9ybFuzl83N4dkBTVuctO6F+OT/zvTarp1lGt jd06nAcDdULI52Yx8Ybm63ATbXJxJ+Z6i4wLxDmR7SWAOY6okWZ/ZYEDbNuIlvwmycq8eydN/tv PAyU2JNnYLJG0JM3UFlccJxg9EgHZy9Vh9ktE7DVK X-Received: by 2002:ac8:2782:: with SMTP id w2mr57983qtw.8.1551370526495; Thu, 28 Feb 2019 08:15:26 -0800 (PST) X-Google-Smtp-Source: APXvYqyE4Uo/ruo/lj+eLt240vgZOP949TViqALwOX26b1PDeckaEV2d697YDq3cqgzEBAEo174xZQ== X-Received: by 2002:ac8:2782:: with SMTP id w2mr57884qtw.8.1551370524974; Thu, 28 Feb 2019 08:15:24 -0800 (PST) Received: from gallifrey.lan ([2804:14c:4e3:4a76:8437:8a5d:504f:a207]) by smtp.gmail.com with ESMTPSA id t38sm15783339qtc.12.2019.02.28.08.15.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Feb 2019 08:15:24 -0800 (PST) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [bionic/linux-gcp][PATCH 4/5] UBUNTU: [Config] linux-gcp: Include master annotations to linux-gcp annotations Date: Thu, 28 Feb 2019 13:15:10 -0300 Message-Id: <20190228161511.22659-5-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190228161511.22659-1-marcelo.cerri@canonical.com> References: <20190228161511.22659-1-marcelo.cerri@canonical.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: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: http://bugs.launchpad.net/bugs/1752072 Use the new include directive to inherit and overwrite the master kernel annotations files. Signed-off-by: Marcelo Henrique Cerri --- debian.gcp/config/annotations | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian.gcp/config/annotations b/debian.gcp/config/annotations index 6bbd2cbc22f5..428807c9ec1e 100644 --- a/debian.gcp/config/annotations +++ b/debian.gcp/config/annotations @@ -1,7 +1,9 @@ # Menu: HEADER -# FORMAT: 2 +# FORMAT: 3 # ARCH: x86 +include "../../debian.master/config/annotations" + # Menu: Device Drivers >> PTP clock support CONFIG_DP83640_PHY policy<{'amd64': 'n'}> # From patchwork Thu Feb 28 16:15:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Henrique Cerri X-Patchwork-Id: 1049608 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) 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; dmarc=fail (p=none dis=none) header.from=canonical.com 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 449JKZ5rkFz9s1b; Fri, 1 Mar 2019 03:44:02 +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 1gzOLL-0001GK-Ac; Thu, 28 Feb 2019 16:15:31 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1gzOLJ-0001Er-8v for kernel-team@lists.ubuntu.com; Thu, 28 Feb 2019 16:15:29 +0000 Received: from mail-qk1-f197.google.com ([209.85.222.197]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1gzOLI-0000A9-VL for kernel-team@lists.ubuntu.com; Thu, 28 Feb 2019 16:15:29 +0000 Received: by mail-qk1-f197.google.com with SMTP id z123so2330256qka.20 for ; Thu, 28 Feb 2019 08:15:28 -0800 (PST) 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; bh=Yu5ASA/nVvlL98zPFkzNLbr8Qhx1l7HQfA6LA7S13fs=; b=cJJIlM/t1lFzFxjqE2yR3BdJFU1qvL7JuT+6ApCZY0cyBNsRF6v+G+GP/TV6qBPnta lwrMEugTbN6ylBHbvL6FNLFYLzZJ22kE5q+92NHWgrTmWL2oi1pmy25pG0P+taHK3RDl U3vCbpFcDxF5w0YiihLSkXnQjSEgaQqMp2DYllXH7Q2iRCQoW78mSHjE0N5urfUPqTSF oElEROoKfFkBsrno5xsZKaV9DnfFXYY5y7+fuL6hh9ao8XKheNHYt0EE26cTOGjPXMLZ hgq52Uf3NYWHmhASnyx/IP1Nf/7HBFjTGktkgMFIXWMzqBtC+WwFyWsW+vg5K1IO9oy+ iQEQ== X-Gm-Message-State: APjAAAWRClIHtU7GgUDP23kx6CkdpPi+W6pAcvz+iynoOHTPdMvIMmlo e5gy+zLNNtvbr/SUtrMUNnSH1feL3Z99blrAua4tNbJlc96WWjuhZviGj0sXYSEwNShc18rj0uo EB7J51H/v7p2ggw5qsLd6t2r9FTGl49qxYzdA8ZdL X-Received: by 2002:aed:21cb:: with SMTP id m11mr6692820qtc.257.1551370527676; Thu, 28 Feb 2019 08:15:27 -0800 (PST) X-Google-Smtp-Source: APXvYqytrfyjAGAmICJmQRu8bsFaY8a5175Ts+j4+RmOdbbpmloXTgE1lSepcOmBO5tSXo/04X918A== X-Received: by 2002:aed:21cb:: with SMTP id m11mr6692799qtc.257.1551370527387; Thu, 28 Feb 2019 08:15:27 -0800 (PST) Received: from gallifrey.lan ([2804:14c:4e3:4a76:8437:8a5d:504f:a207]) by smtp.gmail.com with ESMTPSA id t38sm15783339qtc.12.2019.02.28.08.15.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Feb 2019 08:15:26 -0800 (PST) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [bionic/linux-gcp][PATCH 5/5] UBUNTU: [Config] linux-gcp: Update annotations file Date: Thu, 28 Feb 2019 13:15:11 -0300 Message-Id: <20190228161511.22659-6-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190228161511.22659-1-marcelo.cerri@canonical.com> References: <20190228161511.22659-1-marcelo.cerri@canonical.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: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" http://bugs.launchpad.net/bugs/1752072 Based on the git log of linux-gcp, add any missing configuration change to the linux-gcp annotations file and update any necessary flag as well. The following commands were used to re-order the annotations file: fakeroot debian/rules clean kteam-tools/devel/devel-config-summary . test kteam-tools/devel/lib-config/devel-reorder-annotations . debian.gcp/config/annotations /tmp/annotations sed -i '/^# Menu/ { N; /^# Menu.*\n$/d }' /tmp/annotations git clear -dxf mv /tmp/annotations debian.gcp/config/annotations Signed-off-by: Marcelo Henrique Cerri --- debian.gcp/config/annotations | 53 ++++++++++++++++++++++++++++++----- 1 file changed, 46 insertions(+), 7 deletions(-) diff --git a/debian.gcp/config/annotations b/debian.gcp/config/annotations index 428807c9ec1e..7ec8b56a13e3 100644 --- a/debian.gcp/config/annotations +++ b/debian.gcp/config/annotations @@ -4,42 +4,81 @@ include "../../debian.master/config/annotations" -# Menu: Device Drivers >> PTP clock support +# Menu: Device Drivers >> Block devices +CONFIG_BLK_DEV_FD policy<{'amd64': 'n'}> +# +CONFIG_BLK_DEV_FD flag note + +# Menu: Device Drivers >> I2C support >> I2C support >> I2C Hardware Bus support +CONFIG_I2C_AMD_MP2 policy<{'amd64': 'n'}> +# +CONFIG_I2C_AMD_MP2 flag note + +# Menu: Device Drivers >> Network device support >> Wireless LAN >> Atheros/Qualcomm devices +CONFIG_WCN36XX_SNAPDRAGON_HACKS policy<{'amd64': 'n'}> +# +CONFIG_WCN36XX_SNAPDRAGON_HACKS flag note + +# Menu: Device Drivers >> PTP clock support >> PTP clock support CONFIG_DP83640_PHY policy<{'amd64': 'n'}> # +CONFIG_DP83640_PHY mark note note # Menu: Device Drivers >> SCSI device support >> SCSI device support >> SCSI low-level drivers CONFIG_SCSI_VIRTIO policy<{'amd64': 'y'}> # -CONFIG_SCSI_VIRTIO note +CONFIG_SCSI_VIRTIO flag note note + +# Menu: Device Drivers >> X86 Platform Specific Device Drivers +CONFIG_DELL_UART_BACKLIGHT policy<{'amd64': 'n'}> +CONFIG_DELL_SMBIOS_SMM policy<{'amd64': 'n'}> +# +CONFIG_DELL_UART_BACKLIGHT flag note +CONFIG_DELL_SMBIOS_SMM flag note # Menu: Kernel hacking CONFIG_PANIC_ON_OOPS policy<{'amd64': 'y'}> # -CONFIG_PANIC_ON_OOPS note +CONFIG_PANIC_ON_OOPS flag note note # Menu: Kernel hacking >> Debug Lockups and Hangs CONFIG_BOOTPARAM_HARDLOCKUP_PANIC policy<{'amd64': 'y'}> CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC policy<{'amd64': 'y'}> # +CONFIG_BOOTPARAM_HARDLOCKUP_PANIC flag note +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC flag note + +# Menu: Library routines +CONFIG_RAID6_PQ_DEFAULT_ALG policy<'amd64': 'avx2x4'> +CONFIG_RAID6_PQ_DEFAULT_ALG_BOOL policy<'amd64': 'y'> +# +CONFIG_RAID6_PQ_DEFAULT_ALG mark note +CONFIG_RAID6_PQ_DEFAULT_ALG_BOOL mark note + +# Menu: Networking support >> Bluetooth subsystem support >> Bluetooth device drivers +CONFIG_BT_QCOMSMD_HACK policy<{'amd64': 'n'}> +# +CONFIG_BT_QCOMSMD_HACK flag note # Menu: Networking support >> Networking options CONFIG_NETWORK_PHY_TIMESTAMPING policy<{'amd64': 'n'}> # +CONFIG_NETWORK_PHY_TIMESTAMPING flag note note # Menu: Networking support >> Networking options >> Network packet filtering framework (Netfilter) >> Core Netfilter Configuration CONFIG_NETFILTER_NETLINK_QUEUE policy<{'amd64': 'y'}> CONFIG_NETFILTER_NETLINK_LOG policy<{'amd64': 'y'}> # +CONFIG_NETFILTER_NETLINK_QUEUE flag note +CONFIG_NETFILTER_NETLINK_LOG flag note # Menu: Networking support >> Networking options >> Network packet filtering framework (Netfilter) >> Core Netfilter Configuration >> Netfilter connection tracking support CONFIG_NF_CONNTRACK policy<{'amd64': 'y'}> CONFIG_NF_CONNTRACK_PROCFS policy<{'amd64': 'y'}> CONFIG_NF_CT_NETLINK policy<{'amd64': 'y'}> # +CONFIG_NF_CONNTRACK flag note +CONFIG_NF_CONNTRACK_PROCFS flag note +CONFIG_NF_CT_NETLINK flag note CONFIG_NF_CONNTRACK_PROCFS flag -# Menu: Device Drivers >> Block devices -CONFIG_BLK_DEV_FD policy<{'amd64': 'n'}> -CONFIG_BLK_DEV_FD note -