From patchwork Fri Sep 27 19:06:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "alexander.heinisch" X-Patchwork-Id: 3836 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 27 Sep 2024 21:07:26 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-pf1-f185.google.com (mail-pf1-f185.google.com [209.85.210.185]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 48RJ7Pm6026048 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 27 Sep 2024 21:07:26 +0200 Received: by mail-pf1-f185.google.com with SMTP id d2e1a72fcca58-718db8e61bfsf3402203b3a.0 for ; Fri, 27 Sep 2024 12:07:26 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1727464039; cv=pass; d=google.com; s=arc-20240605; b=YYIZrHDjkJtgjr8t7whQnhbBMrlrMYD1VBPR6cRI5+Vnavax6DOExUMzFdFlfu/yiw uaG+CNt1rkUK7ETw7UbF4ebV6ReC9hS0ut5xbOd0iwC2cl3rLgytDFOO4ngTAu6RJeUg /sistcyTyZtV2V0ENkAR+EiwOeHZcrTkcg8TzjJbQ5vYhUhFtfC3tTVkEGso6+FgYfXm D/9741rVOhpb8fAIcIvReJ+duvgpF2jRs+JbGJZyH0rwH2Z8nPho0ovMUJutGaOL53GM 4oh1o9VSI23D+T0/5eC9U444u9WB9z2WHZtofhoSy4ktqdyY5c2vBGrIMr//qbHL87au SIZA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=IBb7YOUEZxpo30iKkGGE7uFQURbPPM/Mx/qsNl618xE=; fh=TMUtFqzChQ3b09tOfaOkl5iZ1Ix9rjFGsivL/qtqCdg=; b=a5KVULiozpGawGN5HvdrI/+Iji/JUehQXEyu47H6kG+IAzIrf9s+yLvp4+Ky94VsgV P97mSX2bbSMCHnoUHPy7LLGZIY7ueXKTFX3jZNqNoTiNazAJLhGWn22rXV0ZyQQwhlJ1 zjYaqjpCSfofyppIUDlm/03sTzQvLuM4Oltu9ZonU6vwYoNAu9lk3zx3SlfiDYOr8fKn 6PGLDZMFTdDWOQs3WfHXmJfxw0WhcwVPNvh4bNhV3orqdLyDRvP/ZKvqj5YmRBEvQrtd sO2CdHgxsP/oqbxQnzJUBfloAVzpKQJzfblUIoFKfKKaFVOFgEGUpGjkzAz+eE1eItSi s46Q==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=Z4Eng6uc; spf=pass (google.com: domain of fm-1326448-20240927190714efac48b58e7e152462-fmmzly@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) smtp.mailfrom=fm-1326448-20240927190714efac48b58e7e152462-FmmZlY@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=20230601; t=1727464039; x=1728068839; darn=isar-build.org; 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:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=IBb7YOUEZxpo30iKkGGE7uFQURbPPM/Mx/qsNl618xE=; b=QSUlpJMJbJ3Aq/vVdl/T2yetTje9MSWCEQl6ohwPiKNOOnAAKr52xs3LXx+7eXfMWm l+shRfEyfhvBwON7EuTE/aQzSBHmyH/gaeHcAkCaFBdYcuAGcLsuXiaVKCWg6zJBWCCq XsGdsTLzEMYm1hY9lOZvIRRStXcCovjr01s55lM3F57DxhdrYA/3aRUSwEy3A6WG9oTP ANU2YG5Pf8exXcSFHjMnLjz0wOwX5CYTNgmyYUieTHYwymi8p26BEWRYyGelmrqLcX5H Bh3ImUZYhcrnPNY2hRfP3G/GUSEXTnGe4oFYF2lkfiWWIDLNeYloHKFF29QDODxvqy7O 7kdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727464039; x=1728068839; 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:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=IBb7YOUEZxpo30iKkGGE7uFQURbPPM/Mx/qsNl618xE=; b=V4pNP4M1zlxk/yTsrQpe0wveQw6+MKP8P7vU6LI/amI2kS8ped8P6mS0SSON3SUWwl S5Q6DG5p5I6GrJM2/locBwaB8Sq4fgNHZMbwu+xEXoB5zG/eC7LD0kEnTY6Lj6elsnGh ArZWGq8LMJPi0KTLbB9qt/66vU2YXfTUpu+vHGFN040LzjzBq/WPD1HgAOayZhBnpI9C vEfTr9T7YicV8NJp/Oyh45c2bGlOilR3myWvWkHSmvlEBMB6NTVEtFvBFgoeNw327Zb1 AF4mpKGtComiq0+8WuHz8E2fA3pYZVhQ4RC/K/ms5UMoiI9Hl59G5qIWyc7bcg6KfOfX thmw== X-Forwarded-Encrypted: i=2; AJvYcCUT5ZZd2l0CdSZcVY/VWQsWpUyInNYNr/a/cYDksoYvWr1RSh3r4WxxBX31vcDREwj7+IvI8GQ=@isar-build.org X-Gm-Message-State: AOJu0Yydgb+tYrsBm0Zo41834AUmH9crPq+/pvkJG+tAG0i3JrcDWgBe 7brwdoEU19NWD/OQY2q1YStfBOKEa1L5VZMqGXyx+guzOBpJha5/ X-Google-Smtp-Source: AGHT+IHMcUOJLBiZZaSZ1phKXoYt2KLVwCkAIx6JxX/0tsqJBTB2Q8rF/AuYvWj4QuhiX8j3qHpuoA== X-Received: by 2002:a05:6a00:22c8:b0:714:2069:d90e with SMTP id d2e1a72fcca58-71b26077151mr6431932b3a.26.1727464038736; Fri, 27 Sep 2024 12:07:18 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6a00:2e03:b0:717:85a0:1de2 with SMTP id d2e1a72fcca58-71b18b9dc9fls2308353b3a.0.-pod-prod-08-us; Fri, 27 Sep 2024 12:07:17 -0700 (PDT) X-Received: by 2002:a05:6a00:b88:b0:70d:1dcf:e2a5 with SMTP id d2e1a72fcca58-71b25f00c69mr6988049b3a.3.1727464037111; Fri, 27 Sep 2024 12:07:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727464037; cv=none; d=google.com; s=arc-20240605; b=NleYk4rPBeF19rhqh5gukFkBAgFNdgiR90X9XgfA5z8DHBqYaqocIn/y1QKo95jgDf +KFbNaFwm2xNVKapDYhkGzc/wzD8Ly9GJdl1OjaFfyMpeTChK5E9ep37WApdEosn4lTk luPnb2CgO1Xwt1qw278hz8FVe4+9tdvznnB+/g8cd8AzxRUZWPAJGer/CdhxEOEQLcwa jrde5LTYEmAIQVlIy/WZhotJU7quXVK0B/8O6NphnuPcgKCzfYns+LNvuGuzYXg8z1m7 wp/A4H7ATXrJGs4GXkCtRT74JU88mq6JIDv5/PZhMOBa8vpNZLktPjLaMKeigT9oL2FU Klrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=DzbYn1n0oyIRCkggq2/NeVv3vXYdv/cCWaX6feEbmZ0=; fh=qlpLpZCOHpn3j/g0XGeAn8LOB72WJczsFovYQ6vHQlk=; b=jA8cIhg0D94ZhCxLxzLTFf+m8XljFY+YWYQ/bdhfgEJabWnjkoQ/OqD6RTmRZ+2vfd 4Le3HzMxyyVRR3CdqvcfasUYN/RYtW0z/+YNFJmcy93epN54ZimZXzT/LbbSOXdeCbqt ukjQx3V2RH+Rm2ofxwN3GCR884slEUxt3mjilRrp2Q0r3y21gaAIIDP7YB09XUrETk1x K9YBFVGYll8R9dnQnXYPHYJWdszMNxzwlv/6lKRD9j2//8CtFMVPFahZxvrJ9SRW6WJ7 qgnJ8gjmLykFJEK78MGTyi8UkRbOBoeYCjw1AbuzT4GjNvWztpC7+iP6uQ3sDvHAuZcM oWZA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=Z4Eng6uc; spf=pass (google.com: domain of fm-1326448-20240927190714efac48b58e7e152462-fmmzly@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) smtp.mailfrom=fm-1326448-20240927190714efac48b58e7e152462-FmmZlY@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-228.siemens.flowmailer.net (mta-65-228.siemens.flowmailer.net. [185.136.65.228]) by gmr-mx.google.com with ESMTPS id d2e1a72fcca58-71b26521195si125362b3a.3.2024.09.27.12.07.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Sep 2024 12:07:16 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1326448-20240927190714efac48b58e7e152462-fmmzly@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) client-ip=185.136.65.228; Received: by mta-65-228.siemens.flowmailer.net with ESMTPSA id 20240927190714efac48b58e7e152462 for ; Fri, 27 Sep 2024 21:07:14 +0200 X-Patchwork-Original-From: "alexander.heinisch via isar-users" From: "alexander.heinisch" To: isar-users@googlegroups.com, felix.moessbauer@siemens.com Cc: Alexander Heinisch Subject: [PATCH 1/3] Added DISTRO_APT_SNAPSHOT_PREMIRROR_BASE to specify the base-url of the mirror used. Date: Fri, 27 Sep 2024 21:06:48 +0200 Message-ID: <20240927190650.128263-2-alexander.heinisch@siemens.com> In-Reply-To: <20240927190650.128263-1-alexander.heinisch@siemens.com> References: <20240927190650.128263-1-alexander.heinisch@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1326448:519-21489:flowmailer X-Original-Sender: alexander.heinisch@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=Z4Eng6uc; spf=pass (google.com: domain of fm-1326448-20240927190714efac48b58e7e152462-fmmzly@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) smtp.mailfrom=fm-1326448-20240927190714efac48b58e7e152462-FmmZlY@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: alexander.heinisch@siemens.com Reply-To: alexander.heinisch@siemens.com 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=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,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?= From: Alexander Heinisch This enables the use of local caches like apt-cache-ng when using isar's snapshot facility. e.g. DISTRO_APT_SNAPSHOT_PREMIRROR_BASE=localhost:3142/snapshot.debian.org Note: When setting the variable from the environment make sure you add it to the kas file as follows. Make sure the default is null. ``` env: DISTRO_APT_SNAPSHOT_PREMIRROR_BASE: null ``` Signed-off-by: Alexander Heinisch --- meta-isar/conf/distro/ubuntu-common.inc | 3 ++- meta/conf/distro/debian-common.conf | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/meta-isar/conf/distro/ubuntu-common.inc b/meta-isar/conf/distro/ubuntu-common.inc index 232bee35..2c2f02f8 100644 --- a/meta-isar/conf/distro/ubuntu-common.inc +++ b/meta-isar/conf/distro/ubuntu-common.inc @@ -37,4 +37,5 @@ SYSTEMD_BOOTLOADER_INSTALL:focal = "systemd:${DISTRO_ARCH}" SYSTEMD_BOOTLOADER_INSTALL:jammy = "systemd:${DISTRO_ARCH}" # snapshot mirror for reproducible builds -DISTRO_APT_SNAPSHOT_PREMIRROR ??= "(http|https)://archive.ubuntu.com/(.*) https://snapshot.ubuntu.com/\2/${APT_SNAPSHOT_DATE}/\n" +DISTRO_APT_SNAPSHOT_PREMIRROR_BASE ??= "snapshot.ubuntu.com" +DISTRO_APT_SNAPSHOT_PREMIRROR ??= "(http|https)://archive.ubuntu.com/(.*) https://${DISTRO_APT_SNAPSHOT_PREMIRROR_BASE}/\2/${APT_SNAPSHOT_DATE}/\n" diff --git a/meta/conf/distro/debian-common.conf b/meta/conf/distro/debian-common.conf index 8c6a3f63..de9e6933 100644 --- a/meta/conf/distro/debian-common.conf +++ b/meta/conf/distro/debian-common.conf @@ -40,4 +40,5 @@ COMPAT_DISTRO_ARCH:amd64 = "i386" COMPAT_DISTRO_ARCH:arm64 = "armhf" # snapshot mirror for reproducible builds -DISTRO_APT_SNAPSHOT_PREMIRROR ??= "deb.debian.org/(.*) snapshot.debian.org/archive/\1/${APT_SNAPSHOT_DATE}/\n" +DISTRO_APT_SNAPSHOT_PREMIRROR_BASE ??= "snapshot.debian.org" +DISTRO_APT_SNAPSHOT_PREMIRROR ??= "deb.debian.org/(.*) ${DISTRO_APT_SNAPSHOT_PREMIRROR_BASE}/archive/\1/${APT_SNAPSHOT_DATE}/\n"