From patchwork Mon May 22 04:57:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 2818 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 22 May 2023 06:58:14 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f58.google.com (mail-lf1-f58.google.com [209.85.167.58]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 34M4wDpI012496 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 22 May 2023 06:58:14 +0200 Received: by mail-lf1-f58.google.com with SMTP id 2adb3069b0e04-4f38c81d664sf3155554e87.1; Sun, 21 May 2023 21:58:14 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1684731488; cv=pass; d=google.com; s=arc-20160816; b=K5CMMUyWz5/xGoRpIAUPnyDlyTUM7nb223LcJOv/IlQ0Y3hjR2Z7WaWDuPkHacQQI1 jbHtZYJ52HryDCIGY8TNETreilaRuxT9F4hChVSgk5bgVwl4jpxO79HquxyUKiQ0+UF3 DljBzp2iDyVoo7/WnRFtgdHjhAjjfz0vIHFQhp6Ky1hGfE0xyvveVC7coroYxWS6wR1o zWiswdDzgICbOfHgV5Xcr9OhZ6OEteusapc/dxPVykiWq7TUNvpbMR4qTIsBgm8ppTrg 4fmm8Kil31ZXqoPtCAh3Tj/RyEX94OseT+QvvP1uwN92ZwtFSeRdDMcba1jJbExwNy/W 5Y0Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=ZOoc631/oFYcoQyqQGdmzhINqD6xiO30Am5Ls90kB3U=; b=J0t4f0Y9jtkEnbIiMaZwms+e6eQQHRshjmySB6K1jvARflK+QzeBxJnOPdqr+Eu4MU IGrV2qdjZJ3MqkHUqd9vCD1rYibjXy3+MzOuR8o+7NjeoynHEmAHqtTl0N/aoSSp6wqC rqYHvp+UbPXNlQFxMbOIM3f6aWhMfYEYT7hI1+71wxQEB0oA4hHiJUTA4bcKPpjnUX/m aMqthTj2LtppsdIb0+o1W9B8LlUY6+oFmqp07HJQAYuw6z7cVeKGIotMaQrZ14d+YrUz jrwBTbODglKZVvKYmumZF6jZ97fhuB/M8RyROBwiC429S5c9qNRPAsujKZZiIrKDYhss /g6A== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20221208; t=1684731488; x=1687323488; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=ZOoc631/oFYcoQyqQGdmzhINqD6xiO30Am5Ls90kB3U=; b=P9Mc9s1q1QUGx0Zw1Lcj9jj3Dqj63sHC7w2hRc7jbfuO20UFLfoVBYoKHeLx/F3w7k DHRMqi8QDFjaIxN5YE9mfrM5Lm5/h61SawNPnKL1zQZjWlgkDKIJSO+xWxyUBOABc1+N PnN6ejDVPwA4BHPv73FbM02jFzMLGIecPUBxPf0vuTsvJGB3NSDNXtkts6N3np3zSWD6 6fDqqs4ED9ZObiPKXTBZ7TwApGNp/Lho1U0LeSAGb1CIo/LrQ3k0kOVfeEM2sPdo9NS3 OT0biiTjXpQHlSYbAm0pDQzGOqWpKlVPg//QY65KfvfBG2IiQCIbiB51+qtWYHuzqrOC veYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684731488; x=1687323488; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:message-id:date:subject:cc:to:from:x-beenthere :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ZOoc631/oFYcoQyqQGdmzhINqD6xiO30Am5Ls90kB3U=; b=MH7+ZJvpPJCafgkoWSkloocCXGuQp5pu1ABxQ6CAWfZ6zOIon+izwWgorUvsZYkz8O Cup73KRPcaTbkSOGqNaJatR/LWQnIPjrQ605WZVfiWFYvKXykdAxuUkqKnLeLZQjLAOa nSsCNLTtCHw0L3SNOfDJLr4mkUTZbVSqLHgbph0YKPCFtp1MRQuvqxN8eIki0+JreL26 X5+9M6J8eJFZ3tuQGVgzGFRPocuUKActjmaqNOzIlMPlqMZwu7HilHDHK3E6auS8ACIh +Lopt3+6lX04eql6GW4c71ddx3iVTWp9U5LlRajfztEBb08umjiz9bTtyTumTRl2HEWW AiQg== X-Gm-Message-State: AC+VfDxXqGPpoa4p/sa37y2MurVleXgSfliXqdnm3qMV7OJ4OfoXeRDQ 53c3J57WW2OssFlrPKB5bHc= X-Google-Smtp-Source: ACHHUZ5Iza3hdbeYaP+P4ccw1R9Bneaxy3Wb3WhHp3FF02MU7kHQ++LpPsGz4jHiBuntfyhKRV8JGA== X-Received: by 2002:ac2:46cd:0:b0:4f4:b049:c261 with SMTP id p13-20020ac246cd000000b004f4b049c261mr402690lfo.13.1684731487450; 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-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 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; Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 202305220458041967e8b07a2ef7d648 for ; Mon, 22 May 2023 06:58:04 +0200 X-Patchwork-Original-From: "'Felix Moessbauer' via isar-users" From: "MOESSBAUER, Felix" 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 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506:519-21489:flowmailer X-Original-Sender: felix.moessbauer@siemens.com X-Original-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 X-Original-From: Felix Moessbauer Reply-To: Felix Moessbauer Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= 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"