diff mbox series

[1/2] carve out common ubuntu distro parts

Message ID 20230522045735.3516572-1-felix.moessbauer@siemens.com
State Accepted, archived
Headers show
Series [1/2] carve out common ubuntu distro parts | expand

Commit Message

MOESSBAUER, Felix May 22, 2023, 4:57 a.m. UTC 
This patch moves the common parts for all ubuntu based distributions
into an include file.

Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
 meta-isar/conf/distro/ubuntu-common.inc | 32 +++++++++++++++++++++++++
 meta-isar/conf/distro/ubuntu-focal.conf | 27 +--------------------
 2 files changed, 33 insertions(+), 26 deletions(-)
 create mode 100644 meta-isar/conf/distro/ubuntu-common.inc

Comments

Uladzimir Bely May 29, 2023, 7:07 a.m. UTC | #1 
On Mon, 2023-05-22 at 04:57 +0000, 'Felix Moessbauer' via isar-users
wrote:
> This patch moves the common parts for all ubuntu based distributions
> into an include file.
> 
> Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
> ---

Series applied to next, thanks.
diff mbox series

Patch

diff --git a/meta-isar/conf/distro/ubuntu-common.inc b/meta-isar/conf/distro/ubuntu-common.inc
new file mode 100644
index 00000000..becb7e0a
--- /dev/null
+++ b/meta-isar/conf/distro/ubuntu-common.inc
@@ -0,0 +1,32 @@ 
+#
+# Copyright (c) Siemens AG, 2018-2023
+#
+# SPDX-License-Identifier: MIT
+
+require conf/distro/debian-common.conf
+
+BASE_DISTRO = "ubuntu"
+
+HOST_BASE_DISTRO = "${BASE_DISTRO}"
+
+DISTRO_APT_SOURCES:arm64 ?= "conf/distro/${BASE_DISTRO}-${BASE_DISTRO_CODENAME}-ports.list"
+HOST_DISTRO_APT_SOURCES:arm64 ?= "conf/distro/${HOST_DISTRO}.list conf/distro/${HOST_DISTRO}-ports.list"
+
+BOOTSTRAP_KEY = "file://${LAYERDIR_isar}/conf/distro/ubuntu.public.key;sha256sum=36a38199a4bf4eae1e7f574891f7dfcb79b91b87a33a499383265e1224b5e989"
+DISTRO_BOOTSTRAP_KEYS += "${BOOTSTRAP_KEY}"
+HOST_DISTRO_BOOTSTRAP_KEYS += "${BOOTSTRAP_KEY}"
+
+
+# that is what debootstrap_1.0.118ubuntu1 does anyways
+DISTRO_DEBOOTSTRAP_SCRIPT = "/usr/share/debootstrap/scripts/gutsy"
+
+DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
+
+DISTRO_KERNELS ?= " \
+    aws azure azure-edge gcp generic gke kvm lowlatency oem virtual \
+    snapdragon generic-lpae"
+
+IMAGE_PREINSTALL += "init"
+IMAGE_PREINSTALL += "initramfs-tools"
+
+WIC_IMAGER_INSTALL += "python3-distutils"
diff --git a/meta-isar/conf/distro/ubuntu-focal.conf b/meta-isar/conf/distro/ubuntu-focal.conf
index 0cb6958d..7b400bc7 100644
--- a/meta-isar/conf/distro/ubuntu-focal.conf
+++ b/meta-isar/conf/distro/ubuntu-focal.conf
@@ -3,33 +3,8 @@ 
 #
 # SPDX-License-Identifier: MIT
 
-require conf/distro/debian-common.conf
+require conf/distro/ubuntu-common.inc
 
-BASE_DISTRO = "ubuntu"
 BASE_DISTRO_CODENAME = "focal"
 
-HOST_BASE_DISTRO = "${BASE_DISTRO}"
-
-DISTRO_APT_SOURCES:arm64 ?= "conf/distro/${BASE_DISTRO}-${BASE_DISTRO_CODENAME}-ports.list"
-HOST_DISTRO_APT_SOURCES:arm64 ?= "conf/distro/${HOST_DISTRO}.list conf/distro/${HOST_DISTRO}-ports.list"
-
-BOOTSTRAP_KEY = "file://${LAYERDIR_isar}/conf/distro/ubuntu.public.key;sha256sum=36a38199a4bf4eae1e7f574891f7dfcb79b91b87a33a499383265e1224b5e989"
-DISTRO_BOOTSTRAP_KEYS += "${BOOTSTRAP_KEY}"
-HOST_DISTRO_BOOTSTRAP_KEYS += "${BOOTSTRAP_KEY}"
-
-
-# that is what debootstrap_1.0.118ubuntu1 does anyways
-DISTRO_DEBOOTSTRAP_SCRIPT = "/usr/share/debootstrap/scripts/gutsy"
-
-DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
-
-DISTRO_KERNELS ?= " \
-    aws azure azure-edge gcp generic gke kvm lowlatency oem virtual \
-    snapdragon generic-lpae"
-
-IMAGE_PREINSTALL += "init"
-IMAGE_PREINSTALL += "initramfs-tools"
-
-WIC_IMAGER_INSTALL += "python3-distutils"
-
 DISTRO_GCC = "9"