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) {