From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7278939938131804160 X-Received: by 2002:a05:6512:3055:b0:503:446:b468 with SMTP id b21-20020a056512305500b005030446b468mr9101021lfb.67.1695706667716; Mon, 25 Sep 2023 22:37:47 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:2fa:b0:500:7f17:b77d with SMTP id m26-20020a05651202fa00b005007f17b77dls2042002lfq.2.-pod-prod-01-eu; Mon, 25 Sep 2023 22:37:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IET0ykIgIAOz+q97smecbdc31x8PE0RC7pqxqK8oouXgpsYFbD+4Sjg54qWyS6x68o6bLZ5 X-Received: by 2002:a05:6512:3a89:b0:503:a9c:af83 with SMTP id q9-20020a0565123a8900b005030a9caf83mr8409710lfu.41.1695706665679; Mon, 25 Sep 2023 22:37:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695706665; cv=none; d=google.com; s=arc-20160816; b=ORguXcx6cBkwCpSR32B9JNlmkK9OhrF9ZbK9KfsIRK7uYxtOeMoq4uIl9RiVQ/EEHP I4M/NvYhCyJ/++dd+NN9GsGktjkyGeNkJBL4qN+F6Idt/2ejOGS2Y33/YicE++OBNnaG viFUFA/hAQ/jtcQ+l8isWvOC2lpQYL/WWcTgNC5Z8Mlr+M4Gpq2pMcHEQUZ+GaEfBobQ mNfjc35dhXkn15XFTRDnWSNXqKXkXDYp8UEwp08pSgmLZiCRMYGcpfmh7C4enLrDiafG EYpg1eIpQhcUN142qaZBfNs8t7NBmlWctyF+TH+BNQS0n6Nhq4AcCdpB32OwD7YbbO0v xz5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=pF+LmkY4UGbSBWE1lAcjFcTiwTZoy8hlG8gFuqn/sVA=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=QhNz4djKOjBd5dgjuYY0zZNAspd57g9UuoC5nG1B0ckBMNo/zpiHMVG4CwcBRU4eb8 OrB5SduMp7rs8iAVPw+fqel6gJtWQTIZegUGGrHNmVL7aFcK3VvU5LuGsl8KLOJiajxK NLYlSzLyl8dvfEPZM9KDOgT+N9iJpc5NrlvZgooKMzAKZTJa2GhinZCSlZd9wXLhnEEL wDHhHOXrIu3gi2Pgu2N+mrc6XGM2kp8Wzdj7jDpVpM3yPeluJGycjIgrC1LM0PNSdX1R Anb/EYWnFj3X7eWAcGMMWyYzeyeXgnZ+wP6ABIZOZ7k6Yg67HG7KD+4QIDVeoA0KnoEP 8qQw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id f13-20020a05600c4e8d00b004047a45b541si49107wmq.0.2023.09.25.22.37.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 25 Sep 2023 22:37:45 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 38Q5bhxn016779 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 26 Sep 2023 07:37:45 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v5 03/13] kas: Add mirror selection Date: Tue, 26 Sep 2023 07:37:32 +0200 Message-Id: <20230926053742.11352-4-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230926053742.11352-1-ubely@ilbers.de> References: <20230926053742.11352-1-ubely@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED 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-TUID: 7Oc/PU685bLN This allows to select better (faster) mirror for Debian and Ubuntu distributions. Isar DISTRO_APT_PREMIRRORS is used under the hood. Signed-off-by: Uladzimir Bely --- Kconfig | 1 + kas/opt/Kconfig | 43 ++++++++++++++++++++++++++++++++++++++ kas/opt/mirror-debian.yaml | 10 +++++++++ kas/opt/mirror-ubuntu.yaml | 10 +++++++++ 4 files changed, 64 insertions(+) create mode 100644 kas/opt/Kconfig create mode 100644 kas/opt/mirror-debian.yaml create mode 100644 kas/opt/mirror-ubuntu.yaml diff --git a/Kconfig b/Kconfig index 591fe765..a62fbf6c 100644 --- a/Kconfig +++ b/Kconfig @@ -16,3 +16,4 @@ config KAS_BUILD_SYSTEM source "kas/distro/Kconfig" source "kas/machine/Kconfig" +source "kas/opt/Kconfig" diff --git a/kas/opt/Kconfig b/kas/opt/Kconfig new file mode 100644 index 00000000..22661bc3 --- /dev/null +++ b/kas/opt/Kconfig @@ -0,0 +1,43 @@ +# This software is a part of ISAR. +# Copyright (C) 2023 ilbers GmbH +# +# Authors: +# Uladzimir Bely + +menu "Mirror selection" + depends on DEBIAN_BUSTER || DEBIAN_BULLSEYE || DEBIAN_BOOKWORM || UBUNTU_FOCAL || UBUNTU_JAMMY + +config MIRROR_DEBIAN + bool "Use specific Debian mirror" + depends on DEBIAN_BUSTER || DEBIAN_BULLSEYE || DEBIAN_BOOKWORM + help + Select better local Debian mirror instead of deb.debian.org + +config MIRROR_DEBIAN_URL + string "URL of Debian mirror" + default "http://deb.debian.org" + depends on MIRROR_DEBIAN + +config KAS_INCLUDE_MIRROR_DEBIAN + string + default "kas/opt/mirror-debian.yaml" + depends on MIRROR_DEBIAN + + +config MIRROR_UBUNTU + bool "Use specific Ubuntu mirror" + depends on UBUNTU_FOCAL || UBUNTU_JAMMY + help + Select better local Ubuntu mirror instead of archive.ubuntu.com + +config MIRROR_UBUNTU_URL + string "URL of Ubuntu mirror" + default "http://archive.ubuntu.com" + depends on MIRROR_UBUNTU + +config KAS_INCLUDE_MIRROR_UBUNTU + string + default "kas/opt/mirror-ubuntu.yaml" + depends on MIRROR_UBUNTU + +endmenu diff --git a/kas/opt/mirror-debian.yaml b/kas/opt/mirror-debian.yaml new file mode 100644 index 00000000..4dd4fc17 --- /dev/null +++ b/kas/opt/mirror-debian.yaml @@ -0,0 +1,10 @@ +# This software is a part of ISAR. +# Copyright (C) 2023 ilbers GmbH + +header: + version: 14 + +local_conf_header: + mirror-debian: | + DISTRO_APT_PREMIRRORS += "\ + http://deb\.debian\.org ${MIRROR_DEBIAN_URL}\n" diff --git a/kas/opt/mirror-ubuntu.yaml b/kas/opt/mirror-ubuntu.yaml new file mode 100644 index 00000000..3774b079 --- /dev/null +++ b/kas/opt/mirror-ubuntu.yaml @@ -0,0 +1,10 @@ +# This software is a part of ISAR. +# Copyright (C) 2023 ilbers GmbH + +header: + version: 14 + +local_conf_header: + mirror-ubuntu: | + DISTRO_APT_PREMIRRORS += "\ + http://archive\.ubuntu\.com ${MIRROR_UBUNTU_URL}\n" -- 2.20.1