diff mbox

[kteam-tools] chroot-setup: Added artful

Message ID 20170421153300.13401-1-colin.king@canonical.com
State New
Headers show

Commit Message

Colin Ian King April 21, 2017, 3:33 p.m. UTC 
From: Colin Ian King <colin.king@canonical.com>

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 chroot-setup/scripts/build-mkschroot  | 14 +++++++-------
 chroot-setup/scripts/chroot-defs.conf |  5 ++++-
 2 files changed, 11 insertions(+), 8 deletions(-)

Comments

Joseph Salisbury April 21, 2017, 4:28 p.m. UTC | #1 
Do we want to remove EOL series such as Utopic?
Colin Ian King April 21, 2017, 4:30 p.m. UTC | #2 
On 21/04/17 17:28, Joseph Salisbury wrote:
> Do we want to remove EOL series such as Utopic?
> 
Not sure, I'll rather have that change in a different patch.
Colin Ian King April 26, 2017, 9:13 a.m. UTC | #3 
On 21/04/17 16:33, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  chroot-setup/scripts/build-mkschroot  | 14 +++++++-------
>  chroot-setup/scripts/chroot-defs.conf |  5 ++++-
>  2 files changed, 11 insertions(+), 8 deletions(-)
> 
> diff --git a/chroot-setup/scripts/build-mkschroot b/chroot-setup/scripts/build-mkschroot
> index c08e381f..ae5994fb 100755
> --- a/chroot-setup/scripts/build-mkschroot
> +++ b/chroot-setup/scripts/build-mkschroot
> @@ -121,7 +121,7 @@ ADDPKG="$ADDPKG docbook-utils gawk m4 bash-completion bc lzop libssl-dev libusbi
>  ADDPKG="$ADDPKG libpopt-dev libreadline6-dev"
>  ADDPKGDEP=
>  case $SUITE in
> -	precise|trusty|utopic|vivid|wily|xenial|yakkety|zesty)
> +	precise|trusty|utopic|vivid|wily|xenial|yakkety|zesty|artful)
>  		ADDPKG="$ADDPKG makedumpfile libdw-dev binutils-dev asciidoc ncurses-dev u-boot-tools libnewt-dev"
>  		ADDPKGDEP="$ADDPKGDEP linux xorg-server";
>  		case ${ARCH} in
> @@ -139,7 +139,7 @@ case $SUITE in
>  esac
>  
>  case $SUITE in
> -	precise|trusty|utopic|vivid|wily|xenial|yakkety|zesty)
> +	precise|trusty|utopic|vivid|wily|xenial|yakkety|zesty|artful)
>  	case ${ARCH} in
>  		i386|amd64)
>  			ADDPKG="$ADDPKG gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf";
> @@ -151,7 +151,7 @@ case $SUITE in
>  esac
>  
>  case $SUITE in
> -	trusty|utopic|vivid|wily|xenial|yakkety|zesty)
> +	trusty|utopic|vivid|wily|xenial|yakkety|zesty|artful)
>  	case ${ARCH} in
>  		i386|amd64)
>  			ADDPKG="$ADDPKG gcc-powerpc-linux-gnu g++-powerpc-linux-gnu";
> @@ -171,7 +171,7 @@ case $SUITE in
>  			;;
>  		esac
>  	;;
> -	trusty|utopic|vivid|wily|xenial|yakkety|zesty)
> +	trusty|utopic|vivid|wily|xenial|yakkety|zesty|artful)
>  		ADDPKG="$ADDPKG flex bison libunwind8-dev libaudit-dev python-dev libpci-dev";
>  	;;
>  	*)
> @@ -179,7 +179,7 @@ case $SUITE in
>  esac
>  
>  case $SUITE in
> -	trusty|utopic|vivid|wily|xenial|yakkety|zesty)
> +	trusty|utopic|vivid|wily|xenial|yakkety|zesty|artful)
>  		# armhf binaries fail with gcc-4.8, 4.7 has issues on manta.
>  		ADDPKG="$ADDPKG gcc-4.6 gcc-4.7"
>  		case $ARCH in
> @@ -194,7 +194,7 @@ case $SUITE in
>  esac
>  
>  case $SUITE in
> -	trusty|utopic|vivid|wily|xenial|yakkety|zesty)
> +	trusty|utopic|vivid|wily|xenial|yakkety|zesty|artful)
>  		ADDPKG="$ADDPKG libiberty-dev pkg-config dh-systemd"
>  		case $ARCH in
>  			amd64) ADDPKG="$ADDPKG gcc-arm-linux-gnueabihf gcc-arm-linux-gnueabi gcc-powerpc-linux-gnu gcc-aarch64-linux-gnu gcc-powerpc64le-linux-gnu gcc-s390x-linux-gnu"
> @@ -204,7 +204,7 @@ case $SUITE in
>  esac
>  
>  case $SUITE in
> -	xenial|yakkety|zesty)
> +	xenial|yakkety|zesty|artful)
>  		case $ARCH in
>  			amd64) ADDPKG="$ADDPKG gcc-s390x-linux-gnu snapcraft liblzma-dev patchutils"
>  			;;
> diff --git a/chroot-setup/scripts/chroot-defs.conf b/chroot-setup/scripts/chroot-defs.conf
> index 40db585d..67ebbc1a 100755
> --- a/chroot-setup/scripts/chroot-defs.conf
> +++ b/chroot-setup/scripts/chroot-defs.conf
> @@ -8,7 +8,7 @@ export SRC_ARCHIVE_PORTS=http://ports.ubuntu.com/ubuntu-ports
>  export DEF_DIR=usr3
>  export CH_ROOT=/${DEF_DIR}/chroots
>  
> -releases=([0]=dapper [1]=hardy [2]=karmic [3]=lucid [4]=maverick [5]=natty [6]=oneiric [7]=precise [8]=quantal [9]=android [10]=raring [11]=saucy [12]=trusty [13]=utopic [14]=vivid [15]=wily [16]=xenial [17]=yakkety [18]=zesty)
> +releases=([0]=dapper [1]=hardy [2]=karmic [3]=lucid [4]=maverick [5]=natty [6]=oneiric [7]=precise [8]=quantal [9]=android [10]=raring [11]=saucy [12]=trusty [13]=utopic [14]=vivid [15]=wily [16]=xenial [17]=yakkety [18]=zesty [19]=artful)
>  expired_releases=([0]=dapper [1]=karmic [2]=maverick [3]=natty [4]=hardy [5]=oneiric [6]=raring [7]=android [8]=quantal [9]=saucy [10]=lucid)
>  
>  arches[0]="i386 amd64"
> @@ -30,6 +30,7 @@ arches[15]="amd64 i386 armhf"
>  arches[16]="amd64 i386 armhf"
>  arches[17]="amd64 i386 armhf"
>  arches[18]="amd64 i386 armhf"
> +arches[19]="amd64 i386 armhf"
>  
>  pockets[0]="release security"
>  pockets[1]="release security"
> @@ -50,6 +51,7 @@ pockets[15]="release security"
>  pockets[16]="release security"
>  pockets[17]="release security"
>  pockets[18]="release security"
> +pockets[19]="release security"
>  
>  build_dep[0]="linux-source-2.6.15"
>  build_dep[1]="linux"
> @@ -70,6 +72,7 @@ build_dep[15]="linux"
>  build_dep[16]="linux"
>  build_dep[17]="linux"
>  build_dep[18]="linux"
> +build_dep[19]="linux"
>  
>  # Use as an index into mirror[] and mirror_ports[]
>  mirror_sites[3]="^deb .*ports\.ubuntu\.com"
> 
ping?
Kamal Mostafa April 26, 2017, 4:08 p.m. UTC | #4 
On Wed, Apr 26, 2017 at 10:13:49AM +0100, Colin Ian King wrote:
> On 21/04/17 16:33, Colin King wrote:
> > From: Colin Ian King <colin.king@canonical.com>
> > 
> > Signed-off-by: Colin Ian King <colin.king@canonical.com>
> > ---
> >  chroot-setup/scripts/build-mkschroot  | 14 +++++++-------
> >  chroot-setup/scripts/chroot-defs.conf |  5 ++++-

> ping?
> 

Colin, it looks like this change has already been applied, as:

    5ff259a Artful Opening: chroot-setup -- add artful

 -Kamal
Andy Whitcroft April 30, 2017, 6:03 a.m. UTC | #5 
On Wed, Apr 26, 2017 at 09:08:25AM -0700, Kamal Mostafa wrote:
> On Wed, Apr 26, 2017 at 10:13:49AM +0100, Colin Ian King wrote:
> > On 21/04/17 16:33, Colin King wrote:
> > > From: Colin Ian King <colin.king@canonical.com>
> > > 
> > > Signed-off-by: Colin Ian King <colin.king@canonical.com>
> > > ---
> > >  chroot-setup/scripts/build-mkschroot  | 14 +++++++-------
> > >  chroot-setup/scripts/chroot-defs.conf |  5 ++++-
> 
> > ping?
> > 
> 
> Colin, it looks like this change has already been applied, as:
> 
>     5ff259a Artful Opening: chroot-setup -- add artful
> 
>  -Kamal

Derp.  That was going on on the Artful Opening board.  Sorry for the
duplication.

-apw
diff mbox

Patch

diff --git a/chroot-setup/scripts/build-mkschroot b/chroot-setup/scripts/build-mkschroot
index c08e381f..ae5994fb 100755
--- a/chroot-setup/scripts/build-mkschroot
+++ b/chroot-setup/scripts/build-mkschroot
@@ -121,7 +121,7 @@  ADDPKG="$ADDPKG docbook-utils gawk m4 bash-completion bc lzop libssl-dev libusbi
 ADDPKG="$ADDPKG libpopt-dev libreadline6-dev"
 ADDPKGDEP=
 case $SUITE in
-	precise|trusty|utopic|vivid|wily|xenial|yakkety|zesty)
+	precise|trusty|utopic|vivid|wily|xenial|yakkety|zesty|artful)
 		ADDPKG="$ADDPKG makedumpfile libdw-dev binutils-dev asciidoc ncurses-dev u-boot-tools libnewt-dev"
 		ADDPKGDEP="$ADDPKGDEP linux xorg-server";
 		case ${ARCH} in
@@ -139,7 +139,7 @@  case $SUITE in
 esac
 
 case $SUITE in
-	precise|trusty|utopic|vivid|wily|xenial|yakkety|zesty)
+	precise|trusty|utopic|vivid|wily|xenial|yakkety|zesty|artful)
 	case ${ARCH} in
 		i386|amd64)
 			ADDPKG="$ADDPKG gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf";
@@ -151,7 +151,7 @@  case $SUITE in
 esac
 
 case $SUITE in
-	trusty|utopic|vivid|wily|xenial|yakkety|zesty)
+	trusty|utopic|vivid|wily|xenial|yakkety|zesty|artful)
 	case ${ARCH} in
 		i386|amd64)
 			ADDPKG="$ADDPKG gcc-powerpc-linux-gnu g++-powerpc-linux-gnu";
@@ -171,7 +171,7 @@  case $SUITE in
 			;;
 		esac
 	;;
-	trusty|utopic|vivid|wily|xenial|yakkety|zesty)
+	trusty|utopic|vivid|wily|xenial|yakkety|zesty|artful)
 		ADDPKG="$ADDPKG flex bison libunwind8-dev libaudit-dev python-dev libpci-dev";
 	;;
 	*)
@@ -179,7 +179,7 @@  case $SUITE in
 esac
 
 case $SUITE in
-	trusty|utopic|vivid|wily|xenial|yakkety|zesty)
+	trusty|utopic|vivid|wily|xenial|yakkety|zesty|artful)
 		# armhf binaries fail with gcc-4.8, 4.7 has issues on manta.
 		ADDPKG="$ADDPKG gcc-4.6 gcc-4.7"
 		case $ARCH in
@@ -194,7 +194,7 @@  case $SUITE in
 esac
 
 case $SUITE in
-	trusty|utopic|vivid|wily|xenial|yakkety|zesty)
+	trusty|utopic|vivid|wily|xenial|yakkety|zesty|artful)
 		ADDPKG="$ADDPKG libiberty-dev pkg-config dh-systemd"
 		case $ARCH in
 			amd64) ADDPKG="$ADDPKG gcc-arm-linux-gnueabihf gcc-arm-linux-gnueabi gcc-powerpc-linux-gnu gcc-aarch64-linux-gnu gcc-powerpc64le-linux-gnu gcc-s390x-linux-gnu"
@@ -204,7 +204,7 @@  case $SUITE in
 esac
 
 case $SUITE in
-	xenial|yakkety|zesty)
+	xenial|yakkety|zesty|artful)
 		case $ARCH in
 			amd64) ADDPKG="$ADDPKG gcc-s390x-linux-gnu snapcraft liblzma-dev patchutils"
 			;;
diff --git a/chroot-setup/scripts/chroot-defs.conf b/chroot-setup/scripts/chroot-defs.conf
index 40db585d..67ebbc1a 100755
--- a/chroot-setup/scripts/chroot-defs.conf
+++ b/chroot-setup/scripts/chroot-defs.conf
@@ -8,7 +8,7 @@  export SRC_ARCHIVE_PORTS=http://ports.ubuntu.com/ubuntu-ports
 export DEF_DIR=usr3
 export CH_ROOT=/${DEF_DIR}/chroots
 
-releases=([0]=dapper [1]=hardy [2]=karmic [3]=lucid [4]=maverick [5]=natty [6]=oneiric [7]=precise [8]=quantal [9]=android [10]=raring [11]=saucy [12]=trusty [13]=utopic [14]=vivid [15]=wily [16]=xenial [17]=yakkety [18]=zesty)
+releases=([0]=dapper [1]=hardy [2]=karmic [3]=lucid [4]=maverick [5]=natty [6]=oneiric [7]=precise [8]=quantal [9]=android [10]=raring [11]=saucy [12]=trusty [13]=utopic [14]=vivid [15]=wily [16]=xenial [17]=yakkety [18]=zesty [19]=artful)
 expired_releases=([0]=dapper [1]=karmic [2]=maverick [3]=natty [4]=hardy [5]=oneiric [6]=raring [7]=android [8]=quantal [9]=saucy [10]=lucid)
 
 arches[0]="i386 amd64"
@@ -30,6 +30,7 @@  arches[15]="amd64 i386 armhf"
 arches[16]="amd64 i386 armhf"
 arches[17]="amd64 i386 armhf"
 arches[18]="amd64 i386 armhf"
+arches[19]="amd64 i386 armhf"
 
 pockets[0]="release security"
 pockets[1]="release security"
@@ -50,6 +51,7 @@  pockets[15]="release security"
 pockets[16]="release security"
 pockets[17]="release security"
 pockets[18]="release security"
+pockets[19]="release security"
 
 build_dep[0]="linux-source-2.6.15"
 build_dep[1]="linux"
@@ -70,6 +72,7 @@  build_dep[15]="linux"
 build_dep[16]="linux"
 build_dep[17]="linux"
 build_dep[18]="linux"
+build_dep[19]="linux"
 
 # Use as an index into mirror[] and mirror_ports[]
 mirror_sites[3]="^deb .*ports\.ubuntu\.com"