[PATCH v2 2/2] Enable ENA_ETHERNET as built-in to avoid race

[Leah Goldberg]

BugLink: https://bugs.launchpad.net/bugs/2144694

Currently, cloud-init may fail to detect the EC2 datasource during
the local init stage if the kernel hasn’t initialized the NIC in time.
This can prevent metadata fetching and block SSH on first boot. Making
ENA_ETHERNET built-in allows instances to boot reliably. We can revisit
making ENA modular once the underlying cloud-init race is resolved.

Added CONFIG_ENA_ETHERNET is `y` in debian.aws/config/annotations.

Signed-off-by: Leah Goldberg <leah.goldberg at canonical.com>
---
V1 -> V2: Added change to debian.aws instead of debian.master.
---
 debian.aws/config/annotations    | 3 +++
 debian.master/config/annotations | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian.aws/config/annotations b/debian.aws/config/annotations
index 1105c9db4e75..8aff931a1efd 100644
--- a/debian.aws/config/annotations
+++ b/debian.aws/config/annotations
@@ -33,6 +33,9 @@ CONFIG_DRM_ETNAVIV                              note<'LP: #1990167'>
 CONFIG_DRM_ETNAVIV_THERMAL                      policy<{'arm64': '-'}>
 CONFIG_DRM_ETNAVIV_THERMAL                      note<'LP: #1990167'>
 
+CONFIG_ENA_ETHERNET                             policy<{'amd64': 'y', 'arm64': 'y'}>
+CONFIG_ENA_ETHERNET                             note<'LP: #2144694'>
+
 CONFIG_GPIO_CDEV_V1                             policy<{'amd64': 'n', 'arm64': 'n'}>
 CONFIG_GPIO_CDEV_V1                             note<'LP: #1953613'>
 
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 70cbb5d1b8d6..27dfc4a5ba2f 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -4778,7 +4778,7 @@ CONFIG_ELFCORE                                  policy<{'amd64': 'y', 'arm64': '
 CONFIG_ELF_CORE                                 policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}>
 CONFIG_EMAC_ROCKCHIP                            policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_EM_TIMER_STI                             policy<{'armhf': 'y'}>
-CONFIG_ENA_ETHERNET                             policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y'}>
+CONFIG_ENA_ETHERNET                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}>
 CONFIG_ENC28J60                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': '-'}>
 CONFIG_ENC28J60_WRITEVERIFY                     policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': '-'}>
 CONFIG_ENCLOSURE_SERVICES                       policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'n'}>
-- 
2.43.0