From: Felix Moessbauer <felix.moessbauer@siemens.com>
To: isar-users@googlegroups.com
Cc: Felix Moessbauer <felix.moessbauer@siemens.com>
Subject: [PATCH 1/2] carve out common ubuntu distro parts
Date: Mon, 22 May 2023 04:57:34 +0000 [thread overview]
Message-ID: <20230522045735.3516572-1-felix.moessbauer@siemens.com> (raw)
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
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"
--
2.34.1
next reply other threads:[~2023-05-22 4:58 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-22 4:57 Felix Moessbauer [this message]
2023-05-22 4:57 ` [PATCH 2/2] meta-isar: add support for ubuntu jammy Felix Moessbauer
2023-05-29 7:07 ` [PATCH 1/2] carve out common ubuntu distro parts Uladzimir Bely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230522045735.3516572-1-felix.moessbauer@siemens.com \
--to=felix.moessbauer@siemens.com \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox