diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-07-30 13:13:56 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-07-30 13:14:51 +0000 |
| commit | 5c4f00a1b2212fcd57d9d4c8df77019dbbcfe29b (patch) | |
| tree | 52eae757f99ba7454edca5e32b9ae5b3c539dda6 /main/mkinitfs | |
| parent | 7494b7c4712ab85697fd89db2da7af789dbe0e46 (diff) | |
| download | aports-5c4f00a1b2212fcd57d9d4c8df77019dbbcfe29b.tar.bz2 aports-5c4f00a1b2212fcd57d9d4c8df77019dbbcfe29b.tar.xz | |
main/mkinitfs: fix libkmod compat
copy modules.{order,builtin} if those exist
Diffstat (limited to 'main/mkinitfs')
| -rw-r--r-- | main/mkinitfs/0001-mkinitfs-copy-modules.order-and-modules.builtin-if-t.patch | 29 | ||||
| -rw-r--r-- | main/mkinitfs/APKBUILD | 12 |
2 files changed, 37 insertions, 4 deletions
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 new file mode 100644 index 0000000000..6bc658329b --- /dev/null +++ b/main/mkinitfs/0001-mkinitfs-copy-modules.order-and-modules.builtin-if-t.patch @@ -0,0 +1,29 @@ +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 + diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD index 039b1890da..2129989d77 100644 --- a/main/mkinitfs/APKBUILD +++ b/main/mkinitfs/APKBUILD @@ -2,13 +2,14 @@ pkgname=mkinitfs pkgver=2.8.0 _ver=${pkgver%_git*} -pkgrel=0 +pkgrel=1 pkgdesc="Tool to generate initramfs images for Alpine" url=http://git.alpinelinux.org/cgit/mkinitfs depends="busybox apk-tools>=2.0 lddtree>=1.25" install="$pkgname.pre-upgrade" triggers="$pkgname.trigger=/usr/share/kernel/*" source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$_ver.tar.xz + 0001-mkinitfs-copy-modules.order-and-modules.builtin-if-t.patch " arch="noarch" license="GPL-2" @@ -34,6 +35,9 @@ package() { cd "$_builddir" make install DESTDIR="$pkgdir" || return 1 } -md5sums="1a321336d97b22257349ddd36884ec34 mkinitfs-2.8.0.tar.xz" -sha256sums="5ffe4c5ec9e0ff4581e5b24301fd30d0964120d6b30ee78ea79f31ff48eeab73 mkinitfs-2.8.0.tar.xz" -sha512sums="c103003f95c7d7d94daa41d0a81b210a0208c93d77203978554fb127a21e2f143b56990865fc53e2c5c732ef663603b297da63d31f915b1e3a3e0f3818aa8f2e mkinitfs-2.8.0.tar.xz" +md5sums="1a321336d97b22257349ddd36884ec34 mkinitfs-2.8.0.tar.xz +25e11e719a8d90e1e19079c1ba517285 0001-mkinitfs-copy-modules.order-and-modules.builtin-if-t.patch" +sha256sums="5ffe4c5ec9e0ff4581e5b24301fd30d0964120d6b30ee78ea79f31ff48eeab73 mkinitfs-2.8.0.tar.xz +892248aa8561596845794f1a3682456eaedcb7a158b19be40292363856c0a826 0001-mkinitfs-copy-modules.order-and-modules.builtin-if-t.patch" +sha512sums="c103003f95c7d7d94daa41d0a81b210a0208c93d77203978554fb127a21e2f143b56990865fc53e2c5c732ef663603b297da63d31f915b1e3a3e0f3818aa8f2e mkinitfs-2.8.0.tar.xz +4b5e259a5fccef757bc6c7fe79a6ce71e91c210e7f53cfd8e6fbff2737acb3bae7e915a13f3523ff46689480aa0eb7aba5419ea31c7c814e47f4db06faf7746c 0001-mkinitfs-copy-modules.order-and-modules.builtin-if-t.patch" |