From patchwork Tue Nov 26 13:47:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Moessbauer X-Patchwork-Id: 3962 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:38 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-pj1-f59.google.com (mail-pj1-f59.google.com [209.85.216.59]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 4AQDlbgA007500 (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-f59.google.com with SMTP id 98e67ed59e1d1-2e59d872d09sf5435293a91.0 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=l3bfKV7+HpRYKwXNDcifiIw5OBApufDn9hJvTPI/iZ98WurVv98EgirVEGAMGHaY37 3wJPe2RtZ6l8PAtujLqZfkRwIxWflJqdHr5nOX7PLYjKKbFf2IrsNTZ5UJU4sZPUvSE7 9ib1GlTj+9+R6a2UmVHE1AuFIciDPC1Gr7TFNVpU7asNEezzjGMuY99oVUEXB64Ofdmi JG7cjxFzJIucgeookhkoOERfH9OkYEpVEeYQwfPQm42Xjt1a/uTmN3oqC7J8Eo5B1pTa 9EjWMgjE6Ge3kT6UpkLNeTpTptIsqevEbZQU82IRQcL9Y6mD6maNvFsaHfWS2T0wxkd7 GYAQ== 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=y4kHpQdZPirTJdzCVTyX9OnU5O+rz9Vhqi+iTNCre5M=; b=ZwXYYwcKwFCJ1LJus3nvpFPbzMTy/+oKVkqyJOzkcxoN63mYBezovm7UNcLFtbg0x2 SK+oPSRXYjN4HJAFSKTT9DmPseK8UVX2VsSr9gjO9IAnLXBiUbroDmXJxqviwsl1sWa3 W3P59vCj4zP9tz8hq0Tm8cGR5UYSnLK6LP/FcPyxJCw8nCyukg/+z6sraNKuPo8AH1MG qo+16jhhJUnv9oSCx3lJkvZYdLDRtZ53gCQvAm2CDXjV2xeCvVNklPL/Z5A0j6gI/SOB ppOaVV7U+or45ii6lotK/prN2fkKEK61EElGx2D1OBEaxte6RrMyJTXyO/f6Tb6z84q1 HplQ==; darn=isar-build.org 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=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:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=rv+dn+LGbBQvxBBScyEywDk5ir9wodzF0mZ7GQX8FQ8=; b=EuJk4IjEI8H2+TP3WuSCzhTTWMtz1nSlvL4+37kjTCs1IVIai+TLDSeBlBw7kB7uG7 WXOqx8m9Xgpa9xXNuSy9Ajmf2i7uubW44E+T26Ln8+KOErmyGO7sSFyyJEH4TplR+erU 9diQz7qxKZOK3pskM6E2XR8x/fERnhUBmOOZFRaIqF6ST6MRUh5EnaYw84sMWI18pBo8 whHhzVzVUZ2jgNzKQcCSy+bFZDvRf6f4j5u5wfx5+8GD3Kn7P6F0PGm/B30lLwAHVOz0 f38HDNozBV6xKJIJrYq6TihQ0d58Xks26AkUxa/6izB+CquTGERQA/IYtJ2JT2EKvLLL RQxA== 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=Bqy9Hvj9pywM7uCXZKeOPVmHm4qXKFl9aFjyPWY9x3eDaphPDTXU7W9f6x7Wz+jHPU KsInMTkhwx87ZpnLX847fd/jViKBRS1qSIuApF6MmKzZsK61LZfwd3lggweYYtbI4Lnk NkV1FixqeEIlp15xYa2lphdI/T1W4BYzv9BH6ljDL/B7mM1zMbJj0a6O2FbzjfyRkW2L UtBQ2VjSOpVA2eLpx0Zr6s+Cd6WzjNvB9tPCKUn3aFqsV7L5X07iPhZJ8CyEWmxujSsR cFU/cRMX+dRdGr2DxtNxbcqs+8QCjgiB01ja2gezI7QAg5Qx+CLtU6hH0OspDlHPt26O oPyQ== X-Forwarded-Encrypted: i=2; AJvYcCW/999uPMLkZ04VmiZaZP9b45zr4bHl1JirfiyyDAjq1wc49RCevjpcqv/7SuveyxYxE6Mjlvs=@isar-build.org X-Gm-Message-State: AOJu0YwH+RUC/m/FATV7nafpFI+ax9x2R3anJRtwwcUnRBLj1Vtrpy2C l12AQvy8u1KTG45a1aeQjCCuSy3J/NCPXa87AA38bFD5N5NeTdWf 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 X-Patchwork-Original-From: "'Felix Moessbauer' via isar-users" From: Felix Moessbauer 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 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= 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