[bionic/linux-gcp][PATCH 3/5] UBUNTU: [Config] linux-gcp: Replace annotations symlink with overlay

[Marcelo Henrique Cerri]

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 <marcelo.cerri at canonical.com>
---
 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<tech preview of new feature>
+
+# Menu: Kernel hacking
+CONFIG_PANIC_ON_OOPS                            policy<{'amd64': 'y'}>
+#
+CONFIG_PANIC_ON_OOPS                            note<keep working if at all possible>
+
+# 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<DEPRECATED>
+
+# Menu: Device Drivers >> Block devices
+CONFIG_BLK_DEV_FD                               policy<{'amd64': 'n'}>
+CONFIG_BLK_DEV_FD                               note<LP:1729673>
+
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<tech preview of new feature>
-
-# Menu: Kernel hacking
-CONFIG_PANIC_ON_OOPS                            policy<{'amd64': 'y'}>
-#
-CONFIG_PANIC_ON_OOPS                            note<keep working if at all possible>
-
-# 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<DEPRECATED>
-
-# Menu: Device Drivers >> Block devices
-CONFIG_BLK_DEV_FD                               policy<{'amd64': 'n'}>
-CONFIG_BLK_DEV_FD                               note<LP:1729673>
-
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
-- 
2.17.1