diff mbox series

[disco:linux-gcp,2/2] UBUNTU: [Config] Fix annotations file

Message ID 20191106185742.5835-5-marcelo.cerri@canonical.com
State New
Headers show
Series None | expand

Commit Message

Marcelo Henrique Cerri Nov. 6, 2019, 6:57 p.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/1851538

Replace ENFORCE with ENFORCED to ensure the config options checks are
not being ignored. Also update the corresponding config options back
to the desirable value.

Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>
---
 .../abi/5.0.0-1021.21/amd64/gcp.modules       |  1 -
 debian.gcp/config/annotations                 | 42 +++++++++----------
 debian.gcp/config/config.common.ubuntu        |  4 +-
 3 files changed, 24 insertions(+), 23 deletions(-)
diff mbox series

Patch

diff --git a/debian.gcp/abi/5.0.0-1021.21/amd64/gcp.modules b/debian.gcp/abi/5.0.0-1021.21/amd64/gcp.modules
index 97e6f14f9aa5..a6ea236301f1 100644
--- a/debian.gcp/abi/5.0.0-1021.21/amd64/gcp.modules
+++ b/debian.gcp/abi/5.0.0-1021.21/amd64/gcp.modules
@@ -1013,7 +1013,6 @@  dmm32at
 dmx3191d
 dn_rtmsg
 dnet
-dp83640
 dp83822
 dp83848
 dp83867
diff --git a/debian.gcp/config/annotations b/debian.gcp/config/annotations
index 7ec8b56a13e3..3f83e75ce50b 100644
--- a/debian.gcp/config/annotations
+++ b/debian.gcp/config/annotations
@@ -7,78 +7,78 @@  include "../../debian.master/config/annotations"
 # Menu: Device Drivers >> Block devices
 CONFIG_BLK_DEV_FD                               policy<{'amd64': 'n'}>
 #
-CONFIG_BLK_DEV_FD                               flag<ENFORCE> note<LP:1729673>
+CONFIG_BLK_DEV_FD                               flag<ENFORCED> note<LP:1729673>
 
 # Menu: Device Drivers >> I2C support >> I2C support >> I2C Hardware Bus support
 CONFIG_I2C_AMD_MP2				policy<{'amd64': 'n'}>
 #
-CONFIG_I2C_AMD_MP2				flag<ENFORCE> note<not relevant for gcp>
+CONFIG_I2C_AMD_MP2				flag<ENFORCED> note<not relevant for gcp>
 
 # Menu: Device Drivers >> Network device support >> Wireless LAN >> Atheros/Qualcomm devices
 CONFIG_WCN36XX_SNAPDRAGON_HACKS			policy<{'amd64': 'n'}>
 #
-CONFIG_WCN36XX_SNAPDRAGON_HACKS			flag<ENFORCE> note<not relevant for gcp>
+CONFIG_WCN36XX_SNAPDRAGON_HACKS			flag<ENFORCED> note<not relevant for gcp>
 
 # Menu: Device Drivers >> PTP clock support >> PTP clock support
 CONFIG_DP83640_PHY                              policy<{'amd64': 'n'}>
 #
-CONFIG_DP83640_PHY                              mark<ENFORCE> note<LP:1785816> note<not relevant for gcp>
+CONFIG_DP83640_PHY                              mark<ENFORCED> note<LP:1785816> note<not relevant for gcp>
 
 # Menu: Device Drivers >> SCSI device support >> SCSI device support >> SCSI low-level drivers
 CONFIG_SCSI_VIRTIO                              policy<{'amd64': 'y'}>
 #
-CONFIG_SCSI_VIRTIO                              flag<ENFORCE> note<LP:1669657> note<tech preview of new feature>
+CONFIG_SCSI_VIRTIO                              flag<ENFORCED> note<LP:1669657> note<tech preview of new feature>
 
 # 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<ENFORCE> note<not relevant for gcp>
-CONFIG_DELL_SMBIOS_SMM				flag<ENFORCE> note<not relevant for gcp>
+CONFIG_DELL_UART_BACKLIGHT			flag<ENFORCED> note<not relevant for gcp>
+CONFIG_DELL_SMBIOS_SMM				flag<ENFORCED> note<not relevant for gcp>
 
 # Menu: Kernel hacking
 CONFIG_PANIC_ON_OOPS                            policy<{'amd64': 'y'}>
 #
-CONFIG_PANIC_ON_OOPS  				flag<ENFORCE> note<initial packaging> note<keep working if at all possible>
+CONFIG_PANIC_ON_OOPS  				flag<ENFORCED> note<initial packaging> 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'}>
 #
-CONFIG_BOOTPARAM_HARDLOCKUP_PANIC               flag<ENFORCE> note<initial packaging>
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC               flag<ENFORCE> note<initial packaging>
+CONFIG_BOOTPARAM_HARDLOCKUP_PANIC               flag<ENFORCED> note<initial packaging>
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC               flag<ENFORCED> note<initial packaging>
 
 # 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			policy<{'amd64': '"avx2x4"'}>
+CONFIG_RAID6_PQ_DEFAULT_ALG_BOOL		policy<{'amd64': 'y'}>
 #
-CONFIG_RAID6_PQ_DEFAULT_ALG			mark<ENFORCE> note<LP:1812728>
-CONFIG_RAID6_PQ_DEFAULT_ALG_BOOL		mark<ENFORCE> note<LP:1812728>
+CONFIG_RAID6_PQ_DEFAULT_ALG			mark<ENFORCED> note<LP:1812728>
+CONFIG_RAID6_PQ_DEFAULT_ALG_BOOL		mark<ENFORCED> note<LP:1812728>
 
 # Menu: Networking support >> Bluetooth subsystem support >> Bluetooth device drivers
 CONFIG_BT_QCOMSMD_HACK				policy<{'amd64': 'n'}>
 #
-CONFIG_BT_QCOMSMD_HACK				flag<ENFORCE> note<not relevant for gcp>
+CONFIG_BT_QCOMSMD_HACK				flag<ENFORCED> note<not relevant for gcp>
 
 # Menu: Networking support >> Networking options
 CONFIG_NETWORK_PHY_TIMESTAMPING                 policy<{'amd64': 'n'}>
 #
-CONFIG_NETWORK_PHY_TIMESTAMPING			flag<ENFORCE> note<LP:1785816> note<not relevant for gcp>
+CONFIG_NETWORK_PHY_TIMESTAMPING			flag<ENFORCED> note<LP:1785816> note<not relevant for gcp>
 
 # 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<ENFORCE> note<initial packaging>
-CONFIG_NETFILTER_NETLINK_LOG                    flag<ENFORCE> note<initial packaging>
+CONFIG_NETFILTER_NETLINK_QUEUE                  flag<ENFORCED> note<initial packaging>
+CONFIG_NETFILTER_NETLINK_LOG                    flag<ENFORCED> note<initial packaging>
 
 # 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<ENFORCE> note<initial packaging>
-CONFIG_NF_CONNTRACK_PROCFS                      flag<ENFORCE> note<initial packaging>
-CONFIG_NF_CT_NETLINK                            flag<ENFORCE> note<initial packaging>
+CONFIG_NF_CONNTRACK                             flag<ENFORCED> note<initial packaging>
+CONFIG_NF_CONNTRACK_PROCFS                      flag<ENFORCED> note<initial packaging>
+CONFIG_NF_CT_NETLINK                            flag<ENFORCED> note<initial packaging>
 CONFIG_NF_CONNTRACK_PROCFS                      flag<DEPRECATED>
 
diff --git a/debian.gcp/config/config.common.ubuntu b/debian.gcp/config/config.common.ubuntu
index 28e8aac81525..02b8d3366910 100644
--- a/debian.gcp/config/config.common.ubuntu
+++ b/debian.gcp/config/config.common.ubuntu
@@ -1671,7 +1671,7 @@  CONFIG_DNET=m
 CONFIG_DNOTIFY=y
 CONFIG_DNS_RESOLVER=y
 CONFIG_DOUBLEFAULT=y
-CONFIG_DP83640_PHY=m
+# CONFIG_DP83640_PHY is not set
 CONFIG_DP83822_PHY=m
 CONFIG_DP83848_PHY=m
 CONFIG_DP83867_PHY=m
@@ -5591,6 +5591,8 @@  CONFIG_RADIO_WL1273=m
 CONFIG_RADIO_WL128X=m
 CONFIG_RAID6_PQ=m
 CONFIG_RAID6_PQ_BENCHMARK=y
+CONFIG_RAID6_PQ_DEFAULT_ALG="avx2x4"
+CONFIG_RAID6_PQ_DEFAULT_ALG_BOOL=y
 CONFIG_RAID_ATTRS=m
 # CONFIG_RANDOM32_SELFTEST is not set
 CONFIG_RANDOMIZE_BASE=y