From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7235866641536385024 X-Received: by 2002:a05:651c:14b:b0:2af:22a0:81ea with SMTP id c11-20020a05651c014b00b002af22a081eamr2332543ljd.1.1684731487501; Sun, 21 May 2023 21:58:07 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:4649:0:b0:4f2:5c9b:31ac with SMTP id s9-20020ac24649000000b004f25c9b31acls666754lfo.1.-pod-prod-00-eu; Sun, 21 May 2023 21:58:05 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5sSLJMuPO61Ds7LPzG05NiSVf5DP3ipa86ZQPcF3s1uJNspt3WgPr0b3V9HuiMLS4ufTPa X-Received: by 2002:ac2:52ad:0:b0:4ed:d5ce:7dea with SMTP id r13-20020ac252ad000000b004edd5ce7deamr3259963lfm.27.1684731485699; Sun, 21 May 2023 21:58:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684731485; cv=none; d=google.com; s=arc-20160816; b=unlKfRz2p87QoWLxiXSbzj7+CI7Vo8e6qAHzB2+GHUbmCq2queg2qAOej2lQ/5pWGd 7EMyiwEWdcJAIeg/r0rUIpPReh3xMhTcqGmAM3T0pIu5d5xQGstD9E8RAG1lM0Wb/lm7 wLC1LD2eEovkEUySygnWlF9WcnCu/y+WROclIj4zu0lfrBRcXvxowbSMyAmb2pItudb4 mth2WKe8H4jLIQKD7KABB9hZMtaACodwo1oiSc7jR8y1vM6U3ZXLx+0jnpjJpGeBos0L GMJ1Vo803OF4QVU1TgBMtEjzS3j7AZ8/GemOi0pVbU93Sxas3vvnanRU9+nwW4LLyvNb pFTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:message-id:date :subject:cc:to:from:dkim-signature; bh=P+41G8gjydSpByBgLpx/f+Ymjc+WcgqGiufVFl4AgoQ=; b=wjEcYze4zbyUvm3anSJR19EAsZ9B8JX6JdFLOvcisKY44o7o4PIZDNNOmbgaGpULn9 MznAGatLopJrdBYDtf8yvbVn0NHWjyNJDkZILXFsh/eJAR+ZAUqa8pq23AvQZfETY47v fUevuzhQ+1mVhl+rzHqlyitBmh/hG/CDnx76R/93E/zkVl7+1J0fLfyzFxJSI5Vp/Pwv QeGX4oM2uGMHNIN6iVQFiHjPzS3FnoXKIVp9/kuj23Mw1LJDstChWDua3fmMKC0IRcXn OiMRA13hXknzegQ9QOklcOJ/GfAzUmlwzVvqfIkuuZXc/ZORYblY7F0g3Wp2oqO+3VKh pnTQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=W9RbZLJ5; spf=pass (google.com: domain of fm-72506-202305220458041967e8b07a2ef7d648-5p_qi7@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-202305220458041967e8b07a2ef7d648-5p_Qi7@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net. [185.136.65.226]) by gmr-mx.google.com with ESMTPS id d24-20020a0565123d1800b004f2538cbe55si353990lfv.1.2023.05.21.21.58.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 21 May 2023 21:58:05 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-202305220458041967e8b07a2ef7d648-5p_qi7@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) client-ip=185.136.65.226; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=W9RbZLJ5; spf=pass (google.com: domain of fm-72506-202305220458041967e8b07a2ef7d648-5p_qi7@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-202305220458041967e8b07a2ef7d648-5p_Qi7@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 202305220458041967e8b07a2ef7d648 for ; Mon, 22 May 2023 06:58:04 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=felix.moessbauer@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc; bh=P+41G8gjydSpByBgLpx/f+Ymjc+WcgqGiufVFl4AgoQ=; b=W9RbZLJ5js0KoeH2SWwJWQCJQwPnx2w+ZcVWJKKyGYaTM+8aY4s2HH4dm+NuoKbdER2N85 LoLv+R4i2CCUWdIK0uPgZCrfSfgUvmP2fNGq2Zud00PSMu6QP/avwRsaEvdlRBaku4+mhfVc /3HUi9yB0soby3rHsLT37ib9IxW0c=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: Felix Moessbauer Subject: [PATCH 1/2] carve out common ubuntu distro parts Date: Mon, 22 May 2023 04:57:34 +0000 Message-Id: <20230522045735.3516572-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506:519-21489:flowmailer X-TUID: UPLYuGOTObIG This patch moves the common parts for all ubuntu based distributions into an include file. Signed-off-by: Felix Moessbauer --- 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