main/alpine-conf: update kernel new options hostkeys and repositories

7 files changed, 111 insertions, 28 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
index 115998c6e49..d7fad1bbfd1 100644
--- a/main/alpine-conf/0001-update-kernel-fix-rpi-missing-overlays.patch
+++ b/main/alpine-conf/0001-update-kernel-fix-rpi-missing-overlays.patch
@@ -1,7 +1,7 @@
 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
+Subject: [PATCH 1/6] update-kernel: fix rpi missing overlays
 
 Fixes the Linux raspberry pi dtoverlays not being copied into the
 update-kernel destination directory.
@@ -23,5 +23,5 @@ index 248c3d1..34a193d 100644
  
  
 -- 
-2.9.1
+2.9.3
 
diff --git a/main/alpine-conf/0002-update-kernel-fix-find-unpaired.patch b/main/alpine-conf/0002-update-kernel-fix-find-unpaired.patch
index 7b7fd8fb451..6b0c43a785c 100644
--- a/main/alpine-conf/0002-update-kernel-fix-find-unpaired.patch
+++ b/main/alpine-conf/0002-update-kernel-fix-find-unpaired.patch
@@ -1,7 +1,7 @@
 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 '('"
+Subject: [PATCH 2/6] update-kernel: fix "find: unpaired '('"
 
 fixes #5883
 ---
@@ -22,5 +22,5 @@ index 34a193d..5b8f6f3 100644
  
  
 -- 
-2.9.1
+2.9.3
 
diff --git a/main/alpine-conf/0003-update-kernel-improve-dtb-handling.patch b/main/alpine-conf/0003-update-kernel-improve-dtb-handling.patch
index ca07c3c86c9..a39c95a1fa1 100644
--- a/main/alpine-conf/0003-update-kernel-improve-dtb-handling.patch
+++ b/main/alpine-conf/0003-update-kernel-improve-dtb-handling.patch
@@ -1,7 +1,7 @@
 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
+Subject: [PATCH 3/6] update-kernel: improve dtb handling
 
 - install dtbs to right place from kernel source trees
 - install rpi dtbs to root of boot media (fixes #5884)
@@ -89,5 +89,5 @@ index 5b8f6f3..57f51de 100644
  
  if [ "$MNTDIR" ]; then
 -- 
-2.9.1
+2.9.3
 
diff --git a/main/alpine-conf/0004-update-kernel-new-options-hostkeys-and-repositories-.patch b/main/alpine-conf/0004-update-kernel-new-options-hostkeys-and-repositories-.patch
new file mode 100644
index 00000000000..581c57d5a2f
--- /dev/null
+++ b/main/alpine-conf/0004-update-kernel-new-options-hostkeys-and-repositories-.patch
@@ -0,0 +1,79 @@
+From 7ac843e901888dfc3d971815c13c9fbc12ef6405 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:42:13 +0000
+Subject: [PATCH 4/6] update-kernel: new options --hostkeys and
+ --repositories-file
+
+to simplify creation of bootable images from external repositries
+and with developer signing keys.
+---
+ update-kernel.in | 19 +++++++++++++++----
+ 1 file changed, 15 insertions(+), 4 deletions(-)
+
+diff --git a/update-kernel.in b/update-kernel.in
+index 57f51de..06b7eac 100644
+--- a/update-kernel.in
++++ b/update-kernel.in
+@@ -20,6 +20,8 @@ BUILDDIR=
+ FLAVOR=
+ MNTDIR=
+ PACKAGES=
++MKINITFS_ARGS=
++REPOSITORIES_FILE=/etc/apk/repositories
+ SIGNALS="HUP INT TERM"
+ TMPDIR=
+ features=
+@@ -44,14 +46,16 @@ Options: -a|--arch <arch>        Install kernel for specified architecture
+          -F|--feature <feature>  Enable initfs feature
+          -p|--package <package>  Additional module or firmware package
+          -v|--verbose            Verbose output
++         -K|--hostkeys           Include host keys in initramfs
++         --repositories-file <f> apk repositories file
+ 
+ EOF
+     exit $1
+ }
+ 
+ QUIET_OPT="--quiet"
+-OPTS=$(getopt -l arch:,build-dir:,flavor:,feature:,help,package:,verbose \
+-	      -n $SCRIPT -o a:b:f:F:hp:v -- "$@") || usage 1
++OPTS=$(getopt -l arch:,build-dir:,flavor:,feature:,help,package:,verbose,hostkeys,repositories-file: \
++	      -n $SCRIPT -o a:b:f:F:hp:vK -- "$@") || usage 1
+ eval set -- "$OPTS"
+ while :; do
+     case "$1" in
+@@ -82,6 +86,13 @@ while :; do
+ 	-v|--verbose)
+ 	    QUIET_OPT=
+ 	    ;;
++	-K|--hostkeys)
++	    MKINITFS_ARGS="$MKINITFS_ARGS -K"
++	    ;;
++        --repositories-file)
++	    shift
++	    REPOSITORIES_FILE=$1
++	    ;;
+ 	--)
+ 	    break
+ 	    ;;
+@@ -180,7 +191,7 @@ _apk() {
+ 
+     $wrapper apk $cmd $QUIET_OPT -p $ROOT --arch "$ARCH" \
+ 	--keys-dir /etc/apk/keys \
+-	--repositories-file /etc/apk/repositories $*
++	--repositories-file "$REPOSITORIES_FILE" $*
+ }
+ 
+ extra_pkgs() {
+@@ -237,7 +248,7 @@ find $ROOT/lib/modules -type f -name "*.ko" | xargs modinfo -F firmware | sort -
+ done
+ _exec mksquashfs $MODLOOP "$STAGING/$MODIMG" -comp xz
+ 
+-_exec mkinitfs -q -b $ROOT -F "$features base squashfs" \
++_exec mkinitfs $MKINITFS_ARGS -q -b $ROOT -F "$features base squashfs" \
+     -o "$STAGING/initramfs-$FLAVOR" "$KVER"
+ 
+ for file in System.map config vmlinuz; do
+-- 
+2.9.3
+
diff --git a/main/alpine-conf/0001-update-kernel-fix-bad-typo.patch b/main/alpine-conf/0005-update-kernel-fix-bad-typo.patch
index 59919cb67c2..3f7a099e544 100644
--- a/main/alpine-conf/0001-update-kernel-fix-bad-typo.patch
+++ b/main/alpine-conf/0005-update-kernel-fix-bad-typo.patch
@@ -1,7 +1,7 @@
-From a79092c652ce0b490ba582d682662e83db9fc7b4 Mon Sep 17 00:00:00 2001
+From 0b7b6a100b22f704e1c8aedcd4d53bbf167a751e Mon Sep 17 00:00:00 2001
 From: Carlo Landmeter <clandmeter@gmail.com>
 Date: Fri, 5 Aug 2016 16:53:21 +0000
-Subject: [PATCH] update-kernel: fix bad typo
+Subject: [PATCH 5/6] update-kernel: fix bad typo
 
 ---
  update-kernel.in | 2 +-
@@ -21,5 +21,5 @@ index 06b7eac..ab7c528 100644
      if [ -z "$PACKAGES" ]; then
  	PACKAGES="$(extra_pkgs "dahdi-linux-$FLAVOR" dahdi-linux)
 -- 
-2.9.1
+2.9.3
 
diff --git a/main/alpine-conf/0001-update-kernel-don-t-use-local-in-non-function-scope.patch b/main/alpine-conf/0006-update-kernel-don-t-use-local-in-non-function-scope.patch
index d19d73e4d52..1eb34a52286 100644
--- a/main/alpine-conf/0001-update-kernel-don-t-use-local-in-non-function-scope.patch
+++ b/main/alpine-conf/0006-update-kernel-don-t-use-local-in-non-function-scope.patch
@@ -1,7 +1,7 @@
 From 78d392b36076dccf1035f0b90e5dbdb2000433a3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
 Date: Tue, 9 Aug 2016 13:17:25 +0300
-Subject: [PATCH] update-kernel: don't use local in non-function scope
+Subject: [PATCH 6/6] update-kernel: don't use local in non-function scope
 
 ---
  update-kernel.in | 4 +---
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index c45edf06d6d..77fccbc916f 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-conf
 pkgver=3.4.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Alpine configuration management scripts"
 url=http://git.alpinelinux.org/cgit/$pkgname
 arch="all"
@@ -11,8 +11,9 @@ source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.x
 	0001-update-kernel-fix-rpi-missing-overlays.patch
 	0002-update-kernel-fix-find-unpaired.patch
 	0003-update-kernel-improve-dtb-handling.patch
-	0001-update-kernel-fix-bad-typo.patch
-	0001-update-kernel-don-t-use-local-in-non-function-scope.patch
+	0004-update-kernel-new-options-hostkeys-and-repositories-.patch
+	0005-update-kernel-fix-bad-typo.patch
+	0006-update-kernel-don-t-use-local-in-non-function-scope.patch
 	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -30,20 +31,23 @@ package() {
 }
 
 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
-5f0b0142069305e0ddb96118dea320fd  0001-update-kernel-fix-bad-typo.patch
-fc391af2c71818240c85ac9dad2084ad  0001-update-kernel-don-t-use-local-in-non-function-scope.patch"
+e275dfc8f32aa0369bc6f0f3f244b2f2  0001-update-kernel-fix-rpi-missing-overlays.patch
+f81a04a5a485af48f86c8ef5d6f90e4e  0002-update-kernel-fix-find-unpaired.patch
+90583a6d73a6ea87f154dd185f41e342  0003-update-kernel-improve-dtb-handling.patch
+2e59f13898466248c883bf22251b40c8  0004-update-kernel-new-options-hostkeys-and-repositories-.patch
+89cbbf3c2547c6872e0d7a66b587d12e  0005-update-kernel-fix-bad-typo.patch
+87000d49a605a2be278334e76327699f  0006-update-kernel-don-t-use-local-in-non-function-scope.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
-12512530215ccddb6b2922cc1d5359c0417f1d0afd3986dc58230641d09b105f  0001-update-kernel-fix-bad-typo.patch
-2ee3904ebf7568eac9aab72684c2d3fa7e8529b1e6092b2fac7b0ad58ba6bcbd  0001-update-kernel-don-t-use-local-in-non-function-scope.patch"
+50e9657d45d223abb323d71a00960e502f3fa75ace504ea7460b06ce9b8c1022  0001-update-kernel-fix-rpi-missing-overlays.patch
+5df2436b9989797200a488a482a69db25052677b02090213a8db1ed6a2cfb1dd  0002-update-kernel-fix-find-unpaired.patch
+b1254df25cd50fb9018018f91969636fd0e05cc42fe8e6432c6e0f50b40a932e  0003-update-kernel-improve-dtb-handling.patch
+4a07ccc8ba58faa5a82f33b644c6f572c73467eae8fc388a617b76657c026bf9  0004-update-kernel-new-options-hostkeys-and-repositories-.patch
+c3121d70ca93950a72d8793bd35c580f432cab8b1c4513974f64c8a6807bcf73  0005-update-kernel-fix-bad-typo.patch
+38953da68a928002bd532fb0b46d945b0d1494b7fa12b89686fe0e9a9def0cf8  0006-update-kernel-don-t-use-local-in-non-function-scope.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
-a3ac1e41f25941c811302b6f2a1b7139e15b4df16b561ad3fe547fc031d5328149de41ac44c6e9cde8482d351882fbbf6393f29e824d7b68a62031125c60ca80  0001-update-kernel-fix-bad-typo.patch
-ee071761cfba338aff26b5ad457b3d9f5e199563dfd237156bbbf75e04948a27014c6f6ea5e1c558d365bcb873b292e1595e24d8304f84c2673db7cf0e2d9627  0001-update-kernel-don-t-use-local-in-non-function-scope.patch"
+be3164c3b85194040820ca6ad7f1f44749dd188d3852401c1090a452cd9ce8eadcc1a8c12aad6d480565f93a4313df7f6de96b297046a3017754d812c0bb339b  0001-update-kernel-fix-rpi-missing-overlays.patch
+e8ce37849ae3e9473c4ad234ab186f332b3514f05b70fb32c08ca95ffc3b44d959c48e8920acda5f735a01bfb1c0523a04d6668ef27755096f485412c2a7ff5f  0002-update-kernel-fix-find-unpaired.patch
+5f7396e43fcc21809bac8c232d84bf827aaf1a925c83ceae2e73f68c822466bfc6cbe332f129996d887e115a7ff9d6f5067441dfe01dccb02dbfc9eeb16a5b9e  0003-update-kernel-improve-dtb-handling.patch
+77833b9b8d6b278cd89bff4de0e05474d3191917e330e51fe6baa03bb682b853417bb92307bf66f8f9ba8c726fbe6d6e7ec816e2e3dda354bcc2c3531ccf8b66  0004-update-kernel-new-options-hostkeys-and-repositories-.patch
+a256633bbadae595288fe4c9b26bfb71ae5f085a21ba1dbdd449a272ab1fdd50d44dd2dfe451c5d3e9fe0ceb1acd5c2bb3949edd0f51749b13b0890a5298c8b9  0005-update-kernel-fix-bad-typo.patch
+3c0854466e7994bcde959c9e5880241d87d78aa27a8a787eab7290311fccaee230c1480c77991dcf99a252c328ae6db2286d1d7f22c7c3042b9a8d79ff730be7  0006-update-kernel-don-t-use-local-in-non-function-scope.patch"