From f7be243edcf851408f2c9f00cc45c32d28259dff Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 19 Jun 2023 13:23:11 +0900 Subject: DEB buildscripts: update supported distros Signed-off-by: Michele Calgaro --- .../local/additional_files/etc/pbuilderrc | 34 +++++++--------------- 1 file changed, 10 insertions(+), 24 deletions(-) (limited to 'debian/_buildscripts/local/additional_files') diff --git a/debian/_buildscripts/local/additional_files/etc/pbuilderrc b/debian/_buildscripts/local/additional_files/etc/pbuilderrc index 29a522b1e..cecf04991 100644 --- a/debian/_buildscripts/local/additional_files/etc/pbuilderrc +++ b/debian/_buildscripts/local/additional_files/etc/pbuilderrc @@ -45,25 +45,25 @@ BASETGZ="/var/cache/pbuilder/base-$DISTRIBUTION@$ARCHITECTURE.tgz" #-- select apt components case "$DISTRIBUTION" in # debian - sid|bookwork|bullseye|buster|stretch) + sid|trixie|bookwork|bullseye|buster) COMPONENTS="main contrib non-free" ;; # devuan - ceres|daedalus|chimaera|beowulf|ascii) + ceres|daedalus|chimaera|beowulf) COMPONENTS="main" DEBOOTSTRAPOPTS=(--variant=buildd --no-check-gpg) EXTRAPACKAGES="$EXTRAPACKAGES devuan-keyring" ;; # ubuntu - kinetic|jammy|impish|hirsute|focal|bionic|xenial) + mantic|lunar|kinetic|jammy|focal|bionic) COMPONENTS="main restricted universe multiverse" DEBOOTSTRAPOPTS=(--variant=buildd) ;; # raspbian - raspbian-bookworm|raspbian-bullseye|raspbian-buster|raspbian-stretch) + raspbian-bookworm|raspbian-bullseye|raspbian-buster) COMPONENTS="main contrib non-free" DEBOOTSTRAPOPTS=(--variant=buildd --no-check-gpg) ;; @@ -73,17 +73,17 @@ EXTRAPACKAGES="$EXTRAPACKAGES fakeroot apt-transport-https ca-certificates" #-- select base apt sources case "$DISTRIBUTION" in # debian - sid|bookwork|bullseye|buster|stretch) + sid|trixie|bookwork|bullseye|buster) MIRRORSITE=http://deb.debian.org/debian ;; # devuan - ceres|daedalus|chimaera|beowulf|ascii) + ceres|daedalus|chimaera|beowulf) MIRRORSITE=http://auto.mirror.devuan.org/merged ;; # ubuntu - kinetic|jammy|impish|hirsute|focal|bionic|xenial) + mantic|lunar|kinetic|jammy|focal|bionic) if [ "$ARCHITECTURE" = "amd64" ] || [ "$ARCHITECTURE" = "i386" ]; then MIRRORSITE=http://archive.ubuntu.com/ubuntu else @@ -92,7 +92,7 @@ case "$DISTRIBUTION" in ;; # raspbian - raspbian-bookworm|raspbian-bullseye|raspbian-buster|raspbian-stretch) + raspbian-bookworm|raspbian-bullseye|raspbian-buster) MIRRORSITE=http://ftp.fi.muni.cz/pub/linux/raspbian/raspbian ;; esac @@ -117,19 +117,5 @@ if [ -z "$DEB_SIGN_KEYID" ]; then AUTO_DEBSIGN=${AUTO_DEBSIGN:-no} fi -#-- choose dependency solver -#-- apt is better if target distribution contains apt >= 1.4~beta3 -#-- aptitude is better if target distribution contains apt < 1.4~beta3 -case "$DISTRIBUTION" in - sid|bookwork|bullseye|buster|stretch|\ - ceres|daedalus|chimaera|beowulf|ascii|\ - raspbian-bookworm|raspbian-bullseye|raspbian-buster|raspbian-stretch|\ - kinetic|jammy|impish|hirsute|focal|bionic) - PBUILDERSATISFYDEPENDSCMD="/usr/lib/pbuilder/pbuilder-satisfydepends-apt" - ;; - - xenial) - PBUILDERSATISFYDEPENDSCMD="/usr/lib/pbuilder/pbuilder-satisfydepends-aptitude" - ;; -esac - +#-- dependency solver +PBUILDERSATISFYDEPENDSCMD="/usr/lib/pbuilder/pbuilder-satisfydepends-apt" -- cgit v1.2.1