From 49b7ed8a5a98c20000dcbfd782830525316b0a04 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 25 Jan 2018 00:20:52 +0000
Subject: [PATCH] main/mkinitfs: temporarily depend on cryptsetup1
we need to temporarily use cryptsetup1 since mkinintfs is already
installed on the builders and depends on cryptsetup-libs (previous
version). We do this so we can install cryptsetup-dev 2.0.0 which
conflicts whith the runtime dep of mkinitfs.
---
main/mkinitfs/APKBUILD | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD
index e65f914bd7e0..638445809bff 100644
--- a/main/mkinitfs/APKBUILD
+++ b/main/mkinitfs/APKBUILD
@@ -2,20 +2,19 @@
pkgname=mkinitfs
pkgver=3.2.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"
license="GPL-2.0"
makedepends_build=""
-makedepends_host="busybox kmod-dev util-linux-dev cryptsetup-dev>=2.0.0 linux-headers"
+makedepends_host="busybox kmod-dev util-linux-dev cryptsetup1-dev linux-headers"
makedepends="$makedepends_build $makedepends_host"
depends="busybox apk-tools>=2.9.1 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-skip-hooks-on-diskless-install.patch
- 0001-nlplug-findfs-add-primitive-support-for-LUKS2-contai.patch
"
builddir="$srcdir/$pkgname-$_ver"
@@ -30,5 +29,4 @@ package() {
}
sha512sums="906bfbce677d4ece9c9fea7b2a529121740bc9d96ea011be083303cc5c56162f09271b0a673e9e335234ccf2f293109bda1eda333698a95357d0772c86f498af mkinitfs-3.2.0.tar.xz
-f5c9b21e53c663dac1b8f33f929dbe067492f0dc1bd5ef5310ef531033f31fc3fa0b6de6dce03cecaf90b8ed47b278d0f1f7c64dbbeede7621c895ee3ea79864 0001-skip-hooks-on-diskless-install.patch
-4d298d73cc6e557c51de805721ef4b9f002498af5dd9f0aebfd6620ec84d1fadde76888bc2d40efc71dc0a8497aa0586ac65d596eb0021bfed633adcc3aca3b4 0001-nlplug-findfs-add-primitive-support-for-LUKS2-contai.patch"
+f5c9b21e53c663dac1b8f33f929dbe067492f0dc1bd5ef5310ef531033f31fc3fa0b6de6dce03cecaf90b8ed47b278d0f1f7c64dbbeede7621c895ee3ea79864 0001-skip-hooks-on-diskless-install.patch"
--
GitLab