Merge ~smoser/cirros:feature/support-kernel-4.15 into cirros:master

[Scott Moser]

bin/grab-kernels: Support kernel 4.15.

This adds support to grab-kernels for 4.15 kernels (from Ubuntu 18.04).

Ubuntu 18.04 dropped support for big endian power. That means that
we cannot build a cirros for those arch with a 4.15 kernel.
Currently the code here just warns when it sees that, so a 'build-release'
is probably going to fail if you don't trim the arches to build.

see commit message

[Murilo Opsfelder Araújo (mopsfelder)]

Hi, Scott.

Do we also need to remove lines 91 and 98, which sets 'xarch=powerpc flav=powerpc64-smp'?

[Scott Moser (smoser)]

@Murilo,

I intended to leave support in if the kernel was < 4.15.
3.2 or 4.4.* should still work and get us a powerpc and ppc64 kernel.

[Murilo Opsfelder Araújo (mopsfelder)]

Got it. Thanks.

review: Approve

Unmerged commits

a73f9d7... by Scott Moser on 2018-06-27

bin/grab-kernels: Support kernel 4.15.

This adds support to grab-kernels for 4.15 kernels (from Ubuntu 18.04).

Ubuntu 18.04 dropped support for big endian power. That means that
we cannot build a cirros for those arch with a 4.15 kernel.
Currently the code here just warns when it sees that, so a 'build-release'
is probably going to fail if you don't trim the arches to build.

diff --git a/bin/grab-kernels b/bin/grab-kernels
index 055a83d..6d99470 100755
--- a/bin/grab-kernels
+++ b/bin/grab-kernels
@@ -17,7 +17,7 @@
 
 source "${0%/*}/common-functions.sh"
 
-burl="https://launchpad.net/ubuntu/+archive/primary/+files/linux-image"
+burl="https://launchpad.net/ubuntu/+archive/primary/+files/linux"
 outdir="./download"
 def_arches="i386 x86_64 arm powerpc ppc64 ppc64le aarch64"
 
@@ -77,7 +77,7 @@ kminor=${kpart#*.}; kminor=${kminor%.*}
 kmicro=${kpart#*.*.}
 
 case "$kmajor.$kminor" in
-   3.2|3.13|3.19|4.4) :;;
+   3.2|3.13|3.19|4.4|4.15) :;;
    *) error "WARN: possibly unknown kernel version $kmajor.$kminor.";;
 esac
 
@@ -101,12 +101,30 @@ for arch in "$@"; do
             *) fail "unknown kernel:arch for $kver:$arch"
         esac
     fi
-    case $xarch in
-        amd64|i386|ppc64el|s390x) extra="-extra";;
-        *) extra="";
+    if [ "$xarch" = "powerpc" ]; then
+        case "$kmajor.$kminor" in
+            3.*|4.4) :;;
+            *)
+                error "WARNING: $arch is not supported with $kmajor.$kminor." \
+                    " Just skipping."
+                continue;;
+        esac
+    fi
+    extra=""
+    case "$kmajor.$kminor" in
+        3.*|4.4)
+            case $xarch in
+                amd64|i386|ppc64el|s390x) extra="-image-extra";;
+            esac
+            ;;
+        *)
+            # 4.15 changed image-extra to modules-extra and added arm64
+            case $xarch in
+                amd64|arm64|i386|ppc64el|s390x) extra="-modules-extra";;
+            esac
     esac
     debs=""
-    for epkg in "" $extra; do
+    for epkg in "-image" $extra; do
         url="$burl${epkg}-${kmajor}.${kminor}.${kmicro}-${abi}-${flav}_${kver}_${xarch}.deb"
         dl "$url" "$outdir/${url##*/}" || fail "failed dl $url"
         ln -sf ${url##*/} "$outdir/kernel-${arch}${epkg}.deb" ||