From b72845626d062a99a4556e041b126e3eed94abb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?= Date: Fri, 31 May 2013 07:27:46 -0300 Subject: resource-agent, heartbeat, pacemaker: drop ha- prefix type and drop unused services --- pcr/resource-agent/PKGBUILD | 68 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 pcr/resource-agent/PKGBUILD (limited to 'pcr/resource-agent') diff --git a/pcr/resource-agent/PKGBUILD b/pcr/resource-agent/PKGBUILD new file mode 100644 index 000000000..15438769a --- /dev/null +++ b/pcr/resource-agent/PKGBUILD @@ -0,0 +1,68 @@ +# Maintainer (Parabola): Márcio Silva + +pkgname=ha-resourceagent +_pkgname=${pkgname:3} +_xname=${_pkgname::8} +_yname=${_pkgname:8} +_Name=${_xname^}_${_yname^} +_name=${_xname}-${_yname}s +pkgver=3.9.5 +pkgrel=3 +pkgdesc='Standardized interface for a cluster resource' +arch=( + i686 + x86_64 + mips64el +) +url=http://linux-ha.org/wiki/$_Name +license=GPL +depends=ha-glue +optdepends=( + net-tools + openssh +) +makedepends=( + #libxslt + libvirt + net-tools + openssh +) +source=( + https://github.com/ClusterLabs/$_name/archive/v$pkgver.tar.gz + ha-ldirector.service +) +sha512sums=( + 668955de7a80577a1fb599d03b0a47589a00aed3017b532931b5132b877e45778c590f26d3057ee763c35973b0f6b032e2f74ebdf0b5f45b5e402b0f13b8ff4e + 9e257b31305657a5164eebf6893d84496ef5dc5e80058dda5cd250c847c8247e10410cca99f0a481fa461487198fa59640e09d1e81fc3199a54f3ec85c56d9a3 +) + +prepare() { + cd $srcdir/$_name-$pkgver + sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|; + ' configure.ac + sed -i 's|INCLUDES|AM_CPPFLAGS|; + ' {heartbeat,tools}/Makefile.am +} + +build() { + cd $srcdir/$_name-$pkgver + setarch $CARCH ./autogen.sh + setarch $CARCH ./configure --prefix=/usr\ + --enable-fatal-warnings\ + --enable-libnet\ + --libdir=/usr/lib\ + --localstatedir=/var\ + --sysconfdir=/etc\ + --with-ocf-root=/usr/lib/ocf + setarch $CARCH make +} + +package() { + cd $srcdir/$_name-$pkgver + setarch $CARCH make DESTDIR=$pkgdir install + + install -d $pkgdir/usr/lib/systemd/system + install -Dm644 $srcdir/ha-ldirector.service $pkgdir/usr/lib/systemd/system +} + +# vim:set ts=2 sw=2 et: -- cgit v1.2.3-2-g168b From 2d065a8d237bbc04912ac803a886f566406ce273 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?= Date: Fri, 31 May 2013 16:40:45 -0300 Subject: cluster-glue, openhpi, openipmi, resource-agent: fixing pkg --- pcr/resource-agent/PKGBUILD | 185 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 160 insertions(+), 25 deletions(-) (limited to 'pcr/resource-agent') diff --git a/pcr/resource-agent/PKGBUILD b/pcr/resource-agent/PKGBUILD index 15438769a..39eb6cb7a 100644 --- a/pcr/resource-agent/PKGBUILD +++ b/pcr/resource-agent/PKGBUILD @@ -1,51 +1,174 @@ -# Maintainer (Parabola): Márcio Silva +# Maintainer: Márcio Silva -pkgname=ha-resourceagent -_pkgname=${pkgname:3} -_xname=${_pkgname::8} -_yname=${_pkgname:8} -_Name=${_xname^}_${_yname^} -_name=${_xname}-${_yname}s +pkgname=resource-agent +_pkgname1=${pkgname::8} +_pkgname2=${pkgname:8} +_pkgnamex=${_pkgname1^}_${_pkgname2^} +_pkgnamey=${pkgname}s +_pkgnamez=ha-${_pkgname1}${_pkgname2} pkgver=3.9.5 -pkgrel=3 -pkgdesc='Standardized interface for a cluster resource' +pkgrel=4 +pkgdesc='Standardized interface for a cluster resource (Linux-HA)' arch=( i686 x86_64 mips64el ) -url=http://linux-ha.org/wiki/$_Name +group=linux-ha +url=http://$group.org/wiki/$_pkgnamex license=GPL -depends=ha-glue +depends=( + #clulog? + cluster-glue + perl-socket6 + perl-lwp-protocol-https + perl-io-socket-inet6 + perl-mailtools + ipvsadm +) optdepends=( net-tools openssh ) makedepends=( - #libxslt + libxslt libvirt net-tools openssh ) -source=( - https://github.com/ClusterLabs/$_name/archive/v$pkgver.tar.gz - ha-ldirector.service -) -sha512sums=( - 668955de7a80577a1fb599d03b0a47589a00aed3017b532931b5132b877e45778c590f26d3057ee763c35973b0f6b032e2f74ebdf0b5f45b5e402b0f13b8ff4e - 9e257b31305657a5164eebf6893d84496ef5dc5e80058dda5cd250c847c8247e10410cca99f0a481fa461487198fa59640e09d1e81fc3199a54f3ec85c56d9a3 -) +options=(!libtool) +provides=($_pkgnamez) +conflicts=$_pkgnamez +replaces=$_pkgnamez +source=https://github.com/ClusterLabs/$_pkgnamey/archive/v$pkgver.tar.gz +sha512sums=668955de7a80577a1fb599d03b0a47589a00aed3017b532931b5132b877e45778c590f26d3057ee763c35973b0f6b032e2f74ebdf0b5f45b5e402b0f13b8ff4e prepare() { - cd $srcdir/$_name-$pkgver + cd $srcdir/$_pkgnamey-$pkgver + sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|; ' configure.ac + sed -i 's|INCLUDES|AM_CPPFLAGS|; - ' {heartbeat,tools}/Makefile.am + ' $(grep -rl INCLUDES | grep Makefile.am) + + # fixing path + sed -i 's|bin/sh|usr/bin/bash|; + ' $(grep -rl bin/sh) + sed -i 's| /bin| /usr/bin|; + ' $(grep -rl ' /bin') + sed -i 's| /sbin| /usr/bin|; + ' $(grep -rl ' /sbin') + sed -i 's|usr/sbin|usr/bin|; + ' $(grep -rl usr/sbin) + sed -i 's|/lib64|/lib|; + ' $(grep -rl /lib64) + #sed -i 's|usr/libexec|usr/lib|; + # ' $(grep -rl usr/libexec) + sed -i 's|var/lock|run/lock|; + ' $(grep -rl var/lock) + sed -i 's|var/run|run|; + ' $(grep -rl var/run) + + # remove Open Source term + sed -i 's|Open Source / ||; + s|open source / ||; + s|Open Source|Free Software|; + s|open source|free software|; + s|Free Software Development Lab|Open Source Development Lab|; + ' $(grep -ril 'open source') + sed -i 's|OpenSource / ||; + s|opensource / ||; + s|OpenSource|FreeSoftware|; + s|opensource|freesoftware|; + s|freesoftware.org|opensource.org|; + s|http://www.opensource.org/|http://www.gnu.org/philosophy/free-sw.html|; + s|http://www.gnu.org/philosophy/free-sw.htmllicenses/osl-|http://opensource.org/licenses/osl-|; + s|http://www.gnu.org/philosophy/free-sw.htmlosd|http://opensource.org/osd|; + ' $(grep -ril opensource) + + # remove Linux term + sed -i 's|Linux,|GNU/Linux,|; + s|Linux and|GNU/Linux and|; + s|Linux distro|GNU/Linux distro|; + s|Linux distribution|GNU/Linux distribution|; + s|Linux machine|GNU/Linux machine|; + s|Linux Only|GNU/Linux Only|; + s|Linux only|GNU/Linux only|; + s|Linux operating|GNU/Linux operating|; + s|Linux OS|GNU/Linux OS|; + s|Linux platform|GNU/Linux platform|; + s|Linux software|GNU/Linux software|; + s|Linux specific|GNU/Linux specific|; + s|Linux system|GNU/Linux system|; + s|Linux will|GNU/Linux will|; + s|# Linux$|# GNU/Linux|; + s|# Linux.$|# GNU/Linux.|; + s|* Linux$|* GNU/Linux|; + s|* Linux.$|* GNU/Linux.|; + s|// Linux$|// GNU/Linux|; + s|// Linux.$|// GNU/Linux.|; + s|, Linux|, GNU/Linux|; + s|As Linux|As GNU/Linux|; + s|as Linux|as GNU/Linux|; + s|And Linux|And GNU/Linux|; + s|and Linux|and GNU/Linux|; + s|Be Linux|Be GNU/Linux|; + s|be Linux|be GNU/Linux|; + s|Because Linux|Because GNU/Linux|; + s|because Linux|because GNU/Linux|; + s|e.g. Linux|e.g. GNU/Linux|; + s|For Linux|For GNU/Linux|; + s|for Linux|for GNU/Linux|; + s|In Linux|In GNU/Linux|; + s|in Linux|in GNU/Linux|; + s|Like Linux|Like GNU/Linux|; + s|like Linux|like GNU/Linux|; + s|non-Linux|non GNU/Linux|; + s|Of Linux|Of GNU/Linux|; + s|of Linux|of GNU/Linux|; + s|On Linux|On GNU/Linux|; + s|on Linux|on GNU/Linux|; + s|OS type: Linux|OS type: GNU/Linux|; + s|Other Linux|Other GNU/Linux|; + s|other Linux|other GNU/Linux|; + s|The Linux|The GNU/Linux|; + s|the Linux|the GNU/Linux|; + s|Typically Linux|Typically GNU/Linux|; + s|typically Linux|typically GNU/Linux|; + s|To Linux|To GNU/Linux|; + s|to Linux|to GNU/Linux|; + s|Under Linux|Under GNU/Linux|; + s|under Linux|under GNU/Linux|; + s|ArchGNU/Linux|ArchLinux|; + s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|; + s|GNU/GNU|GNU|; + s|GNU/Linux device|Linux device|; + s|GNU/Linux Director Daemon|Linux Director Daemon|; + s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|; + s|GNU/Linux kernel|Linux kernel|; + s|GNU/Linux specific kernel|Linux specific kernel|; + s|GNU/Linux Standard Base|Linux Standard Base|; + s|GNU/Linux sysfs|Linux sysfs|; + s|GNU/Linux Virtual Server|Linux Virtual Server|; + s|GNU/Linux Watchdog|Linux Watchdog|; + s|GNU/Linux watchdog|Linux watchdog|; + s|GNU/LinuxHA|LinuxHA|; + s|GNU/Linux-HA|Linux-HA|; + s|GNU/LinuxSCSI|LinuxSCSI|; + s|HA GNU/Linux|HA Linux|; + s|High-Availability GNU/Linux|High-Availability Linux|; + s|MkGNU/Linux|MkLinux|; + s|SEGNU/Linux|SELinux|; + s|VA GNU/Linux Cluster|VA Linux Cluster|; + s|VERSION_STR = "GNU/Linux Director|VERSION_STR = "Linux Director|; + / 2.6, the alignment should be / s|GNU/Linux|Linux|; + s|Linux-2.4.26-gentoo-r14|GNU/Linux-2.4.26-gentoo-r14|; + ' $(grep -rl Linux) } build() { - cd $srcdir/$_name-$pkgver + cd $srcdir/$_pkgnamey-$pkgver setarch $CARCH ./autogen.sh setarch $CARCH ./configure --prefix=/usr\ --enable-fatal-warnings\ @@ -58,11 +181,23 @@ build() { } package() { - cd $srcdir/$_name-$pkgver + cd $srcdir/$_pkgnamey-$pkgver setarch $CARCH make DESTDIR=$pkgdir install + touch $pkgdir/etc/ha.d/ldirectord.cf + rm $pkgdir/etc/rc.d/ldirectord && rmdir $pkgdir/etc/rc.d + install -d $pkgdir/usr/lib/systemd/system - install -Dm644 $srcdir/ha-ldirector.service $pkgdir/usr/lib/systemd/system + echo '[Unit]' > $pkgdir/usr/lib/systemd/system/ldirectord.service + echo 'Description=Non-heartbeat systems service, that manages the LVS component for TCP/UDP load-balancing' >> $pkgdir/usr/lib/systemd/system/ldirectord.service + echo 'Requires=network.target remote-fs.target' >> $pkgdir/usr/lib/systemd/system/ldirectord.service + echo '' >> $pkgdir/usr/lib/systemd/system/ldirectord.service + echo '[Service]' >> $pkgdir/usr/lib/systemd/system/ldirectord.service + echo 'Type=forking' >> $pkgdir/usr/lib/systemd/system/ldirectord.service + echo 'ExecStart=/usr/bin/ldirectord' >> $pkgdir/usr/lib/systemd/system/ldirectord.service + echo '' >> $pkgdir/usr/lib/systemd/system/ldirectord.service + echo '[Install]' >> $pkgdir/usr/lib/systemd/system/ldirectord.service + echo 'WantedBy=multi-user.target' >> $pkgdir/usr/lib/systemd/system/ldirectord.service } # vim:set ts=2 sw=2 et: -- cgit v1.2.3-2-g168b From 44ff0d00216712a835e9fb6f2624661cb919676a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?= Date: Fri, 31 May 2013 20:58:14 -0300 Subject: resource-agent: fixing pkg --- pcr/resource-agent/PKGBUILD | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'pcr/resource-agent') diff --git a/pcr/resource-agent/PKGBUILD b/pcr/resource-agent/PKGBUILD index 39eb6cb7a..46c95ede1 100644 --- a/pcr/resource-agent/PKGBUILD +++ b/pcr/resource-agent/PKGBUILD @@ -2,12 +2,12 @@ pkgname=resource-agent _pkgname1=${pkgname::8} -_pkgname2=${pkgname:8} +_pkgname2=${pkgname:9} _pkgnamex=${_pkgname1^}_${_pkgname2^} _pkgnamey=${pkgname}s _pkgnamez=ha-${_pkgname1}${_pkgname2} pkgver=3.9.5 -pkgrel=4 +pkgrel=5 pkgdesc='Standardized interface for a cluster resource (Linux-HA)' arch=( i686 @@ -18,18 +18,15 @@ group=linux-ha url=http://$group.org/wiki/$_pkgnamex license=GPL depends=( - #clulog? cluster-glue + ipvsadm perl-socket6 perl-lwp-protocol-https perl-io-socket-inet6 perl-mailtools - ipvsadm -) -optdepends=( - net-tools - openssh + #rgmanager (clulog) !!redhat-cluster!! ) +optdepends=net-tools makedepends=( libxslt libvirt @@ -175,6 +172,7 @@ build() { --enable-libnet\ --libdir=/usr/lib\ --localstatedir=/var\ + --sbindir=/usr/bin\ --sysconfdir=/etc\ --with-ocf-root=/usr/lib/ocf setarch $CARCH make @@ -184,6 +182,7 @@ package() { cd $srcdir/$_pkgnamey-$pkgver setarch $CARCH make DESTDIR=$pkgdir install + mv $pkgdir/{var/,}run touch $pkgdir/etc/ha.d/ldirectord.cf rm $pkgdir/etc/rc.d/ldirectord && rmdir $pkgdir/etc/rc.d -- cgit v1.2.3-2-g168b From 977e12800373708110e31c40444701bf5d896ab6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?= Date: Sun, 16 Jun 2013 20:13:13 -0300 Subject: {cluster-glue,pacemaker,heartbeat,resource-agent}: fixing grep and free --- pcr/resource-agent/PKGBUILD | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'pcr/resource-agent') diff --git a/pcr/resource-agent/PKGBUILD b/pcr/resource-agent/PKGBUILD index 46c95ede1..66505fcbe 100644 --- a/pcr/resource-agent/PKGBUILD +++ b/pcr/resource-agent/PKGBUILD @@ -7,7 +7,7 @@ _pkgnamex=${_pkgname1^}_${_pkgname2^} _pkgnamey=${pkgname}s _pkgnamez=ha-${_pkgname1}${_pkgname2} pkgver=3.9.5 -pkgrel=5 +pkgrel=6 pkgdesc='Standardized interface for a cluster resource (Linux-HA)' arch=( i686 @@ -28,7 +28,7 @@ depends=( ) optdepends=net-tools makedepends=( - libxslt + #libxslt libvirt net-tools openssh @@ -47,42 +47,42 @@ prepare() { ' configure.ac sed -i 's|INCLUDES|AM_CPPFLAGS|; - ' $(grep -rl INCLUDES | grep Makefile.am) + ' $(grep -rlI INCLUDES | grep Makefile.am) # fixing path sed -i 's|bin/sh|usr/bin/bash|; - ' $(grep -rl bin/sh) + ' $(grep -rlI bin/sh) sed -i 's| /bin| /usr/bin|; - ' $(grep -rl ' /bin') + ' $(grep -rlI ' /bin') sed -i 's| /sbin| /usr/bin|; - ' $(grep -rl ' /sbin') + ' $(grep -rlI ' /sbin') sed -i 's|usr/sbin|usr/bin|; - ' $(grep -rl usr/sbin) + ' $(grep -rlI usr/sbin) sed -i 's|/lib64|/lib|; - ' $(grep -rl /lib64) + ' $(grep -rlI /lib64) #sed -i 's|usr/libexec|usr/lib|; - # ' $(grep -rl usr/libexec) + # ' $(grep -rlI usr/libexec) sed -i 's|var/lock|run/lock|; - ' $(grep -rl var/lock) + ' $(grep -rlI var/lock) sed -i 's|var/run|run|; - ' $(grep -rl var/run) + ' $(grep -rlI var/run) # remove Open Source term sed -i 's|Open Source / ||; s|open source / ||; - s|Open Source|Free Software|; - s|open source|free software|; + s|Open Source|Free|; + s|open source|free|; s|Free Software Development Lab|Open Source Development Lab|; - ' $(grep -ril 'open source') + ' $(grep -rilI 'open source') sed -i 's|OpenSource / ||; s|opensource / ||; - s|OpenSource|FreeSoftware|; - s|opensource|freesoftware|; + s|OpenSource|Free|; + s|opensource|free|; s|freesoftware.org|opensource.org|; s|http://www.opensource.org/|http://www.gnu.org/philosophy/free-sw.html|; s|http://www.gnu.org/philosophy/free-sw.htmllicenses/osl-|http://opensource.org/licenses/osl-|; s|http://www.gnu.org/philosophy/free-sw.htmlosd|http://opensource.org/osd|; - ' $(grep -ril opensource) + ' $(grep -rilI opensource) # remove Linux term sed -i 's|Linux,|GNU/Linux,|; @@ -161,7 +161,7 @@ prepare() { s|VERSION_STR = "GNU/Linux Director|VERSION_STR = "Linux Director|; / 2.6, the alignment should be / s|GNU/Linux|Linux|; s|Linux-2.4.26-gentoo-r14|GNU/Linux-2.4.26-gentoo-r14|; - ' $(grep -rl Linux) + ' $(grep -rlI Linux) } build() { -- cgit v1.2.3-2-g168b