From 1cc929c40d861f67b0f65d1fee7f0ba0c8144c02 Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Tue, 1 Sep 2015 08:41:36 -0600 Subject: [PATCH] rm references to "quantal" Ubuntu 12.10 (Quantal Quetzal) reached EOL May 16 2014. Remove support from the tree. https://lists.ubuntu.com/archives/ubuntu-announce/2014-April/000183.html --- ceph-build/build/build_deb | 2 -- ceph-build/build/setup_pbuilder | 1 - ceph-deploy/build/build | 2 +- deb_dists | 1 - gen_debian_version.sh | 1 - update_pbuilder.sh | 1 - 6 files changed, 1 insertion(+), 7 deletions(-) diff --git a/ceph-build/build/build_deb b/ceph-build/build/build_deb index 8bd9ea54..cd45a217 100644 --- a/ceph-build/build/build_deb +++ b/ceph-build/build/build_deb @@ -16,7 +16,6 @@ get_bptag() { [ "$dist" = "lenny" ] && dver="~bpo50+1" [ "$dist" = "trusty" ] && dver="$dist" [ "$dist" = "saucy" ] && dver="$dist" - [ "$dist" = "quantal" ] && dver="$dist" [ "$dist" = "precise" ] && dver="$dist" [ "$dist" = "oneiric" ] && dver="$dist" [ "$dist" = "natty" ] && dver="$dist" @@ -113,7 +112,6 @@ gen_debian_version() { [ "$dist" = "squeeze" ] && dver="$raw~bpo60+1" [ "$dist" = "lenny" ] && dver="$raw~bpo50+1" [ "$dist" = "precise" ] && dver="$raw$dist" - [ "$dist" = "quantal" ] && dver="$raw$dist" [ "$dist" = "saucy" ] && dver="$raw$dist" [ "$dist" = "trusty" ] && dver="$raw$dist" diff --git a/ceph-build/build/setup_pbuilder b/ceph-build/build/setup_pbuilder index e1f7b1a1..a232c250 100755 --- a/ceph-build/build/setup_pbuilder +++ b/ceph-build/build/setup_pbuilder @@ -27,7 +27,6 @@ sudo mkdir -p "$basedir" os="debian" [ "$DIST" = "precise" ] && os="ubuntu" -[ "$DIST" = "quantal" ] && os="ubuntu" [ "$DIST" = "saucy" ] && os="ubuntu" [ "$DIST" = "trusty" ] && os="ubuntu" diff --git a/ceph-deploy/build/build b/ceph-deploy/build/build index 76975d0a..91220ee6 100644 --- a/ceph-deploy/build/build +++ b/ceph-deploy/build/build @@ -115,7 +115,7 @@ then REPO=debian-repo COMPONENT=main KEYID=${KEYID:-03C3951A} # default is autobuild keyid - DEB_DIST="sid wheezy squeeze jessie quantal precise raring trusty" + DEB_DIST="sid wheezy squeeze jessie precise raring trusty" DEB_BUILD=$(lsb_release -s -c) #XXX only releases until we fix this RELEASE=1 diff --git a/deb_dists b/deb_dists index e7f96b6a..98de8815 100644 --- a/deb_dists +++ b/deb_dists @@ -3,7 +3,6 @@ wheezy squeeze jessie raring -quantal precise saucy trusty diff --git a/gen_debian_version.sh b/gen_debian_version.sh index 306ba8d0..7df61d5b 100755 --- a/gen_debian_version.sh +++ b/gen_debian_version.sh @@ -11,7 +11,6 @@ dist=$2 [ "$dist" = "trusty" ] && dver="$raw$dist" [ "$dist" = "saucy" ] && dver="$raw$dist" [ "$dist" = "raring" ] && dver="$raw$dist" -[ "$dist" = "quantal" ] && dver="$raw$dist" [ "$dist" = "precise" ] && dver="$raw$dist" [ "$dist" = "oneiric" ] && dver="$raw$dist" [ "$dist" = "natty" ] && dver="$raw$dist" diff --git a/update_pbuilder.sh b/update_pbuilder.sh index 586582da..a1ace664 100755 --- a/update_pbuilder.sh +++ b/update_pbuilder.sh @@ -23,7 +23,6 @@ do [ "$dist" = "saucy" ] && os="ubuntu" [ "$dist" = "trusty" ] && os="ubuntu" [ "$dist" = "precise" ] && os="ubuntu" - [ "$dist" = "quantal" ] && os="ubuntu" [ "$dist" = "oneiric" ] && os="ubuntu" [ "$dist" = "natty" ] && os="ubuntu" [ "$dist" = "maverick" ] && os="ubuntu" -- 2.39.5