aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2018-12-20 12:29:03 +0100
committerNatanael Copa <ncopa@alpinelinux.org>2018-12-20 12:54:07 +0100
commitf4058e1a22844ae24898fa5d65eef9aaccad9dc6 (patch)
tree0cafc395357ff7a8bc69f44526719e80e5d28dff
parent11f183aa40c2d19dea778c405c3a8e8e04a30a88 (diff)
community/cfengine: fix needed symlinks
The tools seems to require binaries to be available from /var/lib/cfengine/bin. https://tracker.mender.io/browse/CFE-2936 we also add a post-install that creates the keys. (cherry picked from commit dc3b70dd0ecbb59509fe06119966422e9f7d43f2)
-rw-r--r--community/cfengine/APKBUILD17
-rw-r--r--community/cfengine/cfengine.post-install3
2 files changed, 16 insertions, 4 deletions
diff --git a/community/cfengine/APKBUILD b/community/cfengine/APKBUILD
index d1a5f613c6d..d08e30225e4 100644
--- a/community/cfengine/APKBUILD
+++ b/community/cfengine/APKBUILD
@@ -2,11 +2,12 @@
# Maintainer:
pkgname=cfengine
pkgver=3.11.0
-pkgrel=4
+pkgrel=5
pkgdesc="A systems administration tool for networks"
url="http://www.cfengine.com/"
arch="all"
license="GPL-3.0"
+install="$pkgname.post-install"
makedepends="$depends_dev lmdb-dev libressl-dev bison flex-dev
acl-dev pcre-dev linux-headers"
subpackages="$pkgname-doc $pkgname-masterfiles::noarch"
@@ -36,11 +37,22 @@ build() {
--with-lmdb \
--without-pam
make
+
+ cd "$builddirmasterfiles"
+ ./configure \
+ --prefix=/var/lib/cfengine
+ make
}
package() {
cd "$builddir"
make install DESTDIR="$pkgdir"
+
+ # not FHS but the tools seems to require those
+ install -d "$pkgdir"/var/lib/cfengine/bin
+ for i in "$pkgdir"/usr/bin/*; do
+ ln -s ../../../../usr/bin/${i##*/} "$pkgdir"/var/lib/cfengine/bin/
+ done
}
masterfiles() {
@@ -48,9 +60,6 @@ masterfiles() {
depends="cfengine"
cd "$builddirmasterfiles"
- ./configure \
- --prefix=/var/lib/cfengine
- #make install DESTDIR="$pkgdir/../$pkgname-masterfiles"
make install DESTDIR="$subpkgdir"
}
diff --git a/community/cfengine/cfengine.post-install b/community/cfengine/cfengine.post-install
new file mode 100644
index 00000000000..d29ea6f0a76
--- /dev/null
+++ b/community/cfengine/cfengine.post-install
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+cf-key || true