diff options
| author | Brian Bidulock | 2020-12-08 15:34:45 -0700 |
|---|---|---|
| committer | Brian Bidulock | 2020-12-08 15:34:45 -0700 |
| commit | 1e3715d51fbbcf198fe6850d6471cb687177d695 (patch) | |
| tree | ccf21a8a3285ee49ccb8fec52eda707df76dd602 | |
| parent | 37a2ca0a67a78e5172ba194af95fd98eeea34a18 (diff) | |
| download | aur-pacemaker1.1-git.tar.gz | |
uppkg
| -rw-r--r-- | .SRCINFO | 5 | ||||
| -rw-r--r-- | PKGBUILD | 15 | ||||
| -rw-r--r-- | pacemaker.install | 14 |
3 files changed, 13 insertions, 21 deletions
@@ -1,9 +1,8 @@ pkgbase = pacemaker1.1-git pkgdesc = advanced, scalable high-availability cluster resource manager (1.1 series) - pkgver = 1.1.21.r170.g5a452afbc + pkgver = 1.1.24.r0.g385048474 pkgrel = 1 url = https://github.com/ClusterLabs/pacemaker/ - install = pacemaker.install arch = i686 arch = x86_64 license = GPL2 @@ -28,7 +27,7 @@ pkgbase = pacemaker1.1-git optdepends = pdsh: for use with some tools optdepends = crmsh: for use with crm_report optdepends = booth: for geo-clustering - provides = pacemaker + provides = pacemaker=1.1.24-1 conflicts = pacemaker source = pacemaker1.1-git::git+https://github.com/ClusterLabs/pacemaker.git#branch=1.1 source = crm_report.in @@ -5,7 +5,7 @@ pkgname=pacemaker1.1-git _pkgname=pacemaker -pkgver=1.1.21.r170.g5a452afbc +pkgver=1.1.24.r0.g385048474 pkgrel=1 pkgdesc="advanced, scalable high-availability cluster resource manager (1.1 series)" arch=('i686' 'x86_64') @@ -19,9 +19,8 @@ optdepends=('pssh: for use with some tools' 'pdsh: for use with some tools' 'crmsh: for use with crm_report' 'booth: for geo-clustering') -provides=(${_pkgname}) -conflicts=(${_pkgname}) -install=${_pkgname}.install +provides=("${_pkgname}=${pkgver%%.r*}-${pkgrel}") +conflicts=("${_pkgname}") source=("$pkgname::git+https://github.com/ClusterLabs/${_pkgname}.git#branch=1.1" 'crm_report.in' 'makefile-chown.patch') @@ -44,6 +43,7 @@ prepare() { build() { cd $pkgname ./configure \ + CFLAGS="$CFLAGS -fcommon" \ CPPFLAGS= \ --sbindir=/usr/bin \ --sysconfdir=/etc \ @@ -70,6 +70,8 @@ build() { --with-configdir=/etc/pacemaker # --with-nagios-plugin-dir=DIR # --with-nagios-metadata-dir=DIR + # Fight unused direct deps + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool make V=0 } @@ -85,6 +87,11 @@ package() { d /var/lib/pacemaker/cores 0750 hacluster haclient d /var/lib/pacemaker/pengine 0750 hacluster haclient EOF + install -Dm644 /dev/null "$pkgdir/usr/lib/sysusers.d/$_pkgname.conf" + cat>"$pkgdir/usr/lib/sysusers.d/$_pkgname.conf"<<-EOF + g haclient 189 + u hacluster 189:189 "cluster user" / /sbin/nologin + EOF rm -fr "$pkgdir/var" chmod a+x "$pkgdir/usr/share/pacemaker/tests/cts/CTSlab.py" find "$pkgdir" -name '*.xml' -type f -print0 | xargs -0 chmod a-x diff --git a/pacemaker.install b/pacemaker.install deleted file mode 100644 index adf039e5698d..000000000000 --- a/pacemaker.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install(){ : - usr/bin/getent group haclient >/dev/null || usr/bin/groupadd -r haclient -g 189 - usr/bin/getent passwd hacluster >/dev/null || usr/bin/useradd -r -g 189 -u 189 -s /sbin/nologin -c "cluster user" -d / hacluster -} - -post_upgrade(){ : -} - -post_remove(){ : - usr/bin/getent group haclient >/dev/null && usr/bin/groupdel -f haclient - usr/bin/getent passwd hacluster >/dev/null && usr/bin/userdel hacluster -# usr/bin/rm -fr var/lib/pacemaker -} - |