aboutsummaryrefslogtreecommitdiffstats
path: root/main/mkinitfs
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2013-03-14 07:11:59 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2013-03-14 07:11:59 +0000
commitbfd5ce82f0d14bc730dd99469d69bdb4d42a4762 (patch)
tree4693bfbda85a63558453265b4141ae1909899a1c /main/mkinitfs
parent6e74e3b8488682f35f78b0cc9f94941ac3393889 (diff)
downloadaports-bfd5ce82f0d14bc730dd99469d69bdb4d42a4762.tar.bz2
aports-bfd5ce82f0d14bc730dd99469d69bdb4d42a4762.tar.xz
main/mkinitfs: fix cryptdm regression
Diffstat (limited to 'main/mkinitfs')
-rw-r--r--main/mkinitfs/0001-init-fix-cryptdm-regression.patch28
-rw-r--r--main/mkinitfs/APKBUILD6
2 files changed, 33 insertions, 1 deletions
diff --git a/main/mkinitfs/0001-init-fix-cryptdm-regression.patch b/main/mkinitfs/0001-init-fix-cryptdm-regression.patch
new file mode 100644
index 0000000000..e989f2b7ed
--- /dev/null
+++ b/main/mkinitfs/0001-init-fix-cryptdm-regression.patch
@@ -0,0 +1,28 @@
+From 17c2183fdd3f788fe38a64024d15c895492114b5 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Thu, 14 Mar 2013 07:09:32 +0000
+Subject: [PATCH] init: fix cryptdm regression
+
+---
+ initramfs-init.in | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/initramfs-init.in b/initramfs-init.in
+index 3c05f81..9bce5f8 100755
+--- a/initramfs-init.in
++++ b/initramfs-init.in
+@@ -286,8 +286,9 @@ echo "Alpine Init $VERSION"
+ # acpi_osi="!Windows 2006"
+ eval set -- `cat /proc/cmdline`
+
+-myopts="alpine_dev autodetect autoraid chart cryptroot debug_init dma init_args
+- keep_apk_new modules ovl_dev pkgs quiet root_size root usbdelay"
++myopts="alpine_dev autodetect autoraid chart cryptroot cryptdm debug_init
++ dma init_args keep_apk_new modules ovl_dev pkgs quiet root_size root
++ usbdelay"
+
+ for opt; do
+ case "$opt" in
+--
+1.8.1.5
+
diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD
index bd2c8f3dc9..a34187ce0a 100644
--- a/main/mkinitfs/APKBUILD
+++ b/main/mkinitfs/APKBUILD
@@ -1,12 +1,13 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mkinitfs
pkgver=2.4.4
-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"
triggers="$pkgname.trigger=/usr/share/kernel/*"
source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
+ 0001-init-fix-cryptdm-regression.patch
eglibc.patch
"
arch="noarch"
@@ -43,8 +44,11 @@ package() {
make install DESTDIR="$pkgdir" || return 1
}
md5sums="5b897ab38204bf62ed8abf63d6b7cafd mkinitfs-2.4.4.tar.bz2
+88c6b7928cd7fd3bce1b7297083a3184 0001-init-fix-cryptdm-regression.patch
067649665a767ff1a08578e1f4e61524 eglibc.patch"
sha256sums="454e43149322e9cdfd7ea397480621b42169b5d78dd8eab1be46b96762fc5dc5 mkinitfs-2.4.4.tar.bz2
+aa458c98f5099154bc0011355acb0ba3b718677d8775b7fd2d1dc71a92e3178b 0001-init-fix-cryptdm-regression.patch
2db513d1a058be0f5794dc74d00418807253d8ac850c9713ea0eeb0be5f3f65a eglibc.patch"
sha512sums="9f0e49b20a592b4315155453e4398abf710c8bae62496d4b8d281e21d13366804084be26f0303d35ef3f0bf295eba76885ca43ff452d4aea1e59f0bdce0de18e mkinitfs-2.4.4.tar.bz2
+fe9122c5e00ba74476ade44f5e4e6b74690c10bd45cc239a5fab88468a3ee689b4880843aabe7a8efa9be2b6f0126dddbc94130d0b53866ee36138f3b3a96070 0001-init-fix-cryptdm-regression.patch
3498d9930889cd776a34863733d467b50b83679ea7f91d79963c81e4f1dc138f887ef1f2a696da6d836d1f6f862dcfd2c2fb9a55b0e3b2926e9f3fc648bc5a15 eglibc.patch"