[SRU F][PATCH 2/2] UBUNTU: [Packaging] Turn on ODM support for amd64

[Stefan Bader]

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

Now there is the support in place let us turn this on for amd64. This is
added as enabled generally in the config because otherwise updating the
config for drivers depending on it would not work. It is changed at
build time for arches which have not enabled it. Also it will
automatically go away for backports.

Signed-off-by: Stefan Bader <stefan.bader at canonical.com>
---
 debian.master/config/config.common.ubuntu | 1 +
 debian.master/rules.d/amd64.mk            | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 75cc55c2d321..00fae58b1ade 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -10362,6 +10362,7 @@ CONFIG_UBIFS_FS_ZLIB=y
 CONFIG_UBIFS_FS_ZSTD=y
 # CONFIG_UBSAN is not set
 CONFIG_UBSAN_ALIGNMENT=y
+CONFIG_UBUNTU_ODM_DRIVERS=y
 CONFIG_UCB1400_CORE=m
 CONFIG_UCLAMP_BUCKETS_COUNT=5
 CONFIG_UCLAMP_TASK=y
diff --git a/debian.master/rules.d/amd64.mk b/debian.master/rules.d/amd64.mk
index d253402ae066..c201b5da0b13 100644
--- a/debian.master/rules.d/amd64.mk
+++ b/debian.master/rules.d/amd64.mk
@@ -26,3 +26,4 @@ do_dkms_nvidia  = true
 do_dkms_nvidia_server = true
 do_dkms_vbox    = true
 do_dkms_wireguard = true
+do_odm_drivers    = true
-- 
2.25.1