diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2017-11-20 17:58:54 +0100 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2017-11-20 17:59:27 +0100 |
| commit | 954391ce7493439d12180d5c5118dee26f8ac587 (patch) | |
| tree | b3ececacf90c8611099f8a3b40108018ef589451 /main/mkinitfs | |
| parent | bf14e7baab482cca83b66227ff0414655826ecca (diff) | |
| download | aports-954391ce7493439d12180d5c5118dee26f8ac587.tar.bz2 aports-954391ce7493439d12180d5c5118dee26f8ac587.tar.xz | |
main/mkinitfs: fix building initfs without a kernel
Diffstat (limited to 'main/mkinitfs')
| -rw-r--r-- | main/mkinitfs/0003-fix-nokernel.patch | 40 | ||||
| -rw-r--r-- | main/mkinitfs/APKBUILD | 6 |
2 files changed, 44 insertions, 2 deletions
diff --git a/main/mkinitfs/0003-fix-nokernel.patch b/main/mkinitfs/0003-fix-nokernel.patch new file mode 100644 index 0000000000..fa1c219d2c --- /dev/null +++ b/main/mkinitfs/0003-fix-nokernel.patch @@ -0,0 +1,40 @@ +From 0decf8e6eb8e62e9b9311150bbc5acac483d91d3 Mon Sep 17 00:00:00 2001 +From: Andrej <xentec@users.noreply.github.com> +Date: Wed, 15 Nov 2017 11:07:24 +0100 +Subject: [PATCH] mkinitfs: fix building initfs without a kernel + +--- + mkinitfs.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/mkinitfs.in b/mkinitfs.in +index 0cd5d30..83333ca 100755 +--- a/mkinitfs.in ++++ b/mkinitfs.in +@@ -103,7 +103,7 @@ find_kmods() { + } + + initfs_kmods() { +- [ -z "$nokernel" ] || return ++ [ -z "$nokernel" ] || return 0 + local glob= file= files= dirs= + rm -rf "$tmpdir"/lib/modules + # make sure we have modules.dep +@@ -125,7 +125,7 @@ initfs_kmods() { + } + + initfs_firmware() { +- [ -z "$nokernel" ] || return ++ [ -z "$nokernel" ] || return 0 + rm -rf "$tmpdir"/lib/firmware + mkdir -p "$tmpdir"/lib/firmware + find "$tmpdir"/lib/modules -type f -name "*.ko" | xargs modinfo -F firmware | sort -u | while read FW; do +@@ -233,7 +233,7 @@ if [ -z "$outfile" ]; then + outfile="${basedir}boot/initramfs-${kflavor}" + fi + +-if [ -z "$nokernel"] && [ ! -d "$kerneldir" ]; then ++if [ -z "$nokernel" ] && [ ! -d "$kerneldir" ]; then + echo "$kerneldir does not exist or is not a directory" + exit 1 + fi diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD index 21dfe72d54..2d81f6339d 100644 --- a/main/mkinitfs/APKBUILD +++ b/main/mkinitfs/APKBUILD @@ -2,7 +2,7 @@ pkgname=mkinitfs pkgver=3.1.0 _ver=${pkgver%_git*} -pkgrel=3 +pkgrel=4 pkgdesc="Tool to generate initramfs images for Alpine" url="https://git.alpinelinux.org/cgit/mkinitfs" arch="all" @@ -16,6 +16,7 @@ triggers="$pkgname.trigger=/usr/share/kernel/*" source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$_ver.tar.xz 0001-features-ext4-needs-crc32.patch 0002-fix-booting-from-btrfs-raid.patch + 0003-fix-nokernel.patch " builddir="$srcdir/$pkgname-$_ver" @@ -31,4 +32,5 @@ package() { sha512sums="ec80702c6b41cb7898679377bef949cc1079b006c2dcc760c801f60a411eb1d3b3fd34ae2088b0bd3779202953466bce6efd62253d93dda32a8bca9bcd8942fc mkinitfs-3.1.0.tar.xz e66961014d5d68c6e5a529f365f2d8d17fb0c10892b4a61d0c7838ae01ed11f1749912badd902af3a9b5452de72647dd007dda1653c4b0fcd9a6b95e7bf834b9 0001-features-ext4-needs-crc32.patch -97c3864596059e134529fa395b05eca556c7d90005716716e67895f021e6f1fe33b2f1d85f1145048e092aae595da0bff5578caa23863224042982dabb7b7993 0002-fix-booting-from-btrfs-raid.patch" +97c3864596059e134529fa395b05eca556c7d90005716716e67895f021e6f1fe33b2f1d85f1145048e092aae595da0bff5578caa23863224042982dabb7b7993 0002-fix-booting-from-btrfs-raid.patch +2bb166b1b7702c4c64aa7e4b433bc1ebc357e8787f7e6d1e607b459c66bc8ba78d12cd7a4ff9a49d31427e9fbe8ee62836024e2137bf30354e08251ba0a32739 0003-fix-nokernel.patch" |