From 5f6545d58da1af2e36379f5e0961717939fe9809 Mon Sep 17 00:00:00 2001 From: Florian Wilhelm <2292245+fwilhe@users.noreply.github.com> Date: Tue, 19 Dec 2023 14:50:45 +0100 Subject: [PATCH] Update to debian trixie (#28) --- README.md | 4 ++-- builder/bootstrap | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9580f40..f24e902 100644 --- a/README.md +++ b/README.md @@ -35,8 +35,8 @@ In addition to the above components, your configuration directory must include t - `get_commit`: This script should output the Git commit used to tag the build artifacts. - `get_repo`: This script should output the apt package repository to use. - `get_timestamp`: This script should output the timestamp to be used instead of the real system time, ensuring reproducibility of builds. -- `get_version`: This script should output the version of the package repository to use. For example, use `bookworm` for Debian or `today` for Garden Linux. -- `keyring.gpg`: The PGP key used to validate the package repository. For Debian, you can obtain this key from the [debian-archive-keyring](https://packages.debian.org/bookworm/debian-archive-keyring) package. +- `get_version`: This script should output the version of the package repository to use. For example, use `trixie` for Debian or `today` for Garden Linux. +- `keyring.gpg`: The PGP key used to validate the package repository. For Debian, you can obtain this key from the [debian-archive-keyring](https://packages.debian.org/trixie/debian-archive-keyring) package. For a quick start guide on setting up your own config directory with your own features checkout [getting_started.md](docs/getting_started.md). diff --git a/builder/bootstrap b/builder/bootstrap index 4699149..bc8cde4 100755 --- a/builder/bootstrap +++ b/builder/bootstrap @@ -11,7 +11,7 @@ output="$5" chroot_dir="$(mktemp -d)" mount -t tmpfs -o size=2G tmpfs "$chroot_dir" chmod 755 "$chroot_dir" -container=lxc debootstrap --keyring "$keyring" --arch "$arch" --variant minbase "$version" "$chroot_dir" "$repo" bookworm || (cat "$chroot_dir/debootstrap/debootstrap.log"; false) +container=lxc debootstrap --keyring "$keyring" --arch "$arch" --variant minbase "$version" "$chroot_dir" "$repo" trixie || (cat "$chroot_dir/debootstrap/debootstrap.log"; false) gpg --keyring "$keyring" --no-default-keyring --export -a > "$chroot_dir/etc/apt/trusted.gpg.d/keyring.asc" echo "deb $repo $version main" > "$chroot_dir/etc/apt/sources.list"