Add Ubuntu 21.10 and use it in preference to 21.04

Author: mpe

README.md

@@ -20,13 +20,13 @@ Clone this repo.
 ```
 $ cd ci-scripts
 $ cd build
-$ make pull-image@ppc64le@ubuntu@21.04
-$ make SRC=~/src/linux kernel@ppc64le@ubuntu@21.04 JFACTOR=$(nproc)
+$ make pull-image@ppc64le@ubuntu@21.10
+$ make SRC=~/src/linux kernel@ppc64le@ubuntu@21.10 JFACTOR=$(nproc)
 ```
 
-This will build you a `ppc64le_defconfig` using the Ubuntu 21.04 toolchain.
+This will build you a `ppc64le_defconfig` using the Ubuntu 21.10 toolchain.
 
-The kernel will be in `output/ppc64le@ubuntu@21.04/ppc64le_defconfig/vmlinux`.
+The kernel will be in `output/ppc64le@ubuntu@21.10/ppc64le_defconfig/vmlinux`.
 
 For more help try `make help`.
 
@@ -36,14 +36,14 @@ Building different defconfigs
 You can specify a defconfig with `DEFCONFIG`.
 
 ```
-$ make SRC=~/src/linux kernel@ppc64le@ubuntu@21.04 DEFCONFIG=powernv_defconfig JFACTOR=$(nproc)
+$ make SRC=~/src/linux kernel@ppc64le@ubuntu@21.10 DEFCONFIG=powernv_defconfig JFACTOR=$(nproc)
 ```
 
 Note that the subarch (eg. `ppc64le`) needs to match the defconfig, so to build
 `ppc64_defconfig`, use `ppc64`.
 
 ```
-$ make SRC=~/src/linux kernel@ppc64@ubuntu@21.04 DEFCONFIG=ppc64_defconfig JFACTOR=$(nproc)
+$ make SRC=~/src/linux kernel@ppc64@ubuntu@21.10 DEFCONFIG=ppc64_defconfig JFACTOR=$(nproc)
 ```
 
 Different toolchains
@@ -56,6 +56,7 @@ There are images for various toolchains, they are encoded in the distro name/ver
  - kernel.org gcc 9.3.0 `korg@9.3.0`
  - kernel.org gcc 8.1.0 `korg@8.1.0`
  - kernel.org gcc 5.5.0 `korg@5.5.0`
+ - Ubuntu 21.10 `ubuntu@21.10`
  - Ubuntu 21.04 `ubuntu@21.04`
  - Ubuntu 20.10 `ubuntu@20.10`
  - Ubuntu 20.04 `ubuntu@20.04`
@@ -74,13 +75,13 @@ Building selftests
 To build the kernel selftests:
 
 ```
-$ make SRC=~/src/linux selftests@ppc64le@ubuntu@21.04 JFACTOR=$(nproc)
+$ make SRC=~/src/linux selftests@ppc64le@ubuntu@21.10 JFACTOR=$(nproc)
 ```
 
 Or just the powerpc selftests:
 
 ```
-$ make SRC=~/src/linux ppctests@ppc64le@ubuntu@21.04 JFACTOR=$(nproc)
+$ make SRC=~/src/linux ppctests@ppc64le@ubuntu@21.10 JFACTOR=$(nproc)
 ```
 
 You can also build the powerpc selftests with all available toolchains using:
@@ -94,17 +95,17 @@ Other options
 
 As mentioned above you pass the make -j factor with `JFACTOR=n`.
 
-To run sparse use the `ubuntu@21.04` image and pass `SPARSE=1`.
+To run sparse use the `ubuntu@21.10` image and pass `SPARSE=1`.
 
 ```
-$ make SRC=~/src/linux kernel@ppc64le@ubuntu@21.04 SPARSE=1 JFACTOR=$(nproc)
+$ make SRC=~/src/linux kernel@ppc64le@ubuntu@21.10 SPARSE=1 JFACTOR=$(nproc)
 ```
 
-The log will be in eg. `output/ppc64le@ubuntu@21.04/ppc64le_defconfig/sparse.log`.
+The log will be in eg. `output/ppc64le@ubuntu@21.10/ppc64le_defconfig/sparse.log`.
 
 To build modules pass `MODULES=1`
 
-To build with clang pass `CLANG=1`, only works using the Ubuntu `21.04` images.
+To build with clang pass `CLANG=1`, only works using the Ubuntu `21.10` images.
 
 For a quiet build pass `QUIET=1`, for verbose pass `VERBOSE=1`.
 
@@ -126,7 +127,7 @@ Building your own image
 If you don't want to pull an untrusted image, you can build it yourself with:
 
 ```
-$ make rebuild-image@ppc64le@ubuntu@21.04
+$ make rebuild-image@ppc64le@ubuntu@21.10
 ```
 
 Note that the build mounts the source tree read-only, so nothing it does can

build/Makefile

@@ -58,11 +58,11 @@ DOCS += docs@${1}@${2}
 endef
 
 FEDORA_DISTROS := fedora@34 fedora@33 fedora@32 fedora@31
-UBUNTU_DISTROS := ubuntu@21.04 ubuntu@20.10 ubuntu@20.04 ubuntu@18.04 ubuntu@16.04
+UBUNTU_DISTROS := ubuntu@21.10 ubuntu@21.04 ubuntu@20.10 ubuntu@20.04 ubuntu@18.04 ubuntu@16.04
 KORG_DISTROS := korg@11.1.0 korg@10.3.0 korg@9.3.0 korg@8.1.0 korg@5.5.0
 ALL_DISTROS := ${UBUNTU_DISTROS} ${KORG_DISTROS} ${FEDORA_DISTROS}
-DOCS_DISTRO := docs@21.04
-X86_DISTRO := ubuntu@21.04
+DOCS_DISTRO := docs@21.10
+X86_DISTRO := ubuntu@21.10
 SUBARCHES := ppc64le ppc64
 
 $(eval $(call MAIN_TEMPLATE,ppc64le,${DOCS_DISTRO}))

build/ubuntu/packages.sh

@@ -6,7 +6,7 @@ machine=$(uname -m)
 
 . /etc/os-release
 
-if [[ "$VERSION_ID" == "21.04" ]]; then
+if [[ "$VERSION_ID" == "21.10" ]]; then
     if [[ "$machine" != "x86_64" ]]; then
         PACKAGES+=" crossbuild-essential-amd64"
     fi