From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 26 Nov 2024 14:47:39 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-pj1-f56.google.com (mail-pj1-f56.google.com [209.85.216.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 4AQDlbl1007504 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 26 Nov 2024 14:47:38 +0100 Received: by mail-pj1-f56.google.com with SMTP id 98e67ed59e1d1-2ea42039766sf5419263a91.3 for ; Tue, 26 Nov 2024 05:47:38 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1732628851; cv=pass; d=google.com; s=arc-20240605; b=jvZ+Lyx66VfUH5I2d3I0YOlS7p9adfeiN+Um5gSV04xBTn2PcghLZnoGoCOjRIMPRm y6SvDMNAhxCCOk/hOTvpDCMReJLZ9WBaBBrHz9jA0hJ69a9QIFS4n8NqM2U1p14BwLcR eBH9AILUTvqTRl5Sj1+wXftT316Ij8b+gLcmNKltYDot4lruxlKyENfNca3hpo2Qck95 an5Yie1jE8vcSZO5SV+n8wUis7rVnqfFwrnUNTP/zCnMkXWAclAE973YRVLNZ/Fb/hbY LxdLLHkZQTjpjBew8FPAw93GlwNIs5OoXP2rZh1ZA5qsfb1QfpSR7TBqmJtqsR6Q2JTS QEBA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=rv+dn+LGbBQvxBBScyEywDk5ir9wodzF0mZ7GQX8FQ8=; fh=WtqLY0tzXNS233MsztgDgVRkY+g/p64StNH3EasKEp8=; b=his71Tx/b+at5KQMZfovtwhKWf8vbwSSAI6pk5XDzNKk2B0xV0QROxnDyz9JsE3lsZ epKzEfOVF6XACfIPdVcbt95LF+JaCdxE01g6XdCOjJlPDc+AMLoheHGSoXdqLH9BBve2 qVy1wsBkqvQrMUqSd5DekO9J3rMh8arTtAEw0M178837Kjoq8JISsoQuEe49cYYuqH/B EI/qaqldfIdEIX/NJ/CYWo3km8nwwzAh0o1Cu9zulGj5nANfXJ+6tp/t8dE5/+dQ3X2B X9wvgNMcS7//mIBkNR3ztRYc9Bh448/t+vU8h2gvGdkg93t4slZHRaNsFZKPKq3fAcE9 pW+w==; darn=ilbers.de ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b="R/SyNmZp"; spf=pass (google.com: domain of fm-1321639-20241126134726375493ffd7dbc82b92-zlo5kr@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1321639-20241126134726375493ffd7dbc82b92-zlO5Kr@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=1732628851; x=1733233651; darn=ilbers.de; 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=rv+dn+LGbBQvxBBScyEywDk5ir9wodzF0mZ7GQX8FQ8=; b=BolpPRJb6xC6surMuBBOUM+EF5mRkSHZ0uS8+dEI59S3lvjfcbUjy3z+e36Se+phXe DADHTODImsUGVFrnXJNnR8xUkYZgbnRqH5Y4QlkUSe/xuod/D2XhsbMI/OykPaRGUpze O6XTQ5ojBq/9q9cQIIQ9oD3v1gNVBU/lPDKg4D2bY1fe8ZjfVVxLA5eZEfeBAlLdQqAr hOU7K1A0HqZBBKfBBksoqmHMz+OHhUzqxm8ivJ1dPS0tR6h2Gcfy5yTysqhOPlyPsOt7 BUPDmeqhk48IvsrAucmGk2G9lIT7ae+osLUvDZByhGOyQMGfCca/OEOEX5MlozyRYiOv EKTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732628851; x=1733233651; 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=rv+dn+LGbBQvxBBScyEywDk5ir9wodzF0mZ7GQX8FQ8=; b=iUgXAaZiUZMudUuIfnwVwDqk6vrHlRXPpFfw4sw3W/m9cMKIn76N1JPAXCJ18byuEt wotjiUCAwA2j1/m+05wrqGClbywnMKYLmWtmPXLvPw4s5XmBs1tygqHG9vXRIMbZtRPy i0rBtEO2YjD+DlDaBlchT0A+MTtc2EXxFWqGxqEQVicsk8J2+VTzEorPi0McEZSVgY7+ w/Qf7x0kLDgrr/PY2IfVK56rYjZGin3iM+6M4PWIiI/aG5m1fX9FHYYe0zYWMh1kZ6NY aaCEvGjh2RVFgujz1LUfmGT/PwCxiD8kBbeahhdFErqOqaBKYEDriNZslxf/MagIevcu xMEw== X-Forwarded-Encrypted: i=2; AJvYcCXHKAX1D/+UwZGJsUpW3636BHwbrbGCcHhVGhWkWuP7gobNS6fPzvzBx2WoV0UzN7Oo2yH4@ilbers.de X-Gm-Message-State: AOJu0Ywi8EcvZQ/hWKgFJHNAcBl5mNClivUhvUGYaespHvwD2dcXHpS4 b1SDzc6+oynyJF2RmnWxzoY0PrJkU61gnFKdMXiYyIvgd1rp/rt9 X-Google-Smtp-Source: AGHT+IE/r8N6/0T3dtaaSZloT8L3maGRRL/yulMDvwC+xfy7f7iefRwgJ0idcaayErjIqYRt04Z28Q== X-Received: by 2002:a17:90b:1d82:b0:2ea:adaa:1a46 with SMTP id 98e67ed59e1d1-2eb0e8885fdmr19371146a91.36.1732628851270; Tue, 26 Nov 2024 05:47:31 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:90b:4b91:b0:2cb:5bad:6b1a with SMTP id 98e67ed59e1d1-2eaeae78f85ls3980176a91.0.-pod-prod-05-us; Tue, 26 Nov 2024 05:47:29 -0800 (PST) X-Received: by 2002:a17:90b:38ca:b0:2ea:3f34:f194 with SMTP id 98e67ed59e1d1-2eb0e233a0bmr20973128a91.10.1732628849651; Tue, 26 Nov 2024 05:47:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1732628849; cv=none; d=google.com; s=arc-20240605; b=gzhaxkN6KPeobp0ERErG3y66repSFu1HEPEAWA6XhbLqE5Pf/SxyKmIuMgQr5x66x+ QQTOexu5HvLIgNH7BUOlKXawc8zwCJrA6uh3uVIRFPTWLEo5M49Bm8pWn33htWF9LlIn NBRUFSbchFXarTnsF/NbrxR70sWDyUOn3XnTQerEtmvm1QwCI4aEV903cIX2WKYu4ihl bEt9bbJC9p+rLXxW6WzRyqdKNGdpPLiM3N5KWtN98U8v4uhupV+qfErRgzx1N2uFJzoF NRZN2lzQwEwodK+rx1O7v/yyzAlICIKOwhBbFH5j63i79mRlKatrLgLALnbWpwJJGhTA vOPA== 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:message-id:date :subject:cc:to:from:dkim-signature; bh=D//ChlKqgOsYDAPEXqHEFEebsaZ62h7uDbmaJGGOwj4=; fh=y4Q4sSo60XIDMfQl4kOzeqW/gQkja1RlhaZM6hZs/O8=; b=YGKTCRYG8oYWgQE0bGo/C4tlfjDen3GwtxD/l73XZIhLRDyAP95DX1zERpeBhBOLEQ sYpKnL0MCjsxLnjYubG+CSclVQwj1ICZQ5QUgpkSXrOlBF3AFblVCcrhpsKte+ikL4gj exj+G5kqQdOor59xTUUesr/cXP6I76oDotBh3WfQGHsi78IhkFw4HlZYn1jAwsXSGu4X D3YdeSklAZ3BnC373phjKs3+E8Jq1zs4wgH+EBZDV2+rNzmF0cRwjIG5oE17+l7fHHfX yGXL9u8EHVNGAUWk9es8pjqqhq+dMUZQZHKywWdsZlNdxq5/uqkFCN5LkGwg6uw0tngw l0bA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b="R/SyNmZp"; spf=pass (google.com: domain of fm-1321639-20241126134726375493ffd7dbc82b92-zlo5kr@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1321639-20241126134726375493ffd7dbc82b92-zlO5Kr@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net. [185.136.64.225]) by gmr-mx.google.com with ESMTPS id 98e67ed59e1d1-2edeed3b046si122574a91.0.2024.11.26.05.47.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Nov 2024 05:47:29 -0800 (PST) Received-SPF: pass (google.com: domain of fm-1321639-20241126134726375493ffd7dbc82b92-zlo5kr@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) client-ip=185.136.64.225; Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 20241126134726375493ffd7dbc82b92 for ; Tue, 26 Nov 2024 14:47:27 +0100 From: "'Felix Moessbauer' via isar-users" To: isar-users@googlegroups.com Cc: Felix Moessbauer Subject: [PATCH 1/1] remove trailing slash on source list entries Date: Tue, 26 Nov 2024 14:47:08 +0100 Message-Id: <20241126134708.1973449-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1321639: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=fm2 header.b="R/SyNmZp"; spf=pass (google.com: domain of fm-1321639-20241126134726375493ffd7dbc82b92-zlo5kr@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1321639-20241126134726375493ffd7dbc82b92-zlO5Kr@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 Content-Type: text/plain; charset="UTF-8" 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_DNSWL_BLOCKED,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-TUID: FOtiuf5xLCdP The deb and deb-src URLs in the official debian sources lists do not end with a slash. For unknown reasons this was not true for some of our list entries. While this does not make any problems functionally, it has an effect on caching, as our accesses cannot be cache-shared with the ones from other users (like docker container builds). It also leads to ugly looking access path when using snapshot mirrors. We fix it by removing the trailing slash. No functional change. Signed-off-by: Felix Moessbauer --- meta-isar/conf/distro/raspios-bookworm-64.list | 8 ++++---- meta-isar/conf/distro/raspios-bookworm.list | 8 ++++---- meta-isar/conf/distro/raspios-bullseye.list | 8 ++++---- meta-isar/conf/distro/ubuntu-common.inc | 2 +- meta/conf/distro/debian-bookworm.list | 4 ++-- meta/conf/distro/debian-bullseye.list | 4 ++-- meta/conf/distro/debian-buster.list | 4 ++-- meta/conf/distro/debian-common.conf | 2 +- meta/conf/distro/debian-trixie.list | 4 ++-- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/meta-isar/conf/distro/raspios-bookworm-64.list b/meta-isar/conf/distro/raspios-bookworm-64.list index bbdaa4c3..d9219940 100644 --- a/meta-isar/conf/distro/raspios-bookworm-64.list +++ b/meta-isar/conf/distro/raspios-bookworm-64.list @@ -1,9 +1,9 @@ deb http://deb.debian.org/debian bookworm main contrib non-free deb-src http://deb.debian.org/debian bookworm main contrib non-free -deb http://deb.debian.org/debian-security/ bookworm-security/updates main contrib non-free -deb-src http://deb.debian.org/debian-security/ bookworm-security/updates main contrib non-free +deb http://deb.debian.org/debian-security bookworm-security/updates main contrib non-free +deb-src http://deb.debian.org/debian-security bookworm-security/updates main contrib non-free deb http://deb.debian.org/debian bookworm-updates main contrib non-free deb-src http://deb.debian.org/debian bookworm-updates main contrib non-free -deb http://archive.raspberrypi.org/debian/ bookworm main -deb-src http://archive.raspberrypi.org/debian/ bookworm main +deb http://archive.raspberrypi.org/debian bookworm main +deb-src http://archive.raspberrypi.org/debian bookworm main diff --git a/meta-isar/conf/distro/raspios-bookworm.list b/meta-isar/conf/distro/raspios-bookworm.list index ea3bc6e1..8807caa3 100644 --- a/meta-isar/conf/distro/raspios-bookworm.list +++ b/meta-isar/conf/distro/raspios-bookworm.list @@ -1,5 +1,5 @@ -deb http://raspbian.raspberrypi.org/raspbian/ bookworm main contrib non-free rpi -deb-src http://raspbian.raspberrypi.org/raspbian/ bookworm main contrib non-free rpi +deb http://raspbian.raspberrypi.org/raspbian bookworm main contrib non-free rpi +deb-src http://raspbian.raspberrypi.org/raspbian bookworm main contrib non-free rpi -deb http://archive.raspberrypi.org/debian/ bookworm main -deb-src http://archive.raspberrypi.org/debian/ bookworm main +deb http://archive.raspberrypi.org/debian bookworm main +deb-src http://archive.raspberrypi.org/debian bookworm main diff --git a/meta-isar/conf/distro/raspios-bullseye.list b/meta-isar/conf/distro/raspios-bullseye.list index b6c8fd91..810b2753 100644 --- a/meta-isar/conf/distro/raspios-bullseye.list +++ b/meta-isar/conf/distro/raspios-bullseye.list @@ -1,5 +1,5 @@ -deb http://raspbian.raspberrypi.org/raspbian/ bullseye main contrib non-free rpi -deb-src http://raspbian.raspberrypi.org/raspbian/ bullseye main contrib non-free rpi +deb http://raspbian.raspberrypi.org/raspbian bullseye main contrib non-free rpi +deb-src http://raspbian.raspberrypi.org/raspbian bullseye main contrib non-free rpi -deb http://archive.raspberrypi.org/debian/ bullseye main -deb-src http://archive.raspberrypi.org/debian/ bullseye main +deb http://archive.raspberrypi.org/debian bullseye main +deb-src http://archive.raspberrypi.org/debian bullseye main diff --git a/meta-isar/conf/distro/ubuntu-common.inc b/meta-isar/conf/distro/ubuntu-common.inc index 692732cc..d3374baa 100644 --- a/meta-isar/conf/distro/ubuntu-common.inc +++ b/meta-isar/conf/distro/ubuntu-common.inc @@ -40,4 +40,4 @@ 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/${ISAR_APT_SNAPSHOT_DATE}/\n" +DISTRO_APT_SNAPSHOT_PREMIRROR ??= "(http|https)://archive.ubuntu.com/(.*) https://snapshot.ubuntu.com/\2/${ISAR_APT_SNAPSHOT_DATE}\n" diff --git a/meta/conf/distro/debian-bookworm.list b/meta/conf/distro/debian-bookworm.list index cbc0ca3b..e5440d0f 100644 --- a/meta/conf/distro/debian-bookworm.list +++ b/meta/conf/distro/debian-bookworm.list @@ -1,8 +1,8 @@ deb http://deb.debian.org/debian bookworm main contrib non-free-firmware non-free deb-src http://deb.debian.org/debian bookworm main contrib non-free-firmware non-free -deb http://deb.debian.org/debian-security/ bookworm-security main contrib non-free-firmware non-free -deb-src http://deb.debian.org/debian-security/ bookworm-security main contrib non-free-firmware non-free +deb http://deb.debian.org/debian-security bookworm-security main contrib non-free-firmware non-free +deb-src http://deb.debian.org/debian-security bookworm-security main contrib non-free-firmware non-free deb http://deb.debian.org/debian bookworm-updates main contrib non-free-firmware non-free deb-src http://deb.debian.org/debian bookworm-updates main contrib non-free-firmware non-free diff --git a/meta/conf/distro/debian-bullseye.list b/meta/conf/distro/debian-bullseye.list index 70ec8ef9..db1d98f1 100644 --- a/meta/conf/distro/debian-bullseye.list +++ b/meta/conf/distro/debian-bullseye.list @@ -1,8 +1,8 @@ deb http://deb.debian.org/debian bullseye main contrib non-free deb-src http://deb.debian.org/debian bullseye main contrib non-free -deb http://deb.debian.org/debian-security/ bullseye-security main contrib non-free -deb-src http://deb.debian.org/debian-security/ bullseye-security main contrib non-free +deb http://deb.debian.org/debian-security bullseye-security main contrib non-free +deb-src http://deb.debian.org/debian-security bullseye-security main contrib non-free deb http://deb.debian.org/debian bullseye-updates main contrib non-free deb-src http://deb.debian.org/debian bullseye-updates main contrib non-free diff --git a/meta/conf/distro/debian-buster.list b/meta/conf/distro/debian-buster.list index ba496494..b3a3b769 100644 --- a/meta/conf/distro/debian-buster.list +++ b/meta/conf/distro/debian-buster.list @@ -1,8 +1,8 @@ deb http://deb.debian.org/debian buster main contrib non-free deb-src http://deb.debian.org/debian buster main contrib non-free -deb http://deb.debian.org/debian-security/ buster/updates main contrib non-free -deb-src http://deb.debian.org/debian-security/ buster/updates main contrib non-free +deb http://deb.debian.org/debian-security buster/updates main contrib non-free +deb-src http://deb.debian.org/debian-security buster/updates main contrib non-free deb http://deb.debian.org/debian buster-updates main contrib non-free deb-src http://deb.debian.org/debian buster-updates main contrib non-free diff --git a/meta/conf/distro/debian-common.conf b/meta/conf/distro/debian-common.conf index 65b5b083..92a15404 100644 --- a/meta/conf/distro/debian-common.conf +++ b/meta/conf/distro/debian-common.conf @@ -40,4 +40,4 @@ 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/${ISAR_APT_SNAPSHOT_DATE}/\n" +DISTRO_APT_SNAPSHOT_PREMIRROR ??= "deb.debian.org/(.*) snapshot.debian.org/archive/\1/${ISAR_APT_SNAPSHOT_DATE}\n" diff --git a/meta/conf/distro/debian-trixie.list b/meta/conf/distro/debian-trixie.list index 4f5f665d..d0b042ce 100644 --- a/meta/conf/distro/debian-trixie.list +++ b/meta/conf/distro/debian-trixie.list @@ -1,8 +1,8 @@ deb http://deb.debian.org/debian trixie main contrib non-free-firmware non-free deb-src http://deb.debian.org/debian trixie main contrib non-free-firmware non-free -deb http://deb.debian.org/debian-security/ trixie-security main contrib non-free-firmware non-free -deb-src http://deb.debian.org/debian-security/ trixie-security main contrib non-free-firmware non-free +deb http://deb.debian.org/debian-security trixie-security main contrib non-free-firmware non-free +deb-src http://deb.debian.org/debian-security trixie-security main contrib non-free-firmware non-free deb http://deb.debian.org/debian trixie-updates main contrib non-free-firmware non-free deb-src http://deb.debian.org/debian trixie-updates main contrib non-free-firmware non-free -- 2.39.5 -- You received this message because you are subscribed to the Google Groups "isar-users" group. To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com. To view this discussion visit https://groups.google.com/d/msgid/isar-users/20241126134708.1973449-1-felix.moessbauer%40siemens.com.