diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2017-08-03 15:02:34 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-08-03 15:03:24 +0200 |
| commit | 32dd6f16bf1645ffdf1f6019575fc130702fa047 (patch) | |
| tree | 53606475d8412b2ec87076604646c7e1acba72a4 | |
| parent | f05d7396b570645b7b9e3c8067db675c2cb4da96 (diff) | |
| download | aports-32dd6f16bf1645ffdf1f6019575fc130702fa047.tar.bz2 aports-32dd6f16bf1645ffdf1f6019575fc130702fa047.tar.xz | |
main/mkinitfs: fix crc32 module deps for ext4
ref #7611
| -rw-r--r-- | main/mkinitfs/0001-features-ext4-needs-crc32.patch | 33 | ||||
| -rw-r--r-- | main/mkinitfs/APKBUILD | 6 |
2 files changed, 37 insertions, 2 deletions
diff --git a/main/mkinitfs/0001-features-ext4-needs-crc32.patch b/main/mkinitfs/0001-features-ext4-needs-crc32.patch new file mode 100644 index 0000000000..1bd3429119 --- /dev/null +++ b/main/mkinitfs/0001-features-ext4-needs-crc32.patch @@ -0,0 +1,33 @@ +From 9d2040756a0b701c79140f14ce7c8d53d66a2d40 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Thu, 3 Aug 2017 14:59:48 +0200 +Subject: [PATCH] features: ext4 needs crc32 + +ref #7611 + +fix a duplicate in xfs while at it +--- + features.d/ext4.modules | 2 ++ + features.d/xfs.modules | 1 - + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/features.d/ext4.modules b/features.d/ext4.modules +index a5bb1c3..45eaf5e 100644 +--- a/features.d/ext4.modules ++++ b/features.d/ext4.modules +@@ -1 +1,3 @@ ++kernel/arch/*/crypto/crc32* ++kernel/crypto/crc32* + kernel/fs/ext4 +diff --git a/features.d/xfs.modules b/features.d/xfs.modules +index 2b7fd53..cbf9f0b 100644 +--- a/features.d/xfs.modules ++++ b/features.d/xfs.modules +@@ -1,4 +1,3 @@ + kernel/arch/*/crypto/crc32* +-kernel/arch/*/crypto/crc32* + kernel/crypto/crc32* + kernel/fs/xfs +-- +2.13.2 + diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD index d710a76207..96ab3b89d9 100644 --- a/main/mkinitfs/APKBUILD +++ b/main/mkinitfs/APKBUILD @@ -2,7 +2,7 @@ pkgname=mkinitfs pkgver=3.1.0 _ver=${pkgver%_git*} -pkgrel=0 +pkgrel=1 pkgdesc="Tool to generate initramfs images for Alpine" url="http://git.alpinelinux.org/cgit/mkinitfs" makedepends_build="" @@ -12,6 +12,7 @@ depends="busybox apk-tools>=2.0 lddtree>=1.25" install="$pkgname.pre-upgrade $pkgname.post-install $pkgname.post-upgrade" triggers="$pkgname.trigger=/usr/share/kernel/*" source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$_ver.tar.xz + 0001-features-ext4-needs-crc32.patch " arch="all" license="GPL2" @@ -27,4 +28,5 @@ package() { make install DESTDIR="$pkgdir" || return 1 } -sha512sums="ec80702c6b41cb7898679377bef949cc1079b006c2dcc760c801f60a411eb1d3b3fd34ae2088b0bd3779202953466bce6efd62253d93dda32a8bca9bcd8942fc mkinitfs-3.1.0.tar.xz" +sha512sums="ec80702c6b41cb7898679377bef949cc1079b006c2dcc760c801f60a411eb1d3b3fd34ae2088b0bd3779202953466bce6efd62253d93dda32a8bca9bcd8942fc mkinitfs-3.1.0.tar.xz +e66961014d5d68c6e5a529f365f2d8d17fb0c10892b4a61d0c7838ae01ed11f1749912badd902af3a9b5452de72647dd007dda1653c4b0fcd9a6b95e7bf834b9 0001-features-ext4-needs-crc32.patch" |