From d4ed3cb12e90e58fffe9923fb53507627b7a59f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20B=C3=B6hmke?= <benjamin@boehmke.net>
Date: Thu, 23 Jan 2020 19:19:42 +0100
Subject: [PATCH] updated to alpine 3.11

---
 Dockerfile         |  2 +-
 README.md          |  2 +-
 resources/build.sh | 10 ++++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5c5e566..edfead3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -54,7 +54,7 @@ ADD ./resources/uboot.c /uboot.c
 RUN arm-linux-gnueabi-gcc -Wall -static -static-libgcc -o /uboot_tool /uboot.c
 
 
-FROM alpine:3.10
+FROM alpine:3.11
 
 RUN apk update && \
     apk add automake build-base git autoconf confuse-dev linux-headers \
diff --git a/README.md b/README.md
index 47c1138..4a5309d 100644
--- a/README.md
+++ b/README.md
@@ -57,7 +57,7 @@ builder.
 
 | Variable                    | Default Value                        | Description                                                                                       |
 | --------------------------- | ------------------------------------ | ------------------------------------------------------------------------------------------------- |
-| ALPINE_BRANCH               | 3.10                                 | [Alpine Branch](https://wiki.alpinelinux.org/wiki/Alpine_Linux:Releases) to use for image         |
+| ALPINE_BRANCH               | 3.11                                 | [Alpine Branch](https://wiki.alpinelinux.org/wiki/Alpine_Linux:Releases) to use for image         |
 | ALPINE_MIRROR               | http://dl-cdn.alpinelinux.org/alpine | Mirror used for package download                                                                  |
 | CUSTOM_IMAGE_SCRIPT         | image.sh                             | Name of script for image customizations (relative to input dir)                                   |
 | DEFAULT_DROPBEAR_ENABLED    | true                                 | True to enable SSH server by default                                                              |
diff --git a/resources/build.sh b/resources/build.sh
index 0b6aa4e..4aee450 100755
--- a/resources/build.sh
+++ b/resources/build.sh
@@ -4,7 +4,7 @@ set -e
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 # User config
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-: ${ALPINE_BRANCH:="3.10"}
+: ${ALPINE_BRANCH:="3.11"}
 : ${ALPINE_MIRROR:="http://dl-cdn.alpinelinux.org/alpine"}
 
 : ${DEFAULT_TIMEZONE:="Etc/UTC"}
@@ -279,9 +279,9 @@ wget -P ${BOOTFS_PATH} https://github.com/raspberrypi/firmware/raw/master/boot/s
 wget -P ${BOOTFS_PATH} https://github.com/raspberrypi/firmware/raw/master/boot/start4db.elf
 wget -P ${BOOTFS_PATH} https://github.com/raspberrypi/firmware/raw/master/boot/start4x.elf
 
-# copy linux kernel and overlays to boot
-cp ${ROOTFS_PATH}/usr/lib/linux-*-rpi2/*.dtb ${BOOTFS_PATH}/
-cp -r ${ROOTFS_PATH}/usr/lib/linux-*-rpi2/overlays ${BOOTFS_PATH}/
+# copy linux device trees and overlays to boot
+cp ${ROOTFS_PATH}/boot/dtbs-rpi/*.dtb ${BOOTFS_PATH}/
+cp -r ${ROOTFS_PATH}/boot/dtbs-rpi/overlays ${BOOTFS_PATH}/
 
 # copy u-boot
 cp /uboot/* ${BOOTFS_PATH}/
@@ -350,6 +350,8 @@ rm -rf ${ROOTFS_PATH}/var/cache/apk/*
 rm -rf ${ROOTFS_PATH}/boot/initramfs*
 rm -rf ${ROOTFS_PATH}/boot/System*
 rm -rf ${ROOTFS_PATH}/boot/config*
+rm -rf ${ROOTFS_PATH}/boot/vmlinuz*
+rm -rf ${ROOTFS_PATH}/boot/dtbs-rpi*
 
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 # create image