Focal LTS 5.4.0-21.25

Dockerfile.dapper

@@ -1,10 +1,11 @@
-ARG APT_GCC=library/gcc:9.2
-
-FROM library/ubuntu:bionic AS bionic
+ARG BUILD=library/buildpack-deps:focal
+ARG UBUNTU=library/ubuntu:focal
 ARG DOWNLOADS=/usr/src/downloads
-ARG LINUX_FIRMWARE=linux-firmware=1.173.17
-ARG LINUX_SOURCE=linux-source-5.0.0=5.0.0-43.47~18.04.1
 
+FROM ${UBUNTU} AS ubuntu
+ARG DOWNLOADS
+ARG LINUX_FIRMWARE=linux-firmware=1.187
+ARG LINUX_SOURCE=linux-source-5.4.0=5.4.0-21.25
 ENV DEBIAN_FRONTEND=noninteractive
 RUN set -x \
  && apt-get --assume-yes update \
@@ -15,30 +16,32 @@ RUN set -x \
  && mv -vf linux-firmware* ${DOWNLOADS}/ubuntu-firmware.deb \
  && mv -vf linux-source* ${DOWNLOADS}/ubuntu-kernel.deb
 
-
-FROM ${APT_GCC}
-ARG DOWNLOADS=/usr/src/downloads
-COPY --from=bionic ${DOWNLOADS}/ ${DOWNLOADS}/
-RUN apt-get update \
-    && apt-get install -y \
-        kernel-wedge \
-        libncurses-dev \
-        fakeroot \
-        cpio \
-        bison \
-        flex \
-        ccache \
-        vim \
-        gnupg2 \
-        locales \
-        bc \
-        kmod \
-        libelf-dev \
-        rsync \
-        gawk  \
-        libudev-dev \
-        pciutils-dev \
-    && rm -f /bin/sh && ln -s /bin/bash /bin/sh
+FROM ${BUILD}
+ARG DOWNLOADS
+COPY --from=ubuntu ${DOWNLOADS}/ ${DOWNLOADS}/
+RUN apt-get --assume-yes update \
+ && apt-get --assume-yes install \
+    bc \
+    bison \
+    ccache \
+    cpio \
+    dkms \
+    fakeroot \
+    flex \
+    gawk  \
+    gcc-9 \
+    gnupg2 \
+    kernel-wedge \
+    kmod \
+    libelf-dev \
+    liblz4-tool \
+    libncurses-dev \
+    libpci-dev \
+    libudev-dev \
+    locales \
+    rsync \
+    vim \
+ && rm -f /bin/sh && ln -s /bin/bash /bin/sh
 
 ########## Dapper Configuration #####################
 

patches/bpfilter-umh.patch

@@ -1,7 +1,7 @@
-diff -urbB kernel.unpatched/debian.hwe/config/config.common.ubuntu kernel/debian.hwe/config/config.common.ubuntu
---- kernel.unpatched/debian.hwe/config/config.common.ubuntu	2019-09-30 22:23:05.000000000 +0000
-+++ kernel/debian.hwe/config/config.common.ubuntu	2019-10-15 01:24:35.804607723 +0000
-@@ -1121,7 +1121,7 @@
+diff -urbB kernel.unpatched/debian.master/config/config.common.ubuntu kernel/debian.master/config/config.common.ubuntu
+--- kernel.unpatched/debian.master/config/config.common.ubuntu  2020-04-01 00:47:16.499541862 +0000
++++ kernel/debian.master/config/config.common.ubuntu    2020-04-01 00:47:44.554871398 +0000
+@@ -1170,7 +1170,7 @@
  CONFIG_BOOT_PRINTK_DELAY=y
  CONFIG_BPF=y
  CONFIG_BPFILTER=y

patches/ikconfig-proc.patch

@@ -1,13 +1,13 @@
-diff -urbB kernel.unpatched/debian.hwe/config/config.common.ubuntu kernel/debian.hwe/config/config.common.ubuntu
---- kernel.unpatched/debian.hwe/config/config.common.ubuntu	2020-01-14 08:32:18.000000000 -0700
-+++ kernel/debian.hwe/config/config.common.ubuntu	2020-01-28 17:22:23.636051777 -0700
-@@ -4127,7 +4127,8 @@
+diff -urbB kernel.unpatched/debian.master/config/config.common.ubuntu kernel/debian.master/config/config.common.ubuntu
+--- kernel.unpatched/debian.master/config/config.common.ubuntu  2020-04-01 00:47:16.499541862 +0000
++++ kernel/debian.master/config/config.common.ubuntu    2020-04-01 00:47:44.554871398 +0000
+@@ -4311,7 +4311,8 @@
  CONFIG_IIO_TRIGGER=y
  CONFIG_IIO_TRIGGERED_BUFFER=m
  CONFIG_IIO_TRIGGERED_EVENT=m
 -# CONFIG_IKCONFIG is not set
 +CONFIG_IKCONFIG=m
 +CONFIG_IKCONFIG_PROC=y
+ CONFIG_IKHEADERS=m
  CONFIG_IMA=y
  CONFIG_IMA_APPRAISE=y
- CONFIG_IMA_APPRAISE_BOOTPARAM=y

scripts/package

@@ -11,16 +11,16 @@ GENERIC_EXTRA_DIR=dist/generic/modules-extra
 mkdir -p ${GENERIC_HEADERS_DIR} ${GENERIC_MAIN_DIR} ${GENERIC_EXTRA_DIR}
 
 # headers
-dpkg-deb -x build/linux-headers-5.0.*.deb ${GENERIC_HEADERS_DIR}/
-dpkg-deb -x build/linux-hwe-5.0-headers-*.deb ${GENERIC_HEADERS_DIR}/
+dpkg-deb -x build/linux-headers-5.*.deb ${GENERIC_HEADERS_DIR}/
+#dpkg-deb -x build/linux-hwe-5.*-headers-*.deb ${GENERIC_HEADERS_DIR}/
 
 # main modules and vmlinuz and firmware
-dpkg-deb -x build/linux-image-unsigned-5.0.*.deb ${GENERIC_MAIN_DIR}
-dpkg-deb -x build/linux-modules-5.0*.deb ${GENERIC_MAIN_DIR}
+dpkg-deb -x build/linux-image-unsigned-5.*.deb ${GENERIC_MAIN_DIR}
+dpkg-deb -x build/linux-modules-5.*.deb ${GENERIC_MAIN_DIR}
 dpkg-deb -x ${DOWNLOADS}/ubuntu-firmware.deb ${GENERIC_MAIN_DIR}
 
 # extra modules
-dpkg-deb -x build/linux-modules-extra-5.0*.deb ${GENERIC_EXTRA_DIR}
+dpkg-deb -x build/linux-modules-extra-5.*.deb ${GENERIC_EXTRA_DIR}
 
 # package artifacts
 mkdir -p dist/artifacts

scripts/prepare

@@ -4,6 +4,8 @@ set -e
 source $(dirname $0)/version
 cd $(dirname $0)/..
 
+set -x
+
 mkdir -p ${DOWNLOADS}/kernel ${DOWNLOADS}/firmware
 
 # kernel