From patchwork Fri Sep 27 19:06:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "alexander.heinisch" X-Patchwork-Id: 3835 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:24 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-qt1-f187.google.com (mail-qt1-f187.google.com [209.85.160.187]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 48RJ7Ntu026030 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 27 Sep 2024 21:07:23 +0200 Received: by mail-qt1-f187.google.com with SMTP id d75a77b69052e-45b5cdfbc89sf47348591cf.3 for ; Fri, 27 Sep 2024 12:07:23 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1727464037; cv=pass; d=google.com; s=arc-20240605; b=gDjg+NhE6KrgtQrtTfL1sN0WekPwTa5rj7m4J5aI/iXXrN/1rocfj2AfvQchDG91Md 5H08/qppg6owbxU9At85DuCU/QFT8WtuJAfQwFooaZpV6YYyoeNO+O+M92NmrRoPluQ+ 6wKMMoJR7ewLbuYJ9MZjOXSDsU0QxvkVRP1cuOCDzUCvlLvaauzcscQ4Oo8h9T3usU9P /O1Zlxqe4UmzYXiJ3QvSfef9N+S8lZ5MUMbktSEZ2jjCOCj9fpmqme6jWffBtSjzFc9/ lJEhj9+X/65sXAPEK7avoVyqwoRA7hZhGL9YeMqYFgE6hYJ6OOmQsh0Q8iTyHooDD2mG IilQ== 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=xEnCWyhlD33wSJp8e+pJQnAbDtMumbsoyXFfak1rD8g=; fh=w06LJQYubtNOhb8keY8jJAlnhAtduf2ryMpoiYEA6hE=; b=EB50UIrCxwq/xNZ4F8bRsTP+MGvCeX7q+gLTZzxcU47N7sE4Aihcs3P1e4+LQlSpL+ kYgmdHPFgcn47zmQERmaGu2axCiOesBNFFLf7BziKt7L7U2HSISwvasYeuiPXcHYXs8I HXo8Aq48S5oIt71hbHKUQa0gp0qfIJRGVzJB8VG/IBh/QMbdUARzbjq/kLkTJNigp3z9 ycxIsPQOtF7IVkNi/uAxRo1UvH7r/tgEiZ7RXmZpbrzvq6TTQxjWFRuKPUWIi2xkHivg UtpOXDJsJBuHBR6He+AjZ7xmGe/ileTMeMgeLgmSPkuNndiaZG1pVEr7uBneUazjFGZz N+/Q==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=SMzES334; spf=pass (google.com: domain of fm-1326448-20240927190715270b57b5ce3f34e95c-uvlqq9@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-1326448-20240927190715270b57b5ce3f34e95c-UVlQq9@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=1727464037; x=1728068837; 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=xEnCWyhlD33wSJp8e+pJQnAbDtMumbsoyXFfak1rD8g=; b=ZAed2e7EIE0AkRcz8wjimZ39yjdYNo2LQXVk2VMMEktBhIivvhe4kTOlLO5p8SQjK7 bgIl/LOf544DYwnTxDxfKBai7yEvmtCd13Jhw13QxFU15wEQNJ7ZmLWYioKn/PTeiw6Y uS+HUwGgsDCIZnptnFYZoNIfSNvImOmE8i9gc3hwH+TBLIT2ncbaIFjegKqswxyXSYxX xHdwgDhtiO3JyrfSoQ8MjdDNGy4ttiVc7Vcn6R9PT6eZ4rkQ79lk0VcZvvUGma2Jm1Rd zl0nyYZJs/bEaaNfKqiUeGCKVCZijcSki8LgqDB7g86IK9ytNTZy4x++yO0vjjStnqlA ZGlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727464037; x=1728068837; 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=xEnCWyhlD33wSJp8e+pJQnAbDtMumbsoyXFfak1rD8g=; b=Mn1G0kW/XPPm1Iwtnh72pibPoGfIYsJszxFF9P81WV+WiQr2ZjfgzAv2eE9XRTgNgZ kMqlAeisVrnl5mcPKJNsdAWM0r0xcxlkx7enJ9LND3AvGintDS/8n3LAqByCm/ABaUXd R2EF8zyPFIQUJFmoU2Cv+eqytRbdIekvmwzst2IeYJUqpPi6MajDuOYK1qMfakYwsEIr 3CV9qXXvrGc5romqr3fgsIP3wgJA/BjHiThJie/Qb4gsGX0bMSo6PQDmVfzssFr/Pj2t 3z6p4KLacvudxaSJqihZOwNpVacWqMOmlTtxv/BNNOwVaf0jtUKMCwXirWHTlS8Oa3hc lkog== X-Forwarded-Encrypted: i=2; AJvYcCWyvXwxEyfaNrcNtSi4iJcQMiHAiWv/dFYaXbb3BSenELNPmVxLuNdeiHA19n2P3W0EB/tpk8Y=@isar-build.org X-Gm-Message-State: AOJu0YxEOm8tH3ERdsO30rWJf8PrI+QueEciqoVhiJj4dynJnl/ZYrUi Qqam7xAqgQoDra015z1/W1eIYfcuInJh7gJvDg8CNqp5wfaCMsMg X-Google-Smtp-Source: AGHT+IEtlp3Xn4oRyJYc686Fckn04/i5657OsHtNfzqyzKBJR/ZvQECyR2hIFbqCHfzJCP5H9LCFVw== X-Received: by 2002:a05:6214:419c:b0:6c3:6e89:4a48 with SMTP id 6a1803df08f44-6cb3b6352c0mr61102766d6.22.1727464037410; Fri, 27 Sep 2024 12:07:17 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6214:268b:b0:6b5:da50:ac19 with SMTP id 6a1803df08f44-6cb2eeaabffls47285186d6.2.-pod-prod-07-us; Fri, 27 Sep 2024 12:07:16 -0700 (PDT) X-Received: by 2002:a05:6214:2f8b:b0:6bf:6ef6:22d5 with SMTP id 6a1803df08f44-6cb3b605d05mr52797566d6.17.1727464036523; Fri, 27 Sep 2024 12:07:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727464036; cv=none; d=google.com; s=arc-20240605; b=fhG2J8buozMFXUgLYFncJroJ9a2g46ZYbv8FoM8kZGTBSzO+gpkSO3/n8BOWEK5Lir rGfvDHuIr+rPSOZgovYc6aAhvHwpPZ0ZXrDsSBhNiEL7+b7ZbUgCs+srEPHEYZegtJ9U YwDeCYAYB/3ZvmrWZdvDe4BHl0OUBCHIwTeg1ufqSvVR8O5mJB/AO8OvnI6YEIfzSFDg qGVCKhuACo0ITcjjlKc1GgZaQfyNVswjrQ3EXc2me5yRr1PowqMtSwhn6d8IUvDjbg8T p/DfTaQRXZ7YhDej91PiX20UZwLoyAx5TRNdHamnGhQfqxj8+CjmT8QMLNx2DzrHcjbt JE4Q== 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=VFo35bpJPe+PGvMfJPOQpPdR7iLyaY/We2ntZ72VNrc=; fh=qlpLpZCOHpn3j/g0XGeAn8LOB72WJczsFovYQ6vHQlk=; b=hdwLTIF5VQMrv1bR0YBnNP4uenCya6aP4O4Ww/UdM/98O8DWb+fPk/8g/gBH7dMIYA yM+CpBm94OJd2HRiPqpzDn1FeifkW3f0EkmN0ET4ABF5xDYTXPPlFvvGKa9OsJ0AhABm gOjOaDEKJBjHRRkMy4Y/v/PoNFWJVD6q/HS3OxtulJPgL8mPzuTAvqiCqOnWcN2UIt0K ywKP03uorV5xJEAkmLRIDGlh/xYKcZG5c8OGPYsXGTcIlx7xfsEBVozO2D1O6IsHHlYy uJfL65+0mB63HbKrjcPsFeUISKe5OsZtaQjRmlcMPi79USo3Z9f3s5j2xCnsUWMr8zV0 Ku9w==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=SMzES334; spf=pass (google.com: domain of fm-1326448-20240927190715270b57b5ce3f34e95c-uvlqq9@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-1326448-20240927190715270b57b5ce3f34e95c-UVlQq9@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net. [185.136.65.225]) by gmr-mx.google.com with ESMTPS id 6a1803df08f44-6cb3b6c75b4si1146236d6.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-20240927190715270b57b5ce3f34e95c-uvlqq9@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) client-ip=185.136.65.225; Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 20240927190715270b57b5ce3f34e95c for ; Fri, 27 Sep 2024 21:07:15 +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 2/3] Added Kconfig for cached snapshot mirror Date: Fri, 27 Sep 2024 21:06:49 +0200 Message-ID: <20240927190650.128263-3-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=SMzES334; spf=pass (google.com: domain of fm-1326448-20240927190715270b57b5ce3f34e95c-uvlqq9@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-1326448-20240927190715270b57b5ce3f34e95c-UVlQq9@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 Signed-off-by: Alexander Heinisch --- kas/opt/Kconfig | 25 ++++++++++++++++++++++++- kas/opt/mirror-snapshot.yaml | 3 +++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/kas/opt/Kconfig b/kas/opt/Kconfig index 65482e3a..ef08564c 100644 --- a/kas/opt/Kconfig +++ b/kas/opt/Kconfig @@ -7,6 +7,15 @@ menu "Mirror selection" depends on DEBIAN_BUSTER || DEBIAN_BULLSEYE || DEBIAN_BOOKWORM || DEBIAN_TRIXIE || DEBIAN_SID || UBUNTU_FOCAL || UBUNTU_JAMMY +choice + prompt "Mirror type selection" + default MIRROR_NONE + +config MIRROR_NONE + bool "Don't use a mirror" + help + Use apt urls as specified in apt.list + config MIRROR_DEBIAN bool "Use specific Debian mirror" depends on DEBIAN_BUSTER || DEBIAN_BULLSEYE || DEBIAN_BOOKWORM || DEBIAN_TRIXIE || DEBIAN_SID @@ -42,7 +51,6 @@ config KAS_INCLUDE_MIRROR_UBUNTU config USE_APT_SNAPSHOT bool "Use the distros snapshot mirror" - depends on !MIRROR_DEBIAN && (DEBIAN_BUSTER || DEBIAN_BULLSEYE || DEBIAN_BOOKWORM || DEBIAN_TRIXIE || DEBIAN_SID || UBUNTU_FOCAL || UBUNTU_JAMMY) help Use a snapshot mirror for the selected distribution. The date is defined by ISAR_APT_SNAPSHOT_TIMESTAMP. @@ -51,6 +59,21 @@ config KAS_INCLUDE_APT_SNAPSHOT default "kas/opt/mirror-snapshot.yaml" depends on USE_APT_SNAPSHOT +config USE_APT_SNAPSHOT_CACHED + bool "Use a cache for snapshot mirror" + depends on USE_APT_SNAPSHOT + +config DISTRO_APT_SNAPSHOT_PREMIRROR_BASE + string "Base URL of the snapshot mirror" + default "localhost:3142/snapshot.debian.org" + depends on USE_APT_SNAPSHOT_CACHED + help + Set the premirror base url used for snapshots. + This can either be a local cache (e.g.: localhost:3142/snapshot.debian.org) or + any mirror like snapshot.debian.org used to retrieve snapshots from. + +endchoice + endmenu diff --git a/kas/opt/mirror-snapshot.yaml b/kas/opt/mirror-snapshot.yaml index 59fae192..493e1552 100644 --- a/kas/opt/mirror-snapshot.yaml +++ b/kas/opt/mirror-snapshot.yaml @@ -7,3 +7,6 @@ header: local_conf_header: mirror-debian: | ISAR_USE_APT_SNAPSHOT = "1" + +env: + DISTRO_APT_SNAPSHOT_PREMIRROR_BASE: null