From b1bed08f723b6d61f0b941f0061f15d3126cbe79 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Fri, 2 Aug 2019 00:26:17 +0100 Subject: [PATCH 1/4] pkg/firmware: Fix directory layout Copy firmaware files to the correct directory. Instead of // copy it to /. Signed-off-by: Rolf Neugebauer --- pkg/firmware/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/firmware/Dockerfile b/pkg/firmware/Dockerfile index be3ade96a..761327a7d 100644 --- a/pkg/firmware/Dockerfile +++ b/pkg/firmware/Dockerfile @@ -33,7 +33,7 @@ RUN tar xf /kernel.tar # Copy files required by the modules RUN set -e && \ for fw in $(find /lib/modules -name \*.ko -exec modinfo --field=firmware {} \;); do \ - mkdir -p "/out/lib/firmware/$fw" && \ + mkdir -p "/out/lib/firmware/$(dirname $fw)" && \ cp "/linux-firmware/$fw" "/out/lib/firmware/$fw"; \ done From f6695a7e03bed9d6445ab43f065b66f107220f12 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Fri, 2 Aug 2019 00:28:39 +0100 Subject: [PATCH 2/4] pkg/firmware: Update the kernel package to a newer version. Signed-off-by: Rolf Neugebauer --- pkg/firmware/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/firmware/Dockerfile b/pkg/firmware/Dockerfile index 761327a7d..5873b42d6 100644 --- a/pkg/firmware/Dockerfile +++ b/pkg/firmware/Dockerfile @@ -1,5 +1,5 @@ # Make modules from a recentish kernel available -FROM linuxkit/kernel:4.14.28 AS kernel +FROM linuxkit/kernel:4.14.126 AS kernel FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS build RUN apk add --no-cache git kmod From 3c0131e2e10c19f724c3b11c250590b3de352601 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Fri, 2 Aug 2019 00:32:09 +0100 Subject: [PATCH 3/4] pkg/firmware: Update to latest firmware package Signed-off-by: Rolf Neugebauer --- pkg/firmware-all/Dockerfile | 2 +- pkg/firmware/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/firmware-all/Dockerfile b/pkg/firmware-all/Dockerfile index 547fbd7ea..ad1531caf 100644 --- a/pkg/firmware-all/Dockerfile +++ b/pkg/firmware-all/Dockerfile @@ -3,7 +3,7 @@ RUN apk add --no-cache git # Make sure you also update the FW_COMMIT in ../firmware/Dockerfile ENV FW_URL=git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git -ENV FW_COMMIT=9ee52be785cf91fc6a3c6aa27d484873f8270b72 +ENV FW_COMMIT=dff98c6c57383fe343407bcb7b6e775e0b87274f RUN mkdir -p /out/lib && \ cd /out/lib && \ diff --git a/pkg/firmware/Dockerfile b/pkg/firmware/Dockerfile index 5873b42d6..5ec850768 100644 --- a/pkg/firmware/Dockerfile +++ b/pkg/firmware/Dockerfile @@ -7,7 +7,7 @@ RUN apk add --no-cache git kmod # Clone the firmware repository # Make sure you also update the FW_COMMIT in ../firmware-all/Dockerfile ENV FW_URL=git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git -ENV FW_COMMIT=9ee52be785cf91fc6a3c6aa27d484873f8270b72 +ENV FW_COMMIT=dff98c6c57383fe343407bcb7b6e775e0b87274f WORKDIR / RUN git clone ${FW_URL} && \ cd /linux-firmware && \ From a380dd70d415f9d0a418d30271493dbc992fd91d Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Fri, 2 Aug 2019 00:46:11 +0100 Subject: [PATCH 4/4] examples: Update firmware image to latest Signed-off-by: Rolf Neugebauer --- examples/packet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/packet.yml b/examples/packet.yml index 735472203..cfebbb2b4 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -7,7 +7,7 @@ init: - linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a - linuxkit/containerd:2e7e59b8af98a1cec834dc9fe7aba271bf4b0a41 - linuxkit/ca-certificates:v0.7 - - linuxkit/firmware:v0.7 + - linuxkit/firmware:e246ab4c77bc4e70b53db091371a699fced5e01d onboot: - name: rngd1 image: linuxkit/rngd:02c555b50cd1887aa628836662d2eec54c0d7e81