testing/opennebula: misc fixes

3 files changed, 37 insertions, 38 deletions

diff --git a/testing/opennebula/APKBUILD b/testing/opennebula/APKBUILD
index 4aa312f04..c11692b74 100644
--- a/testing/opennebula/APKBUILD
+++ b/testing/opennebula/APKBUILD
@@ -2,23 +2,24 @@
 # Maintainer:
 pkgname=opennebula
 pkgver=4.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Virtual management infrastructure as a service (IaaS) toolkit for cloud computing"
 url="http://opennebula.org"
 arch="all"
 license="Apache"
-depends="ruby-sqlite ruby-nokogiri ruby-crack ruby-thin ruby-json ruby-sequel
-	ruby-mysql2 ruby-rack ruby-sinatra ruby-thin ruby-net-ldap ruby-uuidtools
-	ruby-curb ruby-amazon-ec2"
+depends="ruby-json ruby-sequel ruby-nokogiri ruby-sqlite ruby-mysql2 ruby-nokogiri
+	ruby-rack ruby-sinatra ruby-thin ruby-crack ruby-thin ruby-net-ldap
+	ruby-uuidtools ruby-curb ruby-amazon-ec2"
 depends_dev="xmlrpc-c-dev sqlite-dev openssl-dev libxml2-dev curl-dev"
-makedepends="$depends_dev scons ruby ruby-gems bash util-linux"
-install=""
+makedepends="$depends_dev scons ruby ruby-gems bash"
+install="opennebula.pre-install"
 pkgusers=oneadmin
 pkggroups=oneadmin
-subpackages="$pkgname-dev $pkgname-doc $pkgname-sunstone $pkgname-ozones
-	$pkgname-clients $pkgname-node-kvm:node_kvm"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-node-kvm:node_kvm"
 source="http://dev.opennebula.org/packages/opennebula-$pkgver/opennebula-$pkgver.tar.gz
-	${pkgname}.initd ${pkgname}.confd"
+	opennebula.initd
+	opennebula.confd
+	getopt.patch"
 
 _builddir="$srcdir"/opennebula-$pkgver
 
@@ -47,32 +48,6 @@ package() {
 		"$pkgdir"/etc/conf.d/$pkgname || return 1
 }
 
-sunstone() {
-	pkgdesc="OpenNubula webinterface"
-	depends="ruby-json ruby-rack ruby-sinatra ruby-thin ruby-sequel ruby-nokogiri"
-	arch="noarch"
-	cd "$_builddir"
-	DESTDIR="$subpkgdir" ./install.sh \
-		-s -u oneadmin -g oneadmin || return 1
-}
-
-ozones() {
-	pkgdesc="OpenNebula Zones (OZones)"
-	depends="ruby-json ruby-sequel ruby-nokogiri ruby-sqlite ruby-mysql2 ruby-nokogiri"
-	arch="noarch"
-	cd "$_builddir"
-	DESTDIR="$subpkgdir" ./install.sh \
-		-o -u oneadmin -g oneadmin || return 1
-}
-
-clients() {
-	pkgdesc="Client utilities: OpenNebula cli, occi and ec2 client files"
-	arch="noarch"
-	cd "$_builddir"
-	DESTDIR="$subpkgdir" ./install.sh \
-		-c -u oneadmin -g oneadmin || return 1
-}
-
 node_kvm() {
 	pkgdesc="Node dependecies for OpenNebula"
 	arch="noarch"
@@ -82,10 +57,13 @@ node_kvm() {
 
 md5sums="c45537dfb689a357e7300dc5ed996d75  opennebula-4.0.1.tar.gz
 ffd98ee7961fd3c7d076ff6da4e33d8c  opennebula.initd
-f213d16b6b90115000950618a0640b99  opennebula.confd"
+f213d16b6b90115000950618a0640b99  opennebula.confd
+8f1a346b4020b7c3e2853f42cc38d35b  getopt.patch"
 sha256sums="258cb698b732454534c9729d6ee1abe3f43aa480ce5c7ccef477a198f832bf74  opennebula-4.0.1.tar.gz
 ed875ccf38c4b2a2ed96b110d00cca7d50d18cee9893e7da88fc0e7704981704  opennebula.initd
-cd358620bb8e76fd85e2f5b86d517569c12f0d44ec3440ef80f3a45a665f30db  opennebula.confd"
+cd358620bb8e76fd85e2f5b86d517569c12f0d44ec3440ef80f3a45a665f30db  opennebula.confd
+072ad62b3ef18eb3c9d33b47acb7a867d076c3083ce561bdbffcf98bb852d663  getopt.patch"
 sha512sums="64ddf4b814e2d37aba9f6425fb7668dbcb6eaff33d2f609601d3738c2f5183a631ab90ed25c41b549b92e7f28d4920298a65d222ef7e8a56d27190a9738fa149  opennebula-4.0.1.tar.gz
 e9c2b4b2f7516277d8bd0ec8ce12bfc9d4a172b631fed7b0f977775467eb689e0daa8f487da9c01621d0381f68f8fefa6571002dc43ce8a6129b6a5ff75c74b5  opennebula.initd
-77cd2fb0108a5a6665edc0c3e392511e93abf22e31b7ea451a241288572b9b79a997975bb62214dd02be49b406ef42671bacb8a98e6b1aa20dc045df7c2e82fc  opennebula.confd"
+77cd2fb0108a5a6665edc0c3e392511e93abf22e31b7ea451a241288572b9b79a997975bb62214dd02be49b406ef42671bacb8a98e6b1aa20dc045df7c2e82fc  opennebula.confd
+7f39da47a89011bd368217bc7cb33a1647b49d43960bf47f22b742dfa109d04e9b18ad0827d5d3b4c05bd6b31d723322b9c899520fbb2db5b4217a38bab9eefe  getopt.patch"
diff --git a/testing/opennebula/getopt.patch b/testing/opennebula/getopt.patch
new file mode 100644
index 000000000..3fcf7bd46
--- /dev/null
+++ b/testing/opennebula/getopt.patch
@@ -0,0 +1,15 @@
+--- opennebula-4.0.1/install.sh.orig
++++ opennebula-4.0.1/install.sh
+@@ -51,11 +51,7 @@
+ 
+ PARAMETERS="hkrlcsou:g:d:"
+ 
+-if [ $(getopt --version | tr -d " ") = "--" ]; then
+-    TEMP_OPT=`getopt $PARAMETERS "$@"`
+-else
+-    TEMP_OPT=`getopt -o $PARAMETERS -n 'install.sh' -- "$@"`
+-fi
++TEMP_OPT=`getopt $PARAMETERS "$@"`
+ 
+ if [ $? != 0 ] ; then
+     usage
diff --git a/testing/opennebula/opennebula.pre-install b/testing/opennebula/opennebula.pre-install
new file mode 100644
index 000000000..41fb6d768
--- /dev/null
+++ b/testing/opennebula/opennebula.pre-install
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+addgroup -S oneadmin 2>/dev/null
+adduser -S -s /bin/sh -D -H -h /usr/share/one -G oneadmin \
+	-g "OpenNebula user" oneadmin
+exit 0