From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7147905569500692480 X-Received: by 2002:adf:ab15:0:b0:22b:9f9f:ad3 with SMTP id q21-20020adfab15000000b0022b9f9f0ad3mr12605532wrc.43.1664251454590; Mon, 26 Sep 2022 21:04:14 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:f209:0:b0:225:6559:3374 with SMTP id p9-20020adff209000000b0022565593374ls493514wro.2.-pod-prod-gmail; Mon, 26 Sep 2022 21:04:13 -0700 (PDT) X-Google-Smtp-Source: AMsMyM65Svc9SiUzqEBsGzAF4e6zK6+RTxXc3+x80xecezBE4/SQl2IylaqJZqnkcXLFfP4TQxrm X-Received: by 2002:a05:6000:1048:b0:228:6898:aa50 with SMTP id c8-20020a056000104800b002286898aa50mr15183166wrx.233.1664251453020; Mon, 26 Sep 2022 21:04:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664251453; cv=none; d=google.com; s=arc-20160816; b=GT3A7X2CjSRJ9B/3Cj7qym1ZFhtoMSl30f0FRGV9oF6I27w71Z9auGmaGuXNtOrrKH y5KSkt8NsAGN0odT6BNAmQdYgYMnZbGxV5tp4myn9CFk+rhDz5ZGE+E3WP9AwSrOXCke avdLt5g2DRVBert3+Oe4ooTMrt9b/fUBA5jnJ5ut3xC12PLni+XNRADZ3Vws4uGKGF6c urHt9dTCr+Ghuot4lYeGOrDl8Xff9mCSoBOZoreaSQCNxf7TUsHOSl64hpILHpyAJiRv 0X5i/or2WFeP0KaOmIQQt+Xqt5emOkHY9X2mCCMpNJghgH+80Is502KyNu6qW5Moayh+ LxkQ== 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=UxOnklKz01OlPZJhJCc7fIq5lQ+7DYokyfvfDq/7LBk=; b=nRZmGPo21LnWSlFacUlqYrFLAs9m36tMgqMpxFRO3ugMzHqPCRxx11Rn1/7Sx5wA8W aqH+6igDw1TSXsO6rWfByalHAbFeJHHIFI7NV3pr16a0ekvG3KLGQR/+Uvryy15f1wu8 7oDHXl5GlJzMmLl69CGNeuvRENHZYa8l2MRwDT63dL8NES+VLz7UDKWbEI/2IsWqAwju K8L1dHzMppAfaG7+DU5I3CUbBv4zQyBeOytlNjl7CMAHBsbfE+fJRbqbneMf67q2AWRz ykEcy5qOKuOPadRY7qW83KjejZBzeMJaokRb3ryVg+O4bmRhSxi6s4abgFNHaTfVvxj6 t2HQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="Qvp+U/bE"; spf=pass (google.com: domain of fm-72506-20220927040412d3327e69e0e70fcb71-wkdlif@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-72506-20220927040412d3327e69e0e70fcb71-WkdLif@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net. [185.136.64.228]) by gmr-mx.google.com with ESMTPS id 125-20020a1c1983000000b003a6787eaf57si36456wmz.2.2022.09.26.21.04.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Sep 2022 21:04:13 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-20220927040412d3327e69e0e70fcb71-wkdlif@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) client-ip=185.136.64.228; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="Qvp+U/bE"; spf=pass (google.com: domain of fm-72506-20220927040412d3327e69e0e70fcb71-wkdlif@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-72506-20220927040412d3327e69e0e70fcb71-WkdLif@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 20220927040412d3327e69e0e70fcb71 for ; Tue, 27 Sep 2022 06:04:12 +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=UxOnklKz01OlPZJhJCc7fIq5lQ+7DYokyfvfDq/7LBk=; b=Qvp+U/bEXVTPmF3VfjH5MtAZj8eyP9q+sWusm/S78hf1aoxRMNCN8NkJ3P0dtBojH0OTKD 0JwKzy/AZTJFV2AuTdRJWR89mZ8S3zgZsu05uNxLexS3FFswcAASllYO4s/fZYCCZLixZKN2 oLnTmuXjrR0gy/OXT8ydTSrxQngCY=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: henning.schild@siemens.com, Felix Moessbauer Subject: [PATCH] unify ubuntu-focal.conf with debian config files Date: Tue, 27 Sep 2022 06:03:19 +0200 Message-Id: <20220927040319.278761-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: 88DJJw1tb9kj This patch reworks the ubuntu-focal.conf distro config file. It unifies the pattern used for DISTRO_APT_SOURCES with the pattern used in debian-common.conf. By that, the BASE_DISTRO variable is used to select the corresponding apt sources. This makes it possible to derive custom distros based on ubuntu as well. Signed-off-by: Felix Moessbauer --- meta-isar/conf/distro/ubuntu-focal.conf | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/meta-isar/conf/distro/ubuntu-focal.conf b/meta-isar/conf/distro/ubuntu-focal.conf index c0d12967..9e2ff27a 100644 --- a/meta-isar/conf/distro/ubuntu-focal.conf +++ b/meta-isar/conf/distro/ubuntu-focal.conf @@ -6,13 +6,11 @@ require conf/distro/debian-common.conf BASE_DISTRO = "ubuntu" - -DISTRO_APT_SOURCES ?= "conf/distro/${DISTRO}.list" -DISTRO_APT_SOURCES_arm64 ?= "conf/distro/${DISTRO}-ports.list" -HOST_DISTRO_APT_SOURCES_append_arm64 = " ${DISTRO_APT_SOURCES}" - BASE_DISTRO_CODENAME = "focal" +DISTRO_APT_SOURCES_arm64 ?= "conf/distro/${BASE_DISTRO}-${BASE_DISTRO_CODENAME}-ports.list" +HOST_DISTRO_APT_SOURCES_arm64 ?= "conf/distro/${HOST_DISTRO}-ports.list" + # that is what debootstrap_1.0.118ubuntu1 does anyways DISTRO_DEBOOTSTRAP_SCRIPT = "/usr/share/debootstrap/scripts/gutsy" -- 2.30.2