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