diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-01-05 09:52:00 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-01-05 11:41:56 +0000 |
| commit | b47d31c8014e049b7fbe0520c49e5887a0058f8a (patch) | |
| tree | b0870808edf3907caa46212a72aba20d51805f7c | |
| parent | 7506c5c402525d392ed381c3f29128fb53dc652d (diff) | |
| download | aports-b47d31c8014e049b7fbe0520c49e5887a0058f8a.tar.bz2 aports-b47d31c8014e049b7fbe0520c49e5887a0058f8a.tar.xz | |
main/mkinitfs: remove upstreamed patches
| -rw-r--r-- | main/mkinitfs/0001-improve-default-config.patch | 21 | ||||
| -rw-r--r-- | main/mkinitfs/0001-mkinitfs-copy-modules.order-and-modules.builtin-if-t.patch | 29 |
2 files changed, 0 insertions, 50 deletions
diff --git a/main/mkinitfs/0001-improve-default-config.patch b/main/mkinitfs/0001-improve-default-config.patch deleted file mode 100644 index 3e02f55169..0000000000 --- a/main/mkinitfs/0001-improve-default-config.patch +++ /dev/null @@ -1,21 +0,0 @@ -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 - diff --git a/main/mkinitfs/0001-mkinitfs-copy-modules.order-and-modules.builtin-if-t.patch b/main/mkinitfs/0001-mkinitfs-copy-modules.order-and-modules.builtin-if-t.patch deleted file mode 100644 index 6bc658329b..0000000000 --- a/main/mkinitfs/0001-mkinitfs-copy-modules.order-and-modules.builtin-if-t.patch +++ /dev/null @@ -1,29 +0,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 - |