diff -Nru ubuntu-dev-tools-0.162/debian/changelog ubuntu-dev-tools-0.164/debian/changelog --- ubuntu-dev-tools-0.162/debian/changelog 2018-04-05 16:58:15.000000000 +0000 +++ ubuntu-dev-tools-0.164/debian/changelog 2018-04-24 11:24:43.000000000 +0000 @@ -1,3 +1,15 @@ +ubuntu-dev-tools (0.164) unstable; urgency=medium + + * mk-sbuild: Initialise ubuntu_dist_ge vars so unknown releases work. + + -- Adam Conrad Tue, 24 Apr 2018 05:24:43 -0600 + +ubuntu-dev-tools (0.163) unstable; urgency=medium + + * mk-sbuild: Add ubuntu_dist_ge and use it to set BUILD_PKGS for Ubuntu. + + -- Adam Conrad Tue, 24 Apr 2018 05:11:18 -0600 + ubuntu-dev-tools (0.162) unstable; urgency=medium [ Mattia Rizzolo ] diff -Nru ubuntu-dev-tools-0.162/mk-sbuild ubuntu-dev-tools-0.164/mk-sbuild --- ubuntu-dev-tools-0.162/mk-sbuild 2018-04-05 16:52:06.000000000 +0000 +++ ubuntu-dev-tools-0.164/mk-sbuild 2018-04-24 11:24:38.000000000 +0000 @@ -330,6 +330,31 @@ exit 1 fi +if [ "$DISTRO" = "ubuntu" ]; then + ubuntu_dist_ge() { + local releases="$(ubuntu-distro-info --all)" + local left=999 + local right=0 + local seq=1 + for i in $releases; do + if [ $1 = $i ]; then + local left=$seq + break + fi + seq=$((seq+1)) + done + seq=1 + for i in $releases; do + if [ $2 = $i ]; then + local right=$seq + break + fi + seq=$((seq+1)) + done + [ $left -ge $right ] && return 0 || return 1 + } +fi + # By default, name the schroot the same as the release if [ -z "$name" ]; then name="$RELEASE" @@ -494,11 +519,17 @@ esac fi # Add edgy+ buildd tools - if [ "$RELEASE" != "breezy" ] && [ "$RELEASE" != "dapper" ]; then + if ubuntu_dist_ge "$RELEASE" "edgy"; then + # Add pkgbinarymangler (edgy and later) + BUILD_PKGS="$BUILD_PKGS pkgbinarymangler" # Disable recommends for a smaller chroot (gutsy and later only) - BUILD_PKGS="--no-install-recommends $BUILD_PKGS" - # Add buildd tools - BUILD_PKGS="$BUILD_PKGS pkg-create-dbgsym pkgbinarymangler" + if ubuntu_dist_ge "$RELEASE" "gutsy"; then + BUILD_PKGS="--no-install-recommends $BUILD_PKGS" + fi + # Add pkg-create-dbgsym (edgy through zesty) + if ! ubuntu_dist_ge "$RELEASE" "artful"; then + BUILD_PKGS="$BUILD_PKGS pkg-create-dbgsym" + fi fi ;; debian)