Commit 929cfea5 authored by Natanael Copa's avatar Natanael Copa Committed by Timo Teräs

main/mkinitfs: remove upstreamed patches

(cherry picked from commit b47d31c8)
parent 00390dde
From 2a381dc128550dbf836f72ffaec1ce78c9436474 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 28 Aug 2015 09:37:13 +0200
Subject: [PATCH] improve default config
remove bootchart and floppy from default config and add mmc
---
mkinitfs.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mkinitfs.conf b/mkinitfs.conf
index 35cc96a..67a5444 100644
--- a/mkinitfs.conf
+++ b/mkinitfs.conf
@@ -1,2 +1,2 @@
# run mkinitfs -L for a list of available features
-features="ata base bootchart cdrom cramfs ext2 ext3 ext4 floppy keymap kms raid scsi usb virtio"
+features="ata base cdrom ext2 ext3 ext4 keymap kms mmc raid scsi usb virtio"
--
2.5.0
From 2124cf8473a0d1ebbeb6f9d639a8dd254135351d Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 30 Jul 2015 15:11:47 +0200
Subject: [PATCH] mkinitfs: copy modules.order and modules.builtin if those
exist
---
mkinitfs.in | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/mkinitfs.in b/mkinitfs.in
index 04dc99c..c724e68 100755
--- a/mkinitfs.in
+++ b/mkinitfs.in
@@ -115,6 +115,11 @@ initfs_kmods() {
for file in $(find_kmods); do
echo "${file#/}"
done | sort -u | cpio -pdm "$tmpdir" || return 1
+ for file in modules.order modules.builtin; do
+ if [ -f "$kerneldir"/$file ]; then
+ cp "$kerneldir"/$file "$tmpdir"/lib/modules/$kernel/
+ fi
+ done
depmod $kernel -b "$tmpdir"
cd "$oldpwd"
}
--
2.5.0
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment