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