diff --git a/debians-arm.csv b/debians-arm.csv index 81aabf6..e4679d5 100644 --- a/debians-arm.csv +++ b/debians-arm.csv @@ -9,8 +9,14 @@ debian,bookworm,arm64 debian,sid,armhf debian,sid,arm64 +debian,experimental,armhf +debian,experimental,arm64 + ubuntu,jammy,armhf ubuntu,jammy,arm64 ubuntu,kinetic,armhf ubuntu,kinetic,arm64 + +ubuntu,lunar,armhf +ubuntu,lunar,arm64 diff --git a/debians-x86.csv b/debians-x86.csv index 8c93355..4a4eff8 100644 --- a/debians-x86.csv +++ b/debians-x86.csv @@ -9,6 +9,11 @@ debian,bookworm,amd64 debian,sid,i386 debian,sid,amd64 +debian,experimental,i386 +debian,experimental,amd64 + ubuntu,jammy,amd64 ubuntu,kinetic,amd64 + +ubuntu,lunar,amd64 diff --git a/scripts/build-debian b/scripts/build-debian index 0e7dc18..b10d4fd 100755 --- a/scripts/build-debian +++ b/scripts/build-debian @@ -44,6 +44,15 @@ ubuntu-armhf|ubuntu-arm64) ;; esac +case "${OS}-${ARCH}-${DIST}" in +debian-*-rc-buggy|debian-*-experimental) + TARGET=testing + ;; +*) + TARGET="${DIST}" + ;; +esac + # Create fresh empty directory TMP=$(mktemp -d -p "${PWD}" tmp-XXXXXX) trap 'rm -rf "${TMP}"' EXIT INT TERM @@ -62,7 +71,7 @@ systemd-sysv,\ u-boot-tools,\ initramfs-tools,\ openssh-server \ - "${DIST}" \ + "${TARGET}" \ debian \ "${URL}" \ "${SCRIPT}" @@ -72,7 +81,15 @@ PASSWORD="${PASSWORD_OVERRIDE:-$(pwgen -B -A 6 1)}" # Write apt sources config case "${OS}-${ARCH}-${DIST}" in -debian-*-sid) +debian-*-rc-buggy|debian-*-experimental) + tee debian/tmp/sources.list <<- EOF +deb http://deb.debian.org/debian ${TARGET} main +deb-src http://deb.debian.org/debian ${TARGET} main +deb http://deb.debian.org/debian ${DIST} main +deb-src http://deb.debian.org/debian ${DIST} main +EOF + ;; +debian-*-sid|debian-*-testing) tee debian/tmp/sources.list <<- EOF deb http://deb.debian.org/debian ${DIST} main deb-src http://deb.debian.org/debian ${DIST} main @@ -110,6 +127,19 @@ EOF ;; esac +case "${OS}-${ARCH}-${DIST}" in +debian-*-rc-buggy|debian-*-experimental) + # For Debian Experimental, set higher priority to "experimental" + tee debian/tmp/priority-experimental <<- EOF +Package: * +Pin: release o=Debian,a=experimental +Pin-Priority: 700 +EOF + ;; +*) + ;; +esac + cp -rv --preserve=mode ../2nd-stage-files/pre-2nd-stage-files/* debian cp -rv --preserve=mode ../2nd-stage-files/pre-2nd-stage-files-${ARCH}/* debian @@ -120,6 +150,7 @@ cp -v /usr/bin/qemu-*-static debian/usr/bin || : chroot debian /bin/sh -ex <<- EOF /debootstrap/debootstrap --second-stage /bin/mv /tmp/sources.list /etc/apt/sources.list +/bin/mv /tmp/priority-experimental /etc/apt/preferences.d/priority-experimental || : /usr/bin/apt-get update /usr/bin/apt-get -y --no-install-recommends install ${KERNEL} /usr/bin/apt-get -y upgrade