system/easy-kernel: Two minor fixes

1. Fix syntax for uapi/sound/asound.h.  Otherwise, alsa-lib FTBFS.

2. Initial support for persistent, builder-storage-only mod signing key.

2 files changed, 30 insertions, 14 deletions

diff --git a/system/easy-kernel/APKBUILD b/system/easy-kernel/APKBUILD
index 29805f75b..48414d60e 100644
--- a/system/easy-kernel/APKBUILD
+++ b/system/easy-kernel/APKBUILD
@@ -5,7 +5,7 @@ _kflavour=""
 _patchver=0
 _pkgname=easy-kernel$_kflavour
 pkgver=5.4.5
-pkgrel=0
+pkgrel=1
 pkgname=$_pkgname-$pkgver-mc$_patchver
 pkgdesc="The Linux kernel, packaged for your convenience"
 url="https://kernel.org/"
@@ -16,8 +16,8 @@ depends=""
 makedepends="bc bison flex gzip kmod lzop openssl-dev rsync xz"
 provides="easy-kernel$_kflavour=$pkgver-r$pkgrel"
 replaces="easy-kernel-power8 easy-kernel-power8-64k"
-subpackages="$_pkgname-modules-$pkgver-mc$pkgrel:modules
-	$_pkgname-src-$pkgver-mc$pkgrel:src
+subpackages="$_pkgname-modules-$pkgver-mc$_patchver:modules
+	$_pkgname-src-$pkgver-mc$_patchver:src
 	linux-headers:headers"
 _pkgmajver=${pkgver%%.*}
 _pkgminver=${pkgver%.*}
@@ -30,6 +30,7 @@ source="https://cdn.kernel.org/pub/linux/kernel/v${_pkgmajver}.x/linux-${_pkgmin
 	config-aarch64
 	config-sparc64
 	config-m68k
+	asound-syntax-fix.patch
 	kernel.h
 	uapi-iphdr.patch
 	"
@@ -44,6 +45,9 @@ prepare() {
 	cd "$srcdir"
 	cp config-$CARCH linux-${_pkgminver}/.config
 	cp -pr linux-${_pkgminver} linux-src
+	if [ -f $HOME/kernel_key.pem ]; then
+		cp $HOME/kernel_key.pem "$builddir"/certs/signing_key.pem
+	fi
 }
 
 build() {
@@ -67,16 +71,16 @@ package() {
 
 	if [ -f "$pkgdir"/boot/vmlinuz ]; then
 		mv "$pkgdir"/boot/vmlinuz \
-			"$pkgdir"/boot/vmlinuz-$pkgver-mc$pkgrel-easy$_kflavour
+			"$pkgdir"/boot/vmlinuz-$pkgver-mc$_patchver-easy$_kflavour
 	fi
 	if [ -f "$pkgdir"/boot/vmlinux ]; then
 		mv "$pkgdir"/boot/vmlinux \
-			"$pkgdir"/boot/vmlinux-$pkgver-mc$pkgrel-easy$_kflavour
+			"$pkgdir"/boot/vmlinux-$pkgver-mc$_patchver-easy$_kflavour
 	fi
 
 	if [ -f "$pkgdir"/boot/System.map ]; then
 		mv "$pkgdir"/boot/System.map \
-			"$pkgdir"/boot/System.map-$pkgver-mc$pkgrel-easy$_kflavour
+			"$pkgdir"/boot/System.map-$pkgver-mc$_patchver-easy$_kflavour
 	fi
 
 	case $CARCH in
@@ -84,7 +88,7 @@ package() {
 	esac
 
 	install -D "$builddir"/include/config/kernel.release \
-		"$pkgdir"/usr/share/kernel/easy-$pkgver-mc$pkgrel$_kflavour/kernel.release
+		"$pkgdir"/usr/share/kernel/easy-$pkgver-mc$_patchver$_kflavour/kernel.release
 }
 
 modules() {
@@ -93,12 +97,12 @@ modules() {
 	autodeps=0  # modules should not depend on src just for symlink
 	mkdir -p "$subpkgdir"/lib
 	mv "$pkgdir"/lib/modules "$subpkgdir"/lib/
-	rm "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy$_kflavour/build
-	rm "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy$_kflavour/source
-	ln -s "../../../usr/src/linux-$pkgver-mc$pkgrel$_kflavour" \
-		"$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy$_kflavour/build
-	ln -s "../../../usr/src/linux-$pkgver-mc$pkgrel$_kflavour" \
-		"$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy$_kflavour/source
+	rm "$subpkgdir"/lib/modules/$pkgver-mc$_patchver-easy$_kflavour/build
+	rm "$subpkgdir"/lib/modules/$pkgver-mc$_patchver-easy$_kflavour/source
+	ln -s "../../../usr/src/linux-$pkgver-mc$_patchver$_kflavour" \
+		"$subpkgdir"/lib/modules/$pkgver-mc$_patchver-easy$_kflavour/build
+	ln -s "../../../usr/src/linux-$pkgver-mc$_patchver$_kflavour" \
+		"$subpkgdir"/lib/modules/$pkgver-mc$_patchver-easy$_kflavour/source
 }
 
 headers() {
@@ -125,7 +129,7 @@ src() {
 	pkgdesc="Kernel source code used to build the kernel"
 	provides="easy-kernel$_kflavour-src=$pkgver-r$pkgrel"
 	mkdir -p "$subpkgdir"/usr/src
-	mv "$srcdir"/linux-src "$subpkgdir"/usr/src/linux-$pkgver-mc$pkgrel$_kflavour
+	mv "$srcdir"/linux-src "$subpkgdir"/usr/src/linux-$pkgver-mc$_patchver$_kflavour
 }
 
 sha512sums="9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f  linux-5.4.tar.xz
@@ -137,5 +141,6 @@ ec86baafbfc22fdb08872276284eac7dce695c192a02c3b7d35a5d67861b98be18475ccfbb366ff9
 baefddb2e1de0105f9333702121d3dd2c1f1d54ce22ee7f7d3a54d4fa1028e9b5dadeecb6cca8a717d30c7bc083daa652b0281fb1b39a85f191954ac5a95fecd  config-aarch64
 430d968f60cfd33d3ba1e7c2fec8b1d1eedee8086c7cebebf162223b058b0e1d873033e46e05f63d8a50c61397eaf1036b1e4b3a60581f08c6482810aa25df7f  config-sparc64
 1b99310e2de81267fdb1668ad6f52f26d8798d94c0a952cfe9992ff40e5d7331ddfb324b8f99bfa300240aa568bbd4525150e0c774c797d85756714163fd0fa5  config-m68k
+4b2cd7dd0010aaec617c756e7587be7fad6ff0ab3dbc1ed038e3dc72c9308fc9e347c6e5296c30711d914e286aa254600586e2ad954a5da226e6e4c1522b75b5  asound-syntax-fix.patch
 61dcd633d72876566b7738dd08856b26850c935b4a81ab2364711335fe01c397083160f530b3382bbc239c6a8135be6a032e93039083ec2cefdae2902429a2e0  kernel.h
 6f309a18c65c991240265afd200cc79a706f5d9e5d072838a9a641ab3676a5e4c32033f9767fc723ff4c45ee462169a0f77bd7dfe63b547d521dadd073f827a7  uapi-iphdr.patch"
diff --git a/system/easy-kernel/asound-syntax-fix.patch b/system/easy-kernel/asound-syntax-fix.patch
new file mode 100644
index 000000000..682afb296
--- /dev/null
+++ b/system/easy-kernel/asound-syntax-fix.patch
@@ -0,0 +1,11 @@
+--- linux-5.4/include/uapi/sound/asound.h.old	2019-12-28 10:44:33.650684482 +0000
++++ linux-5.4/include/uapi/sound/asound.h	2019-12-28 10:45:28.854780162 +0000
+@@ -471,7 +471,7 @@
+ 
+ #ifndef __KERNEL__
+ /* explicit padding avoids incompatibility between i386 and x86-64 */
+-typedef struct { unsigned char pad[sizeof(time_t) - sizeof(int)] __time_pad;
++typedef struct { unsigned char pad[sizeof(time_t) - sizeof(int)] } __time_pad;
+ 
+ struct snd_pcm_status {
+ 	snd_pcm_state_t state;		/* stream state */