main/alpine-conf: update-kernel firmware

backport patch that includes needed files for firmware

needed for rpi

2 files changed, 41 insertions, 2 deletions

diff --git a/main/alpine-conf/0001-update-kernel-add-additional-firmware-files.patch b/main/alpine-conf/0001-update-kernel-add-additional-firmware-files.patch
new file mode 100644
index 0000000000..45f0b321d1
--- /dev/null
+++ b/main/alpine-conf/0001-update-kernel-add-additional-firmware-files.patch
@@ -0,0 +1,37 @@
+From 96b29f5dd64111b9d063a327e24247ced02c1427 Mon Sep 17 00:00:00 2001
+From: Carlo Landmeter <clandmeter@alpinelinux.org>
+Date: Tue, 19 Jun 2018 15:32:51 +0000
+Subject: [PATCH] update-kernel: add additional firmware files
+
+---
+ update-kernel.in | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/update-kernel.in b/update-kernel.in
+index 0d20371..aaf1cff 100644
+--- a/update-kernel.in
++++ b/update-kernel.in
+@@ -251,8 +251,20 @@ mkdir -p $MODLOOP/modules/firmware
+ find $ROOT/lib/modules -type f -name "*.ko" | xargs modinfo -F firmware | sort -u | while read FW; do
+        if [ -e "$ROOT/lib/firmware/$FW" ]; then
+                install -pD $ROOT/lib/firmware/$FW $MODLOOP/modules/firmware/$FW
++               # include nvram files if firmware is needed.
++               [ -e "$ROOT/lib/firmware/${FW%.*}.txt" ] && install -pD \
++                   $ROOT/lib/firmware/${FW%.*}.txt $MODLOOP/modules/firmware/${FW%.*}.txt
+        fi
+ done
++
++# include bluetooth firmware in modloop
++if [ -d "$MODLOOP/modules/firmware/brcm" ]; then
++       for _btfw in "$ROOT"/lib/firmware/brcm/*.hcd; do
++               install -pD "$_btfw" \
++                       "$MODLOOP"/modules/firmware/brcm/"${_btfw##*/}"
++       done
++fi
++
+ mksquashfs $MODLOOP "$STAGING/$MODIMG" -comp xz -exit-on-error
+ 
+ mkinitfs $MKINITFS_ARGS -q -b $ROOT -F "$features base squashfs" \
+-- 
+2.17.1
+
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index 05aaa265f3..45ec59f46f 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,13 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-conf
 pkgver=3.8.0_rc2
-pkgrel=0
+pkgrel=1
 pkgdesc="Alpine configuration management scripts"
 url=http://git.alpinelinux.org/cgit/$pkgname
 arch="all"
 license="MIT"
 depends="openrc>=0.24.1-r6 busybox>=1.26.1-r3"
 source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz
+        0001-update-kernel-add-additional-firmware-files.patch
         "
 
 builddir="$srcdir"/$pkgname-$pkgver
@@ -24,4 +25,5 @@ package() {
         done
 }
 
-sha512sums="3b5224c2484b47c858fcea9fca0d2a1a73db7151ae8ed02480ae05dea35eb6f5ed4c2ffd887686cd43ac701948319c74e2cb8ccb1ada4f64ab9c8c350a241208  alpine-conf-3.8.0_rc2.tar.xz"
+sha512sums="3b5224c2484b47c858fcea9fca0d2a1a73db7151ae8ed02480ae05dea35eb6f5ed4c2ffd887686cd43ac701948319c74e2cb8ccb1ada4f64ab9c8c350a241208  alpine-conf-3.8.0_rc2.tar.xz
+faffb4d2e6da15f631211e36fdd8cdaedae91e8c00e09055f17130fef7ce073fadfa78deebedb1877768c1707fc1e0a2741496dea5b0831b2f2b12cef23555de  0001-update-kernel-add-additional-firmware-files.patch"