main/mkinitfs: remove unused patches

3 files changed, 0 insertions, 128 deletions

diff --git a/main/mkinitfs/0001-features-ext4-needs-crc32.patch b/main/mkinitfs/0001-features-ext4-needs-crc32.patch
deleted file mode 100644
index 1bd3429119..0000000000
--- a/main/mkinitfs/0001-features-ext4-needs-crc32.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 9d2040756a0b701c79140f14ce7c8d53d66a2d40 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 3 Aug 2017 14:59:48 +0200
-Subject: [PATCH] features: ext4 needs crc32
-
-ref #7611
-
-fix a duplicate in xfs while at it
----
- features.d/ext4.modules | 2 ++
- features.d/xfs.modules  | 1 -
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/features.d/ext4.modules b/features.d/ext4.modules
-index a5bb1c3..45eaf5e 100644
---- a/features.d/ext4.modules
-+++ b/features.d/ext4.modules
-@@ -1 +1,3 @@
-+kernel/arch/*/crypto/crc32*
-+kernel/crypto/crc32*
- kernel/fs/ext4
-diff --git a/features.d/xfs.modules b/features.d/xfs.modules
-index 2b7fd53..cbf9f0b 100644
---- a/features.d/xfs.modules
-+++ b/features.d/xfs.modules
-@@ -1,4 +1,3 @@
- kernel/arch/*/crypto/crc32*
--kernel/arch/*/crypto/crc32*
- kernel/crypto/crc32*
- kernel/fs/xfs
--- 
-2.13.2
-
diff --git a/main/mkinitfs/0002-fix-booting-from-btrfs-raid.patch b/main/mkinitfs/0002-fix-booting-from-btrfs-raid.patch
deleted file mode 100644
index 849f8083b6..0000000000
--- a/main/mkinitfs/0002-fix-booting-from-btrfs-raid.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 873bda089bd05adbe74ad17cae063ee4bcbe25de Mon Sep 17 00:00:00 2001
-From: Jakub Jirutka <jakub@jirutka.cz>
-Date: Fri, 22 Sep 2017 00:41:47 +0200
-Subject: [PATCH] fix booting from btrfs on multiple devices
-
-https://btrfs.wiki.kernel.org/index.php/Using_Btrfs_with_Multiple_Devices:
-> btrfs device scan is used to scan all of the block devices under /dev
-> and probe for Btrfs volumes. This is required after loading the btrfs
-> module if you're running with more than one device in a filesystem.
-
-See http://bugs.alpinelinux.org/issues/6903
----
- Makefile | 1 +
- features.d/btrfs.files | 1 +
- initramfs-init.in      | 4 ++++
- 3 files changed, 6 insertions(+)
- create mode 100644 features.d/btrfs.files
-
-diff --git a/Makefile b/Makefile
-index 01a678b..6545557 100644
---- a/Makefile
-+++ b/Makefile
-@@ -12,6 +12,7 @@ CONF_FILES	:= mkinitfs.conf \
- 		features.d/base.files \
- 		features.d/base.modules \
- 		features.d/bootchart.files \
-+		features.d/btrfs.files \
- 		features.d/btrfs.modules \
- 		features.d/cdrom.modules \
- 		features.d/cramfs.modules \
-diff --git a/features.d/btrfs.files b/features.d/btrfs.files
-new file mode 100644
-index 0000000..3729b89
---- /dev/null
-+++ b/features.d/btrfs.files
-@@ -0,0 +1 @@
-+/sbin/btrfs
-diff --git a/initramfs-init.in b/initramfs-init.in
-index be7b1c3..f3a3ee5 100755
---- a/initramfs-init.in
-+++ b/initramfs-init.in
-@@ -388,6 +388,10 @@ if [ -n "$KOPT_root" ]; then
- 	nlplug-findfs $cryptopts -p /sbin/mdev ${KOPT_debug_init:+-d} \
- 		$KOPT_root
- 
-+	if echo "$KOPT_modules $KOPT_rootfstype" | grep -qw btrfs; then
-+		/sbin/btrfs device scan || echo "Failed to scan devices for btrfs filesystem."
-+	fi
-+
- 	if [ -n "$KOPT_resume" ]; then
- 		echo "Resume from disk"
- 		if [ -e /sys/power/resume ]; then
--- 
-2.10.1 (Apple Git-78)
-
diff --git a/main/mkinitfs/0003-fix-nokernel.patch b/main/mkinitfs/0003-fix-nokernel.patch
deleted file mode 100644
index fa1c219d2c..0000000000
--- a/main/mkinitfs/0003-fix-nokernel.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 0decf8e6eb8e62e9b9311150bbc5acac483d91d3 Mon Sep 17 00:00:00 2001
-From: Andrej <xentec@users.noreply.github.com>
-Date: Wed, 15 Nov 2017 11:07:24 +0100
-Subject: [PATCH] mkinitfs: fix building initfs without a kernel
-
----
- mkinitfs.in | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/mkinitfs.in b/mkinitfs.in
-index 0cd5d30..83333ca 100755
---- a/mkinitfs.in
-+++ b/mkinitfs.in
-@@ -103,7 +103,7 @@ find_kmods() {
- }
- 
- initfs_kmods() {
--	[ -z "$nokernel" ] || return
-+	[ -z "$nokernel" ] || return 0
- 	local glob= file= files= dirs=
- 	rm -rf "$tmpdir"/lib/modules
- 	# make sure we have modules.dep
-@@ -125,7 +125,7 @@ initfs_kmods() {
- }
- 
- initfs_firmware() {
--	[ -z "$nokernel" ] || return
-+	[ -z "$nokernel" ] || return 0
- 	rm -rf "$tmpdir"/lib/firmware
- 	mkdir -p "$tmpdir"/lib/firmware
- 	find "$tmpdir"/lib/modules -type f -name "*.ko" | xargs modinfo -F firmware | sort -u | while read FW; do
-@@ -233,7 +233,7 @@ if [ -z "$outfile" ]; then
- 	outfile="${basedir}boot/initramfs-${kflavor}"
- fi
- 
--if [ -z "$nokernel"] && [ ! -d "$kerneldir" ]; then
-+if [ -z "$nokernel" ] && [ ! -d "$kerneldir" ]; then
- 	echo "$kerneldir does not exist or is not a directory"
- 	exit 1
- fi