main/mkinitfs: upgrade to 3.0.9

5 files changed, 5 insertions, 224 deletions

diff --git a/main/mkinitfs/0001-add-zpool-import-capability.patch b/main/mkinitfs/0001-add-zpool-import-capability.patch
deleted file mode 100644
index af280cd832..0000000000
--- a/main/mkinitfs/0001-add-zpool-import-capability.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From be20737c8c6ca8b4ba94302f6b6c9725bc98565d Mon Sep 17 00:00:00 2001
-From: Mark Riedesel <mark@klowner.com>
-Date: Sat, 17 Sep 2016 10:46:03 -0500
-Subject: [PATCH] add zpool import capability
-
----
- features.d/zfs.files   |  2 ++
- features.d/zfs.modules |  7 +++++++
- initramfs-init.in      |  5 +++++
- nlplug-findfs.c        | 17 +++++++++++++++--
- 4 files changed, 29 insertions(+), 2 deletions(-)
- create mode 100644 features.d/zfs.files
- create mode 100644 features.d/zfs.modules
-
-diff --git a/features.d/zfs.files b/features.d/zfs.files
-new file mode 100644
-index 0000000..c821e15
---- /dev/null
-+++ b/features.d/zfs.files
-@@ -0,0 +1,2 @@
-+/usr/sbin/zfs
-+/usr/sbin/zpool
-diff --git a/features.d/zfs.modules b/features.d/zfs.modules
-new file mode 100644
-index 0000000..be5225a
---- /dev/null
-+++ b/features.d/zfs.modules
-@@ -0,0 +1,7 @@
-+extra/avl
-+extra/nvpair
-+extra/spl
-+extra/unicode
-+extra/zcommon
-+extra/zfs
-+extra/zpios
-diff --git a/initramfs-init.in b/initramfs-init.in
-index 64b1b5b..24a25c9 100755
---- a/initramfs-init.in
-+++ b/initramfs-init.in
-@@ -363,6 +363,11 @@ if [ -n "$KOPT_nbd" ]; then
- 	setup_nbd || echo "Failed to setup nbd device."
- fi
- 
-+if [ "$KOPT_rootfstype" = "zfs" ]; then
-+	# zpool reports /dev/zfs missing if it can't read /etc/mtab
-+	ln -s /proc/mounts /etc/mtab
-+fi
-+
- # check if root=... was set
- if [ -n "$KOPT_root" ]; then
- 	if [ "$SINGLEMODE" = "yes" ]; then
-diff --git a/nlplug-findfs.c b/nlplug-findfs.c
-index 7907389..7104d40 100644
---- a/nlplug-findfs.c
-+++ b/nlplug-findfs.c
-@@ -51,11 +51,12 @@
- 
- #define LVM_PATH	"/sbin/lvm"
- #define MDADM_PATH	"/sbin/mdadm"
-+#define ZPOOL_PATH	"/usr/sbin/zpool"
- 
- static int dodebug;
- static char *default_envp[2];
- char *argv0;
--static int use_mdadm, use_lvm;
-+static int use_mdadm, use_lvm, use_zpool;
- 
- #if defined(DEBUG)
- #include <stdarg.h>
-@@ -496,6 +497,15 @@ static void start_lvm2(char *devnode)
- 		spawn_command(&spawnmgr, lvm2_argv, 0);
- }
- 
-+static void start_zpool(char *uuid) {
-+	char *zpool_argv[] = {
-+		ZPOOL_PATH, "import", uuid,
-+		NULL
-+	};
-+	if (use_zpool && uuid)
-+		spawn_command(&spawnmgr, zpool_argv, 0);
-+}
-+
- static int read_pass(char *pass, size_t pass_size)
- {
- 	struct termios old_flags, new_flags;
-@@ -913,6 +923,7 @@ static int searchdev(struct uevent *ev, const char *searchdev, int scanbootmedia
- 		blkid_get_cache(&conf->blkid_cache, NULL);
- 
- 	type = blkid_get_tag_value(conf->blkid_cache, "TYPE", ev->devnode);
-+	uuid = blkid_get_tag_value(conf->blkid_cache, "UUID", ev->devnode);
- 
- 	if (searchdev != NULL) {
- 		if (strncmp("LABEL=", searchdev, 6) == 0) {
-@@ -920,7 +931,6 @@ static int searchdev(struct uevent *ev, const char *searchdev, int scanbootmedia
- 			if (label && strcmp(label, searchdev+6) == 0)
- 				rc = FOUND_DEVICE;
- 		} else if (strncmp("UUID=", searchdev, 5) == 0) {
--			uuid = blkid_get_tag_value(conf->blkid_cache, "UUID", ev->devnode);
- 			if (uuid && strcmp(uuid, searchdev+5) == 0)
- 				rc = FOUND_DEVICE;
- 		}
-@@ -934,6 +944,8 @@ static int searchdev(struct uevent *ev, const char *searchdev, int scanbootmedia
- 			start_mdadm(ev->devnode);
- 		} else if (strcmp("LVM2_member", type) == 0) {
- 			start_lvm2(ev->devnode);
-+		} else if (strcmp("zfs_member", type) == 0) {
-+			start_zpool(uuid);
- 		} else if (scanbootmedia) {
- 			rc = scandev(conf, ev->devnode, type);
- 		}
-@@ -1133,6 +1145,7 @@ int main(int argc, char *argv[])
- 	conf.uevent_timeout = DEFAULT_EVENT_TIMEOUT;
- 	use_lvm = access(LVM_PATH, X_OK) == 0;
- 	use_mdadm = access(MDADM_PATH, X_OK) == 0;
-+	use_zpool = access(ZPOOL_PATH, X_OK) == 0;
- 
- 	argv0 = strrchr(argv[0], '/');
- 	if (argv0++ == NULL)
--- 
-2.11.0
-
diff --git a/main/mkinitfs/0001-ext3-functionality-is-provided-by-ext4-module.patch b/main/mkinitfs/0001-ext3-functionality-is-provided-by-ext4-module.patch
deleted file mode 100644
index 734c635fab..0000000000
--- a/main/mkinitfs/0001-ext3-functionality-is-provided-by-ext4-module.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 92801060dccf632c827867eb361396646e04ae99 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 21 Dec 2016 23:03:01 +0000
-Subject: [PATCH] ext3 functionality is provided by ext4 module
-
-ref #6167
----
- features.d/ext3.modules | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/features.d/ext3.modules b/features.d/ext3.modules
-index eeadf78..a5bb1c3 100644
---- a/features.d/ext3.modules
-+++ b/features.d/ext3.modules
-@@ -1 +1 @@
--kernel/fs/ext3
-+kernel/fs/ext4
--- 
-2.11.0
-
diff --git a/main/mkinitfs/0001-features-add-nvme.patch b/main/mkinitfs/0001-features-add-nvme.patch
deleted file mode 100644
index 49836f8c85..0000000000
--- a/main/mkinitfs/0001-features-add-nvme.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 3de5906081a8680ea98e804852c2b72f6d0b82e2 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Mon, 26 Dec 2016 13:54:01 +0000
-Subject: [PATCH] features: add nvme
-
----
- features.d/nvme.modules | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 features.d/nvme.modules
-
-diff --git a/features.d/nvme.modules b/features.d/nvme.modules
-new file mode 100644
-index 0000000..e27d4e3
---- /dev/null
-+++ b/features.d/nvme.modules
-@@ -0,0 +1 @@
-+kernel/drivers/nvme
--- 
-2.11.0
-
diff --git a/main/mkinitfs/0001-make-install-nvme-and-zfs-files.patch b/main/mkinitfs/0001-make-install-nvme-and-zfs-files.patch
deleted file mode 100644
index ea36a61036..0000000000
--- a/main/mkinitfs/0001-make-install-nvme-and-zfs-files.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 9980b30b89206cd7b289f77ac5d0f1fc3fc0fa64 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Mon, 9 Jan 2017 19:27:03 +0000
-Subject: [PATCH] make: install nvme and zfs files
-
----
- Makefile | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index e6bd473..4329072 100644
---- a/Makefile
-+++ b/Makefile
-@@ -29,10 +29,13 @@ CONF_FILES	:= mkinitfs.conf \
- 		features.d/lvm.files \
- 		features.d/lvm.modules \
- 		features.d/mmc.modules \
-+		features.d/nbd.files \
-+		features.d/nbd.modules \
- 		features.d/network.files \
- 		features.d/network.modules \
-+		features.d/nvme.modules \
- 		features.d/ocfs2.modules \
--		features.d/raid.files\
-+		features.d/raid.files \
- 		features.d/raid.modules \
- 		features.d/reiserfs.modules \
- 		features.d/scsi.modules \
-@@ -41,8 +44,8 @@ CONF_FILES	:= mkinitfs.conf \
- 		features.d/usb.modules \
- 		features.d/virtio.modules \
- 		features.d/xfs.modules \
--		features.d/nbd.files \
--		features.d/nbd.modules
-+		features.d/zfs.files \
-+		features.d/zfs.modules
- 
- SCRIPTS		:= mkinitfs bootchartd initramfs-init
- IN_FILES	:= $(addsuffix .in,$(SCRIPTS))
--- 
-2.11.0
-
diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD
index 8beccbe086..137eae2efc 100644
--- a/main/mkinitfs/APKBUILD
+++ b/main/mkinitfs/APKBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mkinitfs
-pkgver=3.0.7
+pkgver=3.0.9
 _ver=${pkgver%_git*}
-pkgrel=3
+pkgrel=0
 pkgdesc="Tool to generate initramfs images for Alpine"
 url="http://git.alpinelinux.org/cgit/mkinitfs"
 makedepends_build=""
@@ -12,10 +12,6 @@ depends="busybox apk-tools>=2.0 lddtree>=1.25"
 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-ext3-functionality-is-provided-by-ext4-module.patch
-	0001-add-zpool-import-capability.patch
-	0001-features-add-nvme.patch
-	0001-make-install-nvme-and-zfs-files.patch
 	"
 arch="all"
 license="GPL2"
@@ -31,18 +27,6 @@ package() {
 	make install DESTDIR="$pkgdir" || return 1
 }
 
-md5sums="f0ce066554bff1e1a3056c51f2fe4610  mkinitfs-3.0.7.tar.xz
-79e61fce422c035296fdf00780f15fb3  0001-ext3-functionality-is-provided-by-ext4-module.patch
-7099f430777d916852608ccae5dfd1c7  0001-add-zpool-import-capability.patch
-d77cca688d393dab1c08d835a1a49cd6  0001-features-add-nvme.patch
-b179b79e988686c86d47f6f02d5c2acd  0001-make-install-nvme-and-zfs-files.patch"
-sha256sums="eb80666fa1f2bb4907f13f7f4c09ee8e1b0b1211aba240c9d2a5cc2a1756f1ba  mkinitfs-3.0.7.tar.xz
-60ba082ac2a542e55de9e5a335f058fe83789ccb25bf8958772e229b93442a78  0001-ext3-functionality-is-provided-by-ext4-module.patch
-e815e2ec1571e8f033c3ffaa429a8dbc7bac2fcc7d46e65ca382cc5142c32d56  0001-add-zpool-import-capability.patch
-820bb83f3fff5ea3426f0dc11742074269cacd287fd7155e93eea2a2ceceed72  0001-features-add-nvme.patch
-1ea7c8140c39a8dac478902bfafe230dfd05b875837b902772e02f8cb89af318  0001-make-install-nvme-and-zfs-files.patch"
-sha512sums="a4080f4709500484904aee34f93007a813c6f2470c8ba9a0493245122291e4c7460580f9ca2f3712662d8f8caea306872d0c79fa94f654300c4798a0332c19b2  mkinitfs-3.0.7.tar.xz
-815e961b6508c8b6843b8074fa752b6ff7404c1ad0bb2e9ff03211d9c7d7546c7f274fb323934ae455216feb291b05e49f1c5878bc85480757d5b501577151c6  0001-ext3-functionality-is-provided-by-ext4-module.patch
-cd395eed6bab80421891a0630c0969ce02bdbc725e3d1d24b0472888f3d847856a9e32f7b20ae41f3527a8c94696a61370396dc32c2dca15b3c837618a4310c9  0001-add-zpool-import-capability.patch
-56741b8e8455782e86716721fdc9ad3f59b9c7063d2c0ad512657eced47345da6d69aca1f3b4b59f1c131eecb1c39225bce43f342e693785633f1f6dc0c40c44  0001-features-add-nvme.patch
-cec3da5bfba7abbc2c1b3bc4eb738c0ab1938e00964fd053edb2ce44da083b6cca8e43ee5354c13f989dd71128e03421f225c3bf4b9d50f5be47b9fc39354d7c  0001-make-install-nvme-and-zfs-files.patch"
+md5sums="1267c40a5a75c28242e9f76c90d24df4  mkinitfs-3.0.9.tar.xz"
+sha256sums="42e7a5d3649eac6e23687d617c79e3ddd653164391dae7034ed828bae5ce120d  mkinitfs-3.0.9.tar.xz"
+sha512sums="f625f128aa7f570d5d65082f17ad28a1eac4c2fd9070e6d2ab027ff78b1f474122cb639de78b82fae35e6f8139f1b04e8f7ed369875bd8fd723cbb2e93ae50f1  mkinitfs-3.0.9.tar.xz"