main/mkinitfs: fix raid5

we need add crc32 module as a dep for raid5

3 files changed, 68 insertions, 4 deletions

diff --git a/main/mkinitfs/0001-init-add-crc32-modules-for-raid5.patch b/main/mkinitfs/0001-init-add-crc32-modules-for-raid5.patch
new file mode 100644
index 0000000000..18b3ddfc9d
--- /dev/null
+++ b/main/mkinitfs/0001-init-add-crc32-modules-for-raid5.patch
@@ -0,0 +1,23 @@
+From 23adfc18b162327df1c480f8e6f394bc113c0f0a Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 18 May 2016 13:19:15 +0000
+Subject: [PATCH] init: add crc32 modules for raid5
+
+They are not pulled in automatically
+---
+ features.d/raid.modules | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/features.d/raid.modules b/features.d/raid.modules
+index b73a51e..ec45c7e 100644
+--- a/features.d/raid.modules
++++ b/features.d/raid.modules
+@@ -1,3 +1,5 @@
+ kernel/drivers/md/raid*
+ kernel/drivers/block/cciss*
+ kernel/drivers/block/sx8*
++kernel/arch/*/crypto/crc32*
++kernel/crypto/crc32*
+-- 
+2.8.2
+
diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD
index 1f26837f82..f68c0828e3 100644
--- a/main/mkinitfs/APKBUILD
+++ b/main/mkinitfs/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=mkinitfs
 pkgver=3.0.4
 _ver=${pkgver%_git*}
-pkgrel=1
+pkgrel=2
 pkgdesc="Tool to generate initramfs images for Alpine"
 url="http://git.alpinelinux.org/cgit/mkinitfs"
 makedepends="kmod-dev util-linux-dev cryptsetup-dev linux-headers"
@@ -11,6 +11,7 @@ install="$pkgname.pre-upgrade $pkgname.post-install $pkgname.post-upgrade"
 triggers="$pkgname.trigger=/usr/share/kernel/*"
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$_ver.tar.xz
 	0001-nlplug-findfs-increase-the-sys-recursion-limit.patch
+	0001-init-add-crc32-modules-for-raid5.patch
 	"
 arch="all"
 license="GPL2"
@@ -37,8 +38,11 @@ package() {
 	make install DESTDIR="$pkgdir" || return 1
 }
 md5sums="682a28918a7013d198b443e6b71a4df2  mkinitfs-3.0.4.tar.xz
-fc43c3f1f037b6902179c5d90c97c8fc  0001-nlplug-findfs-increase-the-sys-recursion-limit.patch"
+fc43c3f1f037b6902179c5d90c97c8fc  0001-nlplug-findfs-increase-the-sys-recursion-limit.patch
+0253c3bba385402a7bfa4a7e364dd36c  0001-init-add-crc32-modules-for-raid5.patch"
 sha256sums="f8ca92bf99870ba3076117e4af7fa56659bf2fa3f18a924507b6541ad10475cc  mkinitfs-3.0.4.tar.xz
-f7b983025fdb5cfdeedced11e445989e384e5d5773daf6f062ec32f8853b3cb7  0001-nlplug-findfs-increase-the-sys-recursion-limit.patch"
+f7b983025fdb5cfdeedced11e445989e384e5d5773daf6f062ec32f8853b3cb7  0001-nlplug-findfs-increase-the-sys-recursion-limit.patch
+cfd3db306374cfdb53b894e1397f8a26764553e060ebeac44ca436f20d580982  0001-init-add-crc32-modules-for-raid5.patch"
 sha512sums="c0d2f6fb9d03afe2358dc0c1aecfd6aac46f69c63ed62e8513d525e54d3abb077f6b91ded4085c10480480d7ee3e8d0d6e91495b723ae2dc78c455d92329021d  mkinitfs-3.0.4.tar.xz
-fae8f44e2e2fa0898ee837fd88de5ada4ffb4c89c65fdda4ed3cffac7ae56c5dd6e01617f9b99a5e4aceacbd53ebdb879ea7c5562ecf0cbd7dce21af2f6da539  0001-nlplug-findfs-increase-the-sys-recursion-limit.patch"
+fae8f44e2e2fa0898ee837fd88de5ada4ffb4c89c65fdda4ed3cffac7ae56c5dd6e01617f9b99a5e4aceacbd53ebdb879ea7c5562ecf0cbd7dce21af2f6da539  0001-nlplug-findfs-increase-the-sys-recursion-limit.patch
+3b66146e77fe7ee46a3ae73016148c932954f1460a26eeb65cd430d61c3a2347ddaddc2cdd25a0cbfc3601f715af9c32fc0da2d0b7479d07234546ebfc712476  0001-init-add-crc32-modules-for-raid5.patch"
diff --git a/main/mkinitfs/git.patch b/main/mkinitfs/git.patch
new file mode 100644
index 0000000000..02cab69771
--- /dev/null
+++ b/main/mkinitfs/git.patch
@@ -0,0 +1,37 @@
+diff --git a/nlplug-findfs.c b/nlplug-findfs.c
+index b11b7b8..fd8f18f 100644
+--- a/nlplug-findfs.c
++++ b/nlplug-findfs.c
+@@ -527,6 +527,7 @@ static int find_apkovl(const char *dir, const char *outfile)
+ 	char pattern[PATH_MAX];
+ 	glob_t gl;
+ 	int r, fd;
++	int rc = 0;
+ 
+ 	if (outfile == NULL)
+ 		return 0;
+@@ -542,13 +543,21 @@ static int find_apkovl(const char *dir, const char *outfile)
+ 		err(1, "%s", outfile);
+ 
+ 	for (r = 0; r < gl.gl_pathc; r++) {
+-		dbg("Found apkovl: %s", gl.gl_pathv[r]);
+-		write(fd, gl.gl_pathv[r], strlen(gl.gl_pathv[r]));
++		const char *filename = gl.gl_pathv[r];
++		int len = strlen(filename);
++		dbg("Found apkovl: %s", filename);
++		write(fd, filename, len);
+ 		write(fd, "\n", 1);
++		/* we don't indicate that apkovl was found if we find
++		   encrypted apkovls, because we need load keyboard drivers
++		   before we exit
++		*/
++		if (len>=7 && strcmp(&filename[len - 7], ".tar.gz") == 0)
++			rc = FOUND_APKOVL;
+ 	}
+ 	close(fd);
+ 	globfree(&gl);
+-	return FOUND_APKOVL;
++	return rc;
+ }
+ 
+ static int find_bootrepos(const char *devnode, const char *type,