feat: upgrade Linux to v5.4.10

This brings in the latest stable Linux. Signed-off-by: Andrew Rynhard <[email protected]>
siderolabs · Jan 11, 2020 · f1d387a · f1d387a
1 parent 0a4865b
commit f1d387a
Show file tree

Hide file tree

Showing 2 changed files with 81 additions and 81 deletions.
diff --git a/kernel/config-amd64 b/kernel/config-amd64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.8 Kernel Configuration
+# Linux/x86 5.4.10 Kernel Configuration
 #
 
 #

diff --git a/kernel/pkg.yaml b/kernel/pkg.yaml
@@ -2,90 +2,90 @@ name: kernel
 variant: scratch
 shell: /toolchain/bin/bash
 dependencies:
-  - image: "{{ .TOOLS_IMAGE }}"
+    - image: '{{ .TOOLS_IMAGE }}'
 steps:
-  - sources:
-      - url: https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.8.tar.xz
-        destination: linux.tar.xz
-        sha256: 42c414c902193f9e8a1b70c728ca440de02d85dc29102f52ef98cfbf20d29a52
-        sha512: 60e16c2080825f0cb8ff41022fcce7a413e23fbd337716da01369a78489b34ce4caf3fa388f1e71b7581ff6cd68671f9c2b07c68312b38e67fa15b71fd851309
-    prepare:
-      - |
-        tar -xJf linux.tar.xz --strip-components=1
+    - sources:
+          - url: https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.10.tar.xz
+            destination: linux.tar.xz
+            sha256: f23c0218a5e3b363bb5a880972f507bb4dc4a290a787a7da08be07ea12042edd
+            sha512: 6328ad7e18b6fa982415b0de75e3384f58ce8428bd8c212871a31f3885a0819d241138d384b2e6d1b74a1d260229a027f9c1674a65f5b6c48e6b25e3024a0974
+      prepare:
+          - |
+              tar -xJf linux.tar.xz --strip-components=1
 
-        mkdir /bin
-        ln -sv /toolchain/bin/bash /bin/bash
-        ln -sv /toolchain/bin/bash /bin/sh
-        ln -sv /toolchain/lib /lib
-        mkdir -p /usr/bin \
-            && ln -sf /toolchain/bin/env /usr/bin/env \
-            && ln -sf /toolchain/bin/true /bin/true \
-            && ln -sf /toolchain/bin/pwd /bin/pwd
+              mkdir /bin
+              ln -sv /toolchain/bin/bash /bin/bash
+              ln -sv /toolchain/bin/bash /bin/sh
+              ln -sv /toolchain/lib /lib
+              mkdir -p /usr/bin \
+                  && ln -sf /toolchain/bin/env /usr/bin/env \
+                  && ln -sf /toolchain/bin/true /bin/true \
+                  && ln -sf /toolchain/bin/pwd /bin/pwd
 
-        # Ensure that `make menuconfig` works.
+              # Ensure that `make menuconfig` works.
 
-        mkdir -p /usr/lib/pkgconfig
-        ln -s /toolchain/include /usr/include
+              mkdir -p /usr/lib/pkgconfig
+              ln -s /toolchain/include /usr/include
 
-        for lib in ncurses form panel menu ; do
-            rm -vf                    /lib/lib${lib}.so
-            echo "INPUT(-l${lib}w)" > /lib/lib${lib}.so
-            ln -sfv ${lib}w.pc        /lib/pkgconfig/${lib}.pc
-        done
+              for lib in ncurses form panel menu ; do
+                  rm -vf                    /lib/lib${lib}.so
+                  echo "INPUT(-l${lib}w)" > /lib/lib${lib}.so
+                  ln -sfv ${lib}w.pc        /lib/pkgconfig/${lib}.pc
+              done
 
-        case $ARCH in
-            x86_64)
-                make mrproper
-                cp -v /pkg/config-amd64 .config
-            ;;
-            aarch64)
-                export ARCH=arm64
-                make mrproper
-                cp -v /pkg/config-arm64 .config
-            ;;
-            *)
-                echo "unsupported arch ${ARCH}"
-                exit 1
-            ;;
-        esac
-    build:
-      - |
-        case $ARCH in
-            x86_64)
-            ;;
-            aarch64)
-                export ARCH=arm64
-            ;;
-            *)
-                echo "unsupported arch ${ARCH}"
-                exit 1
-            ;;
-        esac
-        make -j $(nproc)
-        make -j $(nproc) modules
-    install:
-      - |
-        mkdir -p /rootfs/boot
-        case $ARCH in
-            x86_64)
-                mv arch/x86/boot/bzImage /rootfs/boot/vmlinuz
-                mv vmlinux /rootfs/boot/vmlinux
-            ;;
-            aarch64)
-                export ARCH=arm64
-                mv arch/arm64/boot/Image.gz /rootfs/boot/vmlinuz
-                mv vmlinux /rootfs/boot/vmlinux
-            ;;
-            *)
-                echo "unsupported arch ${ARCH}"
-                exit 1
-            ;;
-        esac
-        export KERNELRELEASE=$(cat include/config/kernel.release)
-        make -j $(nproc) modules_install DEPMOD=/toolchain/bin/depmod INSTALL_MOD_PATH=/rootfs
-        depmod -b /rootfs $KERNELRELEASE
-        unlink /rootfs/lib/modules/$KERNELRELEASE/build
-        unlink /rootfs/lib/modules/$KERNELRELEASE/source
+              case $ARCH in
+                  x86_64)
+                      make mrproper
+                      cp -v /pkg/config-amd64 .config
+                  ;;
+                  aarch64)
+                      export ARCH=arm64
+                      make mrproper
+                      cp -v /pkg/config-arm64 .config
+                  ;;
+                  *)
+                      echo "unsupported arch ${ARCH}"
+                      exit 1
+                  ;;
+              esac
+      build:
+          - |
+              case $ARCH in
+                  x86_64)
+                  ;;
+                  aarch64)
+                      export ARCH=arm64
+                  ;;
+                  *)
+                      echo "unsupported arch ${ARCH}"
+                      exit 1
+                  ;;
+              esac
+              make -j $(nproc)
+              make -j $(nproc) modules
+      install:
+          - |
+              mkdir -p /rootfs/boot
+              case $ARCH in
+                  x86_64)
+                      mv arch/x86/boot/bzImage /rootfs/boot/vmlinuz
+                      mv vmlinux /rootfs/boot/vmlinux
+                  ;;
+                  aarch64)
+                      export ARCH=arm64
+                      mv arch/arm64/boot/Image.gz /rootfs/boot/vmlinuz
+                      mv vmlinux /rootfs/boot/vmlinux
+                  ;;
+                  *)
+                      echo "unsupported arch ${ARCH}"
+                      exit 1
+                  ;;
+              esac
+              export KERNELRELEASE=$(cat include/config/kernel.release)
+              make -j $(nproc) modules_install DEPMOD=/toolchain/bin/depmod INSTALL_MOD_PATH=/rootfs
+              depmod -b /rootfs $KERNELRELEASE
+              unlink /rootfs/lib/modules/$KERNELRELEASE/build
+              unlink /rootfs/lib/modules/$KERNELRELEASE/source
 finalize:
-  - from: /rootfs
-    to: /
+    - from: /rootfs
+      to: /