From e418d29a9a4348240d3027d293f11e30a2b88aef Mon Sep 17 00:00:00 2001
From: Andrew Rynhard <andrew@andrewrynhard.com>
Date: Tue, 27 Mar 2018 20:53:10 -0700
Subject: [PATCH] feat(*): update to linux 4.15.13 (#30)

---
 kernel/.conform.yaml    | 4 ++--
 kernel/src/linux/config | 2 +-
 tools/.conform.yaml     | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/kernel/.conform.yaml b/kernel/.conform.yaml
index 033f25d2c..ca8a1396c 100644
--- a/kernel/.conform.yaml
+++ b/kernel/.conform.yaml
@@ -2,7 +2,7 @@ metadata:
   repository: dianemo/kernel
   variables:
     artifacts: /artifacts
-    srcLinux: https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.15.4.tar.xz
+    srcLinux: https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.15.13.tar.xz
 pipeline:
   stages:
   - build
@@ -21,7 +21,7 @@ tasks:
       RUN mkdir /tmp
       RUN make -j $(($(nproc) / 2))
       RUN make modules_install INSTALL_MOD_PATH=/tmp
-      RUN depmod -b /tmp 4.15.4-dianemo
+      RUN depmod -b /tmp 4.15.13-dianemo
       RUN cp arch/x86/boot/bzImage /tmp/vmlinuz
       FROM scratch
       COPY --from={{ .Docker.CurrentStage }} /tmp /tmp
diff --git a/kernel/src/linux/config b/kernel/src/linux/config
index 8cf5c8922..ec4f17ecd 100644
--- a/kernel/src/linux/config
+++ b/kernel/src/linux/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.15.4 Kernel Configuration
+# Linux/x86 4.15.13 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
diff --git a/tools/.conform.yaml b/tools/.conform.yaml
index 9c6ab88b1..d3f2a83de 100644
--- a/tools/.conform.yaml
+++ b/tools/.conform.yaml
@@ -20,7 +20,7 @@ metadata:
     srcFindutils: http://ftp.gnu.org/gnu/findutils/findutils-4.6.0.tar.gz
     srcFlex: https://github.com/westes/flex/releases/download/v2.6.4/flex-2.6.4.tar.gz
     srcGawk: http://ftp.gnu.org/gnu/gawk/gawk-4.2.0.tar.xz
-    srcGcc: http://ftp.gnu.org/gnu/gcc/gcc-7.2.0/gcc-7.2.0.tar.xz
+    srcGcc: http://ftp.gnu.org/gnu/gcc/gcc-7.3.0/gcc-7.3.0.tar.xz
     srcGdbm: http://ftp.gnu.org/gnu/gdbm/gdbm-1.13.tar.gz
     srcGettext: http://ftp.gnu.org/gnu/gettext/gettext-0.19.8.1.tar.xz
     srcGit: https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.16.2.tar.xz
@@ -33,7 +33,7 @@ metadata:
     srcKmod: https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-25.tar.xz
     srcLibcap: https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.25.tar.xz
     srcLibffi: ftp://sourceware.org/pub/libffi/libffi-3.2.1.tar.gz
-    srcLinux: https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.15.4.tar.xz
+    srcLinux: https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.15.13.tar.xz
     srcLzip: http://download.savannah.gnu.org/releases/lzip/lzip-1.20.tar.gz
     srcM4: http://ftp.gnu.org/gnu/m4/m4-1.4.18.tar.xz
     srcMake: http://ftp.gnu.org/gnu/make/make-4.2.1.tar.gz
@@ -579,7 +579,7 @@ tasks:
           --disable-nls \
           --disable-libstdcxx-threads \
           --disable-libstdcxx-pch \
-          --with-gxx-include-dir=$PREFIX/$TARGET/include/c++/7.2.0
+          --with-gxx-include-dir=$PREFIX/$TARGET/include/c++/7.3.0
       RUN make -j $(($(nproc) / 2))
       RUN make install
   linux-headers:
@@ -776,7 +776,7 @@ tasks:
       COPY --from={{ .Repository }}:toolchain-phase-2 /tools /tools
   toolchain-phase-1:
     template: |
-      FROM debian:buster
+      FROM debian:buster-20180213
       RUN apt-get -y update \
           && apt-get -y install --no-install-recommends \
           build-essential \