diff options
| -rw-r--r-- | debian/_buildscripts/local/additional_files/etc/pbuilderrc | 12 | ||||
| -rw-r--r-- | debian/_buildscripts/local/internals/distro_list.txt | 7 |
2 files changed, 10 insertions, 9 deletions
diff --git a/debian/_buildscripts/local/additional_files/etc/pbuilderrc b/debian/_buildscripts/local/additional_files/etc/pbuilderrc index 8f4d36184..599489272 100644 --- a/debian/_buildscripts/local/additional_files/etc/pbuilderrc +++ b/debian/_buildscripts/local/additional_files/etc/pbuilderrc @@ -58,14 +58,14 @@ case "$DISTRIBUTION" in ;; # devuan - ceres|beowulf|ascii) + ceres|chimaera|beowulf|ascii) COMPONENTS="main" DEBOOTSTRAPOPTS=(--variant=buildd --no-check-gpg) EXTRAPACKAGES="$EXTRAPACKAGES devuan-keyring" ;; # ubuntu - focal|eoan|disco|cosmic|bionic|xenial|trusty) + groovy|focal|eoan|disco|bionic|xenial|trusty) COMPONENTS="main restricted universe multiverse" DEBOOTSTRAPOPTS=(--variant=buildd) ;; @@ -98,12 +98,12 @@ case "$DISTRIBUTION" in ;; # devuan - ceres|beowulf|ascii) + ceres|chimaera|beowulf|ascii) MIRRORSITE=http://auto.mirror.devuan.org/merged ;; # ubuntu - focal|eoan|disco|cosmic|bionic|xenial|trusty) + groovy|focal|eoan|disco|bionic|xenial|trusty) if [ "$ARCHITECTURE" = "amd64" ] || [ "$ARCHITECTURE" = "i386" ]; then MIRRORSITE=http://archive.ubuntu.com/ubuntu else @@ -147,9 +147,9 @@ fi #-- aptitude is better if target distribution contains apt < 1.4~beta3 case "$DISTRIBUTION" in sid|bullseye|buster|stretch|\ - ceres|beowulf|ascii|\ + ceres|chimaera|beowulf|ascii|\ raspbian-bullseye|raspbian-buster|raspbian-stretch|\ - focal|eoan|disco|cosmic|bionic) + groovy|focal|eoan|disco|bionic) PBUILDERSATISFYDEPENDSCMD="/usr/lib/pbuilder/pbuilder-satisfydepends-apt" ;; diff --git a/debian/_buildscripts/local/internals/distro_list.txt b/debian/_buildscripts/local/internals/distro_list.txt index 3490402b0..84184c1b0 100644 --- a/debian/_buildscripts/local/internals/distro_list.txt +++ b/debian/_buildscripts/local/internals/distro_list.txt @@ -20,8 +20,9 @@ debian 12.0 sid ~b - # devuan devuan 1.0 jessie - debian/jessie devuan 2.0 ascii - debian/stretch -devuan 3.0 beowulf ~a debian/buster -devuan 4.0 ceres ~b debian/sid +devuan 3.0 beowulf - debian/buster +devuan 4.0 chimaera ~a debian/bullseye +devuan 5.0 ceres ~b debian/sid # raspbian raspbian 8.0 raspbian-jessie - - @@ -33,7 +34,7 @@ raspbian 11.0 raspbian-bullseye ~a - ubuntu 14.04 trusty - - ubuntu 16.04 xenial - - ubuntu 18.04 bionic - - -ubuntu 18.10 cosmic - - ubuntu 19.04 disco - - ubuntu 19.10 eoan - - ubuntu 20.04 focal - - +ubuntu 20.10 groovy ~a - |