diff mbox series

[2/4,SRU,Unstable] UBUNTU: [Packaging] Turn on ODM support for amd64

Message ID 20210611100131.15133-7-acelan.kao@canonical.com
State New
Headers show
Series None | expand

Commit Message

AceLan Kao June 11, 2021, 10:01 a.m. UTC 
From: Stefan Bader <stefan.bader@canonical.com>

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@canonical.com>
Acked-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>
Acked-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>
(backported from commit 4aeffc246531a666c1fad1925ebf1a6e68a704e4 focal)
Signed-off-by: Chia-Lin Kao (AceLan) <acelan.kao@canonical.com>
---
 debian.master/config/config.common.ubuntu | 1 +
 debian.master/rules.d/amd64.mk            | 1 +
 2 files changed, 2 insertions(+)
diff mbox series

Patch

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index a605e3e521e5..c5da2b398cd0 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -11223,6 +11223,7 @@  CONFIG_UBIFS_FS_ZLIB=y
 CONFIG_UBIFS_FS_ZSTD=y
 # CONFIG_UBSAN is not set
 CONFIG_UBUNTU_HOST=m
+CONFIG_UBUNTU_ODM_DRIVERS=y
 CONFIG_UCB1400_CORE=m
 CONFIG_UCC=y
 CONFIG_UCC_FAST=y
diff --git a/debian.master/rules.d/amd64.mk b/debian.master/rules.d/amd64.mk
index 35fda32b2571..f8cbb67c1b3a 100644
--- a/debian.master/rules.d/amd64.mk
+++ b/debian.master/rules.d/amd64.mk
@@ -23,3 +23,4 @@  do_tools_acpidbg = true
 do_zfs		= true
 do_dkms_nvidia  = false
 do_dkms_nvidia_server = false
+do_odm_drivers    = true