main/alpine-conf: update-kernel fixes

ref #5883
ref #5884

4 files changed, 162 insertions, 4 deletions

diff --git a/main/alpine-conf/0001-update-kernel-fix-rpi-missing-overlays.patch b/main/alpine-conf/0001-update-kernel-fix-rpi-missing-overlays.patch
new file mode 100644
index 0000000000..115998c6e4
--- /dev/null
+++ b/main/alpine-conf/0001-update-kernel-fix-rpi-missing-overlays.patch
@@ -0,0 +1,27 @@
+From 010bc7742962b4d5530ea65bff64f2e03db8639e Mon Sep 17 00:00:00 2001
+From: ScrumpyJack <scrumpyjack@st.ilet.to>
+Date: Wed, 22 Jun 2016 09:26:32 +0000
+Subject: [PATCH 1/3] update-kernel: fix rpi missing overlays
+
+Fixes the Linux raspberry pi dtoverlays not being copied into the
+update-kernel destination directory.
+---
+ update-kernel.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/update-kernel.in b/update-kernel.in
+index 248c3d1..34a193d 100644
+--- a/update-kernel.in
++++ b/update-kernel.in
+@@ -240,7 +240,7 @@ if [ "$ARM" ]; then
+     DTBDIR=$ROOT/usr/lib/linux-$KVER
+     [ "$BUILDDIR" ] && DTBDIR=$BUILDDIR/source/arch/arm/boot/dts
+     cp -a "$DTBDIR"/* $DTB_STAGING
+-    find "$DTB_STAGING" -type f \! -name "*.dtb" -delete
++    find "$DTB_STAGING" -type f \! \( -name "*.dtb" -o -name "*.dtbo"\)  -delete
+ fi
+ 
+ 
+-- 
+2.9.1
+
diff --git a/main/alpine-conf/0002-update-kernel-fix-find-unpaired.patch b/main/alpine-conf/0002-update-kernel-fix-find-unpaired.patch
new file mode 100644
index 0000000000..7b7fd8fb45
--- /dev/null
+++ b/main/alpine-conf/0002-update-kernel-fix-find-unpaired.patch
@@ -0,0 +1,26 @@
+From 37f3d5249c16a9166ff1c63ba031c6d4c9b86183 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
+Date: Sat, 9 Jul 2016 11:44:16 +0300
+Subject: [PATCH 2/3] update-kernel: fix "find: unpaired '('"
+
+fixes #5883
+---
+ update-kernel.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/update-kernel.in b/update-kernel.in
+index 34a193d..5b8f6f3 100644
+--- a/update-kernel.in
++++ b/update-kernel.in
+@@ -240,7 +240,7 @@ if [ "$ARM" ]; then
+     DTBDIR=$ROOT/usr/lib/linux-$KVER
+     [ "$BUILDDIR" ] && DTBDIR=$BUILDDIR/source/arch/arm/boot/dts
+     cp -a "$DTBDIR"/* $DTB_STAGING
+-    find "$DTB_STAGING" -type f \! \( -name "*.dtb" -o -name "*.dtbo"\)  -delete
++    find "$DTB_STAGING" -type f \! \( -name "*.dtb" -o -name "*.dtbo" \)  -delete
+ fi
+ 
+ 
+-- 
+2.9.1
+
diff --git a/main/alpine-conf/0003-update-kernel-improve-dtb-handling.patch b/main/alpine-conf/0003-update-kernel-improve-dtb-handling.patch
new file mode 100644
index 0000000000..ca07c3c86c
--- /dev/null
+++ b/main/alpine-conf/0003-update-kernel-improve-dtb-handling.patch
@@ -0,0 +1,93 @@
+From 824237dd105fd91bf3bdbe860c8a1908f30937d7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
+Date: Thu, 14 Jul 2016 06:12:30 +0000
+Subject: [PATCH 3/3] update-kernel: improve dtb handling
+
+- install dtbs to right place from kernel source trees
+- install rpi dtbs to root of boot media (fixes #5884)
+- support aarch64
+---
+ update-kernel.in | 38 +++++++++++++++++++++++---------------
+ 1 file changed, 23 insertions(+), 15 deletions(-)
+
+diff --git a/update-kernel.in b/update-kernel.in
+index 5b8f6f3..57f51de 100644
+--- a/update-kernel.in
++++ b/update-kernel.in
+@@ -153,7 +153,6 @@ if [ -z "$FLAVOR" ]; then
+ fi
+ 
+ [ "$ARCH" ] || ARCH=$(apk --print-arch)
+-ARM=$(echo "$ARCH" | grep ^arm || :)
+ 
+ TMPDIR=$(mktemp -d /tmp/$SCRIPT.XXXXXX)
+ ROOT=$TMPDIR/root
+@@ -195,9 +194,17 @@ extra_pkgs() {
+ _apk add --initdb --update-cache
+ 
+ if [ "$BUILDDIR" ]; then
++    local _install
++    case "$ARCH" in
++    arm*|aarch64*)	_install="zinstall dtbs_install" ;;
++    *)			_install="install" ;;
++    esac
++
+     mkdir -p $BOOT
+-    make -C "$BUILDDIR" ${ARM:+z}install firmware_install modules_install \
+-	INSTALL_MOD_PATH=$ROOT INSTALL_PATH=$BOOT
++    make -C "$BUILDDIR" $_install firmware_install modules_install \
++	INSTALL_MOD_PATH=$ROOT \
++	INSTALL_PATH=$BOOT \
++	INSTALL_DTBS_PATH='$ROOT/usr/lib/linux-$(KERNELRELEASE)' \
+ else
+     if [ -z "$PACKAGES" ]; then
+ 	PACKAGES="$(extra_pkgs "dahdi-linux-$FLAVOR" dahdi-linux)
+@@ -211,6 +218,7 @@ _apk add --no-scripts alpine-base $PACKAGES
+ KVER_FLAVOR=
+ [ "$FLAVOR" = vanilla ] || KVER_FLAVOR=-$FLAVOR
+ KVER=$(basename $(ls -d $ROOT/lib/modules/*"$KVER_FLAVOR"))
++DTBDIR=$ROOT/usr/lib/linux-$KVER
+ depmod -b $ROOT "$KVER"
+ 
+ 
+@@ -236,14 +244,6 @@ for file in System.map config vmlinuz; do
+     cp "$BOOT/$file$KVER_FLAVOR" $STAGING
+ done
+ 
+-if [ "$ARM" ]; then
+-    DTBDIR=$ROOT/usr/lib/linux-$KVER
+-    [ "$BUILDDIR" ] && DTBDIR=$BUILDDIR/source/arch/arm/boot/dts
+-    cp -a "$DTBDIR"/* $DTB_STAGING
+-    find "$DTB_STAGING" -type f \! \( -name "*.dtb" -o -name "*.dtbo" \)  -delete
+-fi
+-
+-
+ if [ "$MNTDIR" ]; then
+     ignore_sigs
+     umount /.modloop
+@@ -252,10 +252,18 @@ fi
+ 
+ mv $STAGING/* "$DESTDIR"
+ 
+-if [ "$ARM" ]; then
+-    DTBDIR=$DESTDIR/dtbs
+-    mkdir -p "$DTBDIR"
+-    mv $DTB_STAGING/* "$DTBDIR"
++if [ -d "$DTBDIR" ]; then
++    local _opwd=$PWD
++    local _dtb
++    case "$FLAVOR" in
++    rpi*) _dtb="$DESTDIR" ;;
++    *) _dtb="$DESTDIR/dtbs" ;;
++    esac
++    mkdir -p "$_dtb"
++    _dtb=$(realpath "$_dtb")
++    cd "$DTBDIR"
++    find -type f \( -name "*.dtb" -o -name "*.dtbo" \) | cpio -pudm "$_dtb" 2> /dev/null
++    cd "$_opwd"
+ fi
+ 
+ if [ "$MNTDIR" ]; then
+-- 
+2.9.1
+
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index a2296822dc..1836b78dbb 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,13 +1,16 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-conf
 pkgver=3.4.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Alpine configuration management scripts"
 url=http://git.alpinelinux.org/cgit/$pkgname
 arch="all"
 license="MIT"
 depends="openrc>0.13"
 source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz
+	0001-update-kernel-fix-rpi-missing-overlays.patch
+	0002-update-kernel-fix-find-unpaired.patch
+	0003-update-kernel-improve-dtb-handling.patch
 	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -24,6 +27,15 @@ package() {
 	done
 }
 
-md5sums="c599b27ef9754e61cbd6726b9239fa59  alpine-conf-3.4.1.tar.xz"
-sha256sums="92c5cbb8078c2ee8ed9e9e749acb40f6cd69a3fbb5e49429abeff2282228f697  alpine-conf-3.4.1.tar.xz"
-sha512sums="eda1640e146727edf35713039143f6db4bb485ad34236f21a837f80f09bc27b38cae3e854310eb3a4d8b937766f3e8aab0cf887849bbf385f7f511d24e19cb30  alpine-conf-3.4.1.tar.xz"
+md5sums="c599b27ef9754e61cbd6726b9239fa59  alpine-conf-3.4.1.tar.xz
+dbec0da0403ec5d224b2b4d71f6eee8b  0001-update-kernel-fix-rpi-missing-overlays.patch
+9547aaf63b65fd5c3eb009e22af4750a  0002-update-kernel-fix-find-unpaired.patch
+c039d2bdab892b554c80061fb977fb27  0003-update-kernel-improve-dtb-handling.patch"
+sha256sums="92c5cbb8078c2ee8ed9e9e749acb40f6cd69a3fbb5e49429abeff2282228f697  alpine-conf-3.4.1.tar.xz
+bb06b13c8d7712265dc7700e08023c18306bf4bb7cef8cff07e96562b48bcd48  0001-update-kernel-fix-rpi-missing-overlays.patch
+e422c719021fcc8614bcea5eed7e19220ac70fe6f39af3784dc0d02fba2505b7  0002-update-kernel-fix-find-unpaired.patch
+f98578628d89a350efc83edde662530414cdf34c869897cd206115e8eb5cb005  0003-update-kernel-improve-dtb-handling.patch"
+sha512sums="eda1640e146727edf35713039143f6db4bb485ad34236f21a837f80f09bc27b38cae3e854310eb3a4d8b937766f3e8aab0cf887849bbf385f7f511d24e19cb30  alpine-conf-3.4.1.tar.xz
+9555a7a9a5ab62a7e2604a8a7f76de0a939dd1f4fc27f23abd0fd631528d17514a80be718f5a2c0286e33925991b05b30a1c1324903135128d964f1830b23d50  0001-update-kernel-fix-rpi-missing-overlays.patch
+b5809e8720bbcaf89e6f336e5351d796a3ea5df4c02aac8cb0845bf4f7a3cf3a4ed70ab548f0620d38c47a57319bc1e63a131b2d8b535f7932e74f7163950536  0002-update-kernel-fix-find-unpaired.patch
+9228b13f862ac5a4085c9e0a24115e488a76ea817437f252414956b543887135c5e0da3a2cd5d96f69f5ee8cabb3eafaef693b4fe28f9e9b74fa6c0c92280b82  0003-update-kernel-improve-dtb-handling.patch"