Skip to content

Commit

Permalink
replace sources.list's with deb822.sources
Browse files Browse the repository at this point in the history
  • Loading branch information
@crpb
crpb committed Jan 8, 2025
1 parent 6883fa8 commit 3785bd0
Show file tree
Hide file tree
Showing 21 changed files with 248 additions and 58 deletions.
7 changes: 0 additions & 7 deletions config/files/etc/apt/sources.list.d/debian.list/DEBIAN_BOOKWORM
View file

This file was deleted.

7 changes: 0 additions & 7 deletions config/files/etc/apt/sources.list.d/debian.list/DEBIAN_BULLSEYE
View file

This file was deleted.

11 changes: 0 additions & 11 deletions config/files/etc/apt/sources.list.d/debian.list/DEBIAN_STABLE
View file

This file was deleted.

7 changes: 0 additions & 7 deletions config/files/etc/apt/sources.list.d/debian.list/DEBIAN_TESTING
View file

This file was deleted.

7 changes: 0 additions & 7 deletions config/files/etc/apt/sources.list.d/debian.list/DEBIAN_TRIXIE
View file

This file was deleted.

3 changes: 0 additions & 3 deletions config/files/etc/apt/sources.list.d/debian.list/DEBIAN_UNSTABLE
View file

This file was deleted.

32 changes: 32 additions & 0 deletions config/files/etc/apt/sources.list.d/debian.sources/DEBIAN_BOOKWORM
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
Types: deb
URIs: http://deb.debian.org/debian/
Suites: bookworm
Components: main contrib non-free-firmware non-free
Enabled: yes
Signed-By:
/usr/share/keyrings/debian-archive-keyring.gpg

Types: deb-src
URIs: http://deb.debian.org/debian/
Suites: bookworm
Components: main contrib non-free-firmware non-free
Enabled: yes
Signed-By:
/usr/share/keyrings/debian-archive-keyring.gpg

Types: deb
URIs: http://deb.debian.org/debian-security
Suites: bookworm-security
Components: main contrib non-free-firmware non-free
Enabled: yes
Signed-By:
/usr/share/keyrings/debian-archive-keyring.gpg

Types: deb-src
URIs: http://deb.debian.org/debian-security
Suites: bookworm-security
Components: main contrib non-free-firmware non-free
Enabled: yes
Signed-By:
/usr/share/keyrings/debian-archive-keyring.gpg

32 changes: 32 additions & 0 deletions config/files/etc/apt/sources.list.d/debian.sources/DEBIAN_BULLSEYE
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
Types: deb
URIs: http://deb.debian.org/debian/
Suites: bullseye
Components: main contrib non-free
Enabled: yes
Signed-By:
/usr/share/keyrings/debian-archive-keyring.gpg

Types: deb-src
URIs: http://deb.debian.org/debian/
Suites: bullseye
Components: main contrib non-free
Enabled: yes
Signed-By:
/usr/share/keyrings/debian-archive-keyring.gpg

Types: deb
URIs: http://deb.debian.org/debian-security
Suites: bullseye-security
Components: main contrib non-free
Enabled: yes
Signed-By:
/usr/share/keyrings/debian-archive-keyring.gpg

Types: deb-src
URIs: http://deb.debian.org/debian-security
Suites: bullseye-security
Components: main contrib non-free
Enabled: yes
Signed-By:
/usr/share/keyrings/debian-archive-keyring.gpg

48 changes: 48 additions & 0 deletions config/files/etc/apt/sources.list.d/debian.sources/DEBIAN_STABLE
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
Types: deb
URIs: http://deb.debian.org/debian/
Suites: stable
Components: main contrib non-free-firmware non-free
Enabled: yes
Signed-By:
/usr/share/keyrings/debian-archive-keyring.gpg

Types: deb-src
URIs: http://deb.debian.org/debian/
Suites: stable
Components: main contrib non-free-firmware non-free
Enabled: yes
Signed-By:
/usr/share/keyrings/debian-archive-keyring.gpg

Types: deb
URIs: http://deb.debian.org/debian-security
Suites: stable-security
Components: main contrib non-free-firmware non-free
Enabled: yes
Signed-By:
/usr/share/keyrings/debian-archive-keyring.gpg

Types: deb-src
URIs: http://deb.debian.org/debian-security
Suites: stable-security
Components: main contrib non-free-firmware non-free
Enabled: yes
Signed-By:
/usr/share/keyrings/debian-archive-keyring.gpg

Types: deb
URIs: http://deb.debian.org/debian/
Suites: stable-backports
Components: main contrib non-free-firmware non-free
Enabled: yes
Signed-By:
/usr/share/keyrings/debian-archive-keyring.gpg

Types: deb-src
URIs: http://deb.debian.org/debian/
Suites: stable-backports
Components: main contrib non-free-firmware non-free
Enabled: yes
Signed-By:
/usr/share/keyrings/debian-archive-keyring.gpg

32 changes: 32 additions & 0 deletions config/files/etc/apt/sources.list.d/debian.sources/DEBIAN_TESTING
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
Types: deb
URIs: http://deb.debian.org/debian/
Suites: testing
Components: main contrib non-free-firmware non-free
Enabled: yes
Signed-By:
/usr/share/keyrings/debian-archive-keyring.gpg

Types: deb-src
URIs: http://deb.debian.org/debian/
Suites: testing
Components: main contrib non-free-firmware non-free
Enabled: yes
Signed-By:
/usr/share/keyrings/debian-archive-keyring.gpg

Types: deb
URIs: http://deb.debian.org/debian-security/
Suites: testing-security
Components: main contrib non-free-firmware non-free
Enabled: yes
Signed-By:
/usr/share/keyrings/debian-archive-keyring.gpg

Types: deb-src
URIs: http://deb.debian.org/debian-security/
Suites: testing-security
Components: main contrib non-free-firmware non-free
Enabled: yes
Signed-By:
/usr/share/keyrings/debian-archive-keyring.gpg

32 changes: 32 additions & 0 deletions config/files/etc/apt/sources.list.d/debian.sources/DEBIAN_TRIXIE
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
Types: deb
URIs: http://deb.debian.org/debian/
Suites: trixie
Components: main contrib non-free-firmware non-free
Enabled: yes
Signed-By:
/usr/share/keyrings/debian-archive-keyring.gpg

Types: deb-src
URIs: http://deb.debian.org/debian/
Suites: trixie
Components: main contrib non-free-firmware non-free
Enabled: yes
Signed-By:
/usr/share/keyrings/debian-archive-keyring.gpg

Types: deb
URIs: http://deb.debian.org/debian-security
Suites: trixie-security
Components: main contrib non-free-firmware non-free
Enabled: yes
Signed-By:
/usr/share/keyrings/debian-archive-keyring.gpg

Types: deb-src
URIs: http://deb.debian.org/debian-security
Suites: trixie-security
Components: main contrib non-free-firmware non-free
Enabled: yes
Signed-By:
/usr/share/keyrings/debian-archive-keyring.gpg

16 changes: 16 additions & 0 deletions config/files/etc/apt/sources.list.d/debian.sources/DEBIAN_UNSTABLE
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
Types: deb
URIs: http://deb.debian.org/debian/
Suites: sid
Components: main contrib non-free-firmware non-free
Enabled: yes
Signed-By:
/usr/share/keyrings/debian-archive-keyring.gpg

Types: deb-src
URIs: http://deb.debian.org/debian/
Suites: sid
Components: main contrib non-free-firmware non-free
Enabled: yes
Signed-By:
/usr/share/keyrings/debian-archive-keyring.gpg

3 changes: 0 additions & 3 deletions config/files/etc/apt/sources.list.d/grml-live.list/GRMLBASE
View file

This file was deleted.

16 changes: 16 additions & 0 deletions config/files/etc/apt/sources.list.d/grml-live.sources/GRMLBASE
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
Types: deb
URIs: http://deb.grml.org/
Suites: grml-live
Components: main
Enabled: yes
Signed-By:
/etc/apt/trusted.gpg.d/grml-archive-keyring.gpg

Types: deb-src
URIs: http://deb.grml.org/
Suites: grml-live
Components: main
Enabled: yes
Signed-By:
/etc/apt/trusted.gpg.d/grml-archive-keyring.gpg

3 changes: 0 additions & 3 deletions config/files/etc/apt/sources.list.d/grml-stable.list/GRMLBASE
View file

This file was deleted.

16 changes: 16 additions & 0 deletions config/files/etc/apt/sources.list.d/grml-stable.sources/GRMLBASE
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
Types: deb
URIs: http://deb.grml.org/
Suites: grml-stable
Components: main
Enabled: yes
Signed-By:
/etc/apt/trusted.gpg.d/grml-archive-keyring.gpg

Types: deb-src
URIs: http://deb.grml.org/
Suites: grml-stable
Components: main
Enabled: yes
Signed-By:
/etc/apt/trusted.gpg.d/grml-archive-keyring.gpg

3 changes: 0 additions & 3 deletions config/files/etc/apt/sources.list.d/grml-testing.list/GRMLBASE
View file

This file was deleted.

16 changes: 16 additions & 0 deletions config/files/etc/apt/sources.list.d/grml-testing.sources/GRMLBASE
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
Types: deb
URIs: http://deb.grml.org/
Suites: grml-testing
Components: main
Enabled: yes
Signed-By:
/etc/apt/trusted.gpg.d/grml-archive-keyring.gpg

Types: deb-src
URIs: http://deb.grml.org/
Suites: grml-testing
Components: main
Enabled: yes
Signed-By:
/etc/apt/trusted.gpg.d/grml-archive-keyring.gpg

9 changes: 4 additions & 5 deletions config/hooks/updatebase.GRMLBASE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,10 @@ fcopy -M -i -B -v -r /etc/apt
if [ -n "${WAYBACK_DATE:-}" ] ; then
echo "Wayback date '$WAYBACK_DATE' identified, enabling for snapshot.debian.org usage."

perl -pi -e "s#^(\s+)(deb.* )(.*://deb.debian.org.*?)\s+([a-z-]+)\s+(.*)\$#\$1\$2 [check-valid-until=no] http://snapshot.debian.org/archive/debian/$WAYBACK_DATE/ \$4 \$5#" \
"${target}/etc/apt/sources.list.d/debian.list"

perl -pi -e "s#^(\s+)(deb.* )(.*://security.debian.org.*?)\s+([a-z-/]+)\s+(.*)\$#\$1\$2 [check-valid-until=no] http://snapshot.debian.org/archive/debian-security/$WAYBACK_DATE/ \$4 \$5#" \
"${target}/etc/apt/sources.list.d/debian.list"
perl -pi -e 'BEGIN { $d="'"$WAYBACK_DATE"'"; }
s#^(URIs:)\s+(.*://deb.debian.org.*?)$#$1 http://snapshot.debian.org/archive/debian/$d/#' \
"${target}/etc/apt/sources.list.d/debian.sources"
sed -i '/^Suites/a Check-Valid-Unit: no' "${target}/etc/apt/sources.list.d/debian.sources"
fi

## END OF FILE #################################################################
Expand Down
5 changes: 3 additions & 2 deletions config/scripts/GRMLBASE/33-aptsetup
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ target=${target:?}
if ifclass RELEASE ; then
set -u
current_date=$(date +%Y%m%d)
perl -pi -e 'BEGIN { $d="'"$current_date"'"; } s#^(\s+)(deb.* )(.*://deb.debian.org.*?)\s+([a-z-]+)\s+(.*)$#$1$2http://snapshot.debian.org/archive/debian/$d/ $4 $5#' \
"${target}/etc/apt/sources.list.d/debian.list"
perl -pi -e 'BEGIN { $d="'"$current_date"'"; } \
s#^(URIs:)\s+(.*://deb.debian.org.*?)$#$1 http://snapshot.debian.org/archive/debian/$d/#' \
"${target}/etc/apt/sources.list.d/debian.sources"
fi

## END OF FILE #################################################################
Expand Down
1 change: 1 addition & 0 deletions grml-live
View file
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,7 @@ echo " main directory: $OUTPUT"
[ -n "$GRML_NAME" ] && echo " Grml name: $GRML_NAME"
[ -n "$RELEASENAME" ] && echo " Release name: $RELEASENAME"
[ -n "$DATE" ] && echo " Build date: $DATE"
[ -n "$WAYBACK_DATE" ] && echo " Wayback date: $WAYBACK_DATE"
[ -n "$VERSION" ] && echo " Grml version: $VERSION"
[ -n "$SUITE" ] && echo " Debian suite: $SUITE"
[ -n "$ARCH" ] && echo " Architecture: $ARCH"
Expand Down

0 comments on commit 3785bd0

Please sign in to comment.