diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2018-12-20 12:29:03 +0100 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-12-20 12:54:07 +0100 |
commit | f4058e1a22844ae24898fa5d65eef9aaccad9dc6 (patch) | |
tree | 0cafc395357ff7a8bc69f44526719e80e5d28dff | |
parent | 11f183aa40c2d19dea778c405c3a8e8e04a30a88 (diff) | |
download | alpine_aports-f4058e1a22844ae24898fa5d65eef9aaccad9dc6.tar.bz2 alpine_aports-f4058e1a22844ae24898fa5d65eef9aaccad9dc6.tar.xz alpine_aports-f4058e1a22844ae24898fa5d65eef9aaccad9dc6.zip |
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/APKBUILD | 17 | ||||
-rw-r--r-- | community/cfengine/cfengine.post-install | 3 |
2 files changed, 16 insertions, 4 deletions
diff --git a/community/cfengine/APKBUILD b/community/cfengine/APKBUILD index d1a5f613c6..d08e30225e 100644 --- a/community/cfengine/APKBUILD +++ b/community/cfengine/APKBUILD | |||
@@ -2,11 +2,12 @@ | |||
2 | # Maintainer: | 2 | # Maintainer: |
3 | pkgname=cfengine | 3 | pkgname=cfengine |
4 | pkgver=3.11.0 | 4 | pkgver=3.11.0 |
5 | pkgrel=4 | 5 | pkgrel=5 |
6 | pkgdesc="A systems administration tool for networks" | 6 | pkgdesc="A systems administration tool for networks" |
7 | url="http://www.cfengine.com/" | 7 | url="http://www.cfengine.com/" |
8 | arch="all" | 8 | arch="all" |
9 | license="GPL-3.0" | 9 | license="GPL-3.0" |
10 | install="$pkgname.post-install" | ||
10 | makedepends="$depends_dev lmdb-dev libressl-dev bison flex-dev | 11 | makedepends="$depends_dev lmdb-dev libressl-dev bison flex-dev |
11 | acl-dev pcre-dev linux-headers" | 12 | acl-dev pcre-dev linux-headers" |
12 | subpackages="$pkgname-doc $pkgname-masterfiles::noarch" | 13 | subpackages="$pkgname-doc $pkgname-masterfiles::noarch" |
@@ -36,11 +37,22 @@ build() { | |||
36 | --with-lmdb \ | 37 | --with-lmdb \ |
37 | --without-pam | 38 | --without-pam |
38 | make | 39 | make |
40 | |||
41 | cd "$builddirmasterfiles" | ||
42 | ./configure \ | ||
43 | --prefix=/var/lib/cfengine | ||
44 | make | ||
39 | } | 45 | } |
40 | 46 | ||
41 | package() { | 47 | package() { |
42 | cd "$builddir" | 48 | cd "$builddir" |
43 | make install DESTDIR="$pkgdir" | 49 | make install DESTDIR="$pkgdir" |
50 | |||
51 | # not FHS but the tools seems to require those | ||
52 | install -d "$pkgdir"/var/lib/cfengine/bin | ||
53 | for i in "$pkgdir"/usr/bin/*; do | ||
54 | ln -s ../../../../usr/bin/${i##*/} "$pkgdir"/var/lib/cfengine/bin/ | ||
55 | done | ||
44 | } | 56 | } |
45 | 57 | ||
46 | masterfiles() { | 58 | masterfiles() { |
@@ -48,9 +60,6 @@ masterfiles() { | |||
48 | depends="cfengine" | 60 | depends="cfengine" |
49 | 61 | ||
50 | cd "$builddirmasterfiles" | 62 | cd "$builddirmasterfiles" |
51 | ./configure \ | ||
52 | --prefix=/var/lib/cfengine | ||
53 | #make install DESTDIR="$pkgdir/../$pkgname-masterfiles" | ||
54 | make install DESTDIR="$subpkgdir" | 63 | make install DESTDIR="$subpkgdir" |
55 | } | 64 | } |
56 | 65 | ||
diff --git a/community/cfengine/cfengine.post-install b/community/cfengine/cfengine.post-install new file mode 100644 index 0000000000..d29ea6f0a7 --- /dev/null +++ b/community/cfengine/cfengine.post-install | |||
@@ -0,0 +1,3 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | cf-key || true | ||