diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-03-27 15:32:40 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-03-27 15:32:40 +0000 |
| commit | bbb7f05b06edf4fdb5158e58fa456a3bc6d9418f (patch) | |
| tree | 3a3879695db480bfbf8b8456d32cc8c7648f54dd | |
| parent | c5e3c092a8f9634c14e8fe7b57addd1a771fc24d (diff) | |
| download | aports-bbb7f05b06edf4fdb5158e58fa456a3bc6d9418f.tar.bz2 aports-bbb7f05b06edf4fdb5158e58fa456a3bc6d9418f.tar.xz | |
main/mkinitfs: fix kernel module dependencies
| -rw-r--r-- | main/mkinitfs/0001-mkinitfs-fix-kernel-module-dependency-tracing.patch | 36 | ||||
| -rw-r--r-- | main/mkinitfs/APKBUILD | 6 |
2 files changed, 41 insertions, 1 deletions
diff --git a/main/mkinitfs/0001-mkinitfs-fix-kernel-module-dependency-tracing.patch b/main/mkinitfs/0001-mkinitfs-fix-kernel-module-dependency-tracing.patch new file mode 100644 index 0000000000..1eb4af8f9d --- /dev/null +++ b/main/mkinitfs/0001-mkinitfs-fix-kernel-module-dependency-tracing.patch @@ -0,0 +1,36 @@ +From f3c65536e02764486f1dd0082c0537377ee8720b Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Thu, 27 Mar 2014 15:28:25 +0000 +Subject: [PATCH] mkinitfs: fix kernel module dependency tracing + +When searching kernel module depedencies we need to that relative +kerneldir and not relative basedir. +--- + mkinitfs.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mkinitfs.in b/mkinitfs.in +index cd10359..fc7cf34 100755 +--- a/mkinitfs.in ++++ b/mkinitfs.in +@@ -68,7 +68,7 @@ function recursedeps(k, j, dep) { + split(deps[k], dep, " "); + for (j in dep) + recursedeps(dep[j]); +- print(k); ++ print(prepend k); + } + + BEGIN { +@@ -98,7 +98,7 @@ find_kmods() { + local oldpwd="$PWD" + cd "$kerneldir" || return 1 + for file in $(feature_files "${kerneldir}/" modules); do +- echo ${file#$basedir} ++ echo ${file#${kerneldir%/}/} + done | find_kmod_deps + cd "$oldpwd" + } +-- +1.9.1 + diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD index 4849b57814..350ae70680 100644 --- a/main/mkinitfs/APKBUILD +++ b/main/mkinitfs/APKBUILD @@ -2,13 +2,14 @@ pkgname=mkinitfs pkgver=2.6.0 _ver=${pkgver%_git*} -pkgrel=2 +pkgrel=3 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-fix-kernel-module-dependency-tracing.patch eglibc.patch " arch="noarch" @@ -46,8 +47,11 @@ package() { make install DESTDIR="$pkgdir" || return 1 } md5sums="0451285f9afb152854e6d7f40c2884b3 mkinitfs-2.6.0.tar.xz +885d58c1a10258c9b81e5da77709b424 0001-mkinitfs-fix-kernel-module-dependency-tracing.patch 067649665a767ff1a08578e1f4e61524 eglibc.patch" sha256sums="03edcc91564dbe0bf3b10a05b4e034cc1ba86fc738821d8ee25171c924c6cbd6 mkinitfs-2.6.0.tar.xz +5f9e093ef33ceadb4a780e34516ffef53c0cd9ade235d0c6c23d6799718b64d8 0001-mkinitfs-fix-kernel-module-dependency-tracing.patch 2db513d1a058be0f5794dc74d00418807253d8ac850c9713ea0eeb0be5f3f65a eglibc.patch" sha512sums="49751040ba0a8834ad7c957624cb9ea853e245735f4724c0816b10d89310ffbe65026f6109de3d3629616fff0311002ea6df3162557db777b2112fdd91046a99 mkinitfs-2.6.0.tar.xz +92d625c352504ddf1f22075f60b3b8cd346a40c0592731c2403c58e27f4c7601d31b6bdf7c50b400ada2e4d084410fc0f9d3b6ddbfce48471a82a1ed909177b5 0001-mkinitfs-fix-kernel-module-dependency-tracing.patch 3498d9930889cd776a34863733d467b50b83679ea7f91d79963c81e4f1dc138f887ef1f2a696da6d836d1f6f862dcfd2c2fb9a55b0e3b2926e9f3fc648bc5a15 eglibc.patch" |