Various fixes, added patch to properly recognize the floppy disk type as documented.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 184 insertions, 2 deletions

diff --git a/app-emulation/opennebula/ChangeLog b/app-emulation/opennebula/ChangeLog
index 445e7a0c5337..9e3a7131226c 100644
--- a/app-emulation/opennebula/ChangeLog
+++ b/app-emulation/opennebula/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/opennebula
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/opennebula/ChangeLog,v 1.1 2010/08/11 16:07:58 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/opennebula/ChangeLog,v 1.2 2010/08/15 22:54:46 dev-zero Exp $
+
+*opennebula-2.0_beta1-r1 (15 Aug 2010)
+
+  15 Aug 2010; Tiziano Müller <dev-zero@gentoo.org>
+  +files/2.0_beta1-recognize_floppy_type.patch,
+  +opennebula-2.0_beta1-r1.ebuild:
+  Various fixes, added patch to properly recognize the floppy disk type as
+  documented.
 
 *opennebula-2.0_beta1 (11 Aug 2010)
 
diff --git a/app-emulation/opennebula/Manifest b/app-emulation/opennebula/Manifest
index 87727f33727d..5542087ba1f9 100644
--- a/app-emulation/opennebula/Manifest
+++ b/app-emulation/opennebula/Manifest
@@ -1,10 +1,12 @@
 AUX 2.0_beta1-o_creat.patch 438 RMD160 feebf23daa4586e3a3a82690c681ab7eb63a8054 SHA1 f350e4dce3fc8b3427264c086468fd38275e3f54 SHA256 cf2aab9822c308d4477bb8de836a8ae56bba4c3ce4a01bbd0df4e082067904ff
+AUX 2.0_beta1-recognize_floppy_type.patch 697 RMD160 2a7b986df32ba1c16cf0b5db2611f74de1af1baf SHA1 7fc0012a03fcbc237dfa45237e9bb8e200c10fc8 SHA256 b77832503ffbd532265c73f2eb256d453db2be4c49c07e0672d1a11b7399db22
 AUX 2.0_beta1-respect_flags.patch 520 RMD160 1b55e9ef0f3343ca15ca782773009297cf6359ee SHA1 0833057e61182bcc98e1d4f2b7901935ed253fd4 SHA256 0f8709f4f084c0bf17bff0f2f57c0ce039ddddd613725448ccaa5ca4cf9407ce
 AUX 99one 67 RMD160 eb07b9847ae4923ed702c7a830eeee93d1a9599b SHA1 3daa3822a02a10b751ac516da5aec8455edb0df0 SHA256 41a931710fead5ecf526b202e717c2066ab484be69c059543ae0060dc193bcfa
 AUX one_auth 12 RMD160 f1003356c24cf935ca96abee8b76296f3d217335 SHA1 d0373a26dcc75a8fa690f672d30c004a358fe389 SHA256 4af1f964af87ed62f2b953e8b0269b2ad8dfbcba57b5eebddcb9e8f0cc4379da
 AUX opennebula.confd 726 RMD160 d5fd574c2b4aab0da25bed72fbb359517c0b305e SHA1 7ea49380deb37fb5ac06056fa8b7c99f34dd8973 SHA256 cd358620bb8e76fd85e2f5b86d517569c12f0d44ec3440ef80f3a45a665f30db
 AUX opennebula.initd 1080 RMD160 8343b5be8b04f361e1b667e9c60736630958b960 SHA1 57a7ce69687af67bd7fc290332738b0716526882 SHA256 da71a2175efdb72aa4862e2fa6dc701339a117028ec4974f398b6e007b5b5019
 DIST one-2.0-beta1.tar.gz 651835 RMD160 5bfa7b981f5df843746386cab1941f01a2f3788c SHA1 9f0083b01bfedb8df127374f46447b7cf0bf52af SHA256 b1e680a132b0769c5880f5b68afd03c7a4a5d54d7f5be2d709760e58106bda7a
+EBUILD opennebula-2.0_beta1-r1.ebuild 4471 RMD160 08dadc1899af0f3545599fb756007994b115a8aa SHA1 9c6c10df13bb5131a6c084e82a0085a2920f9de6 SHA256 b7f3d2036340f9a105ca3e3157bc2e4c2328f21462875cf5c1aa2026b4af38d3
 EBUILD opennebula-2.0_beta1.ebuild 3990 RMD160 eb2955b3574e76cc3bbd7792bcb9462879c2c102 SHA1 c6af0ef27f96e16cc9d7ad064261e8773398523c SHA256 06183440e6e2a84cc927549630090dfb1c95b9a1ed1310ccc94f768e8105b95c
-MISC ChangeLog 556 RMD160 2312e9296cfc09bf4672a49d12efff30b744b065 SHA1 0962f86bd75f98903a59e9e9e7ff7211eef71a7a SHA256 2b63238382d2fc38895f55a54019ac20762a8094060da47b89fead60cc1f19c6
+MISC ChangeLog 822 RMD160 fbb85edf2416b22a31d814f9b44486ba37661223 SHA1 bf534e68c8b0d7a357a06a8e0fce4f7833e9e256 SHA256 fd86fc5fc0a3e0e048fc33d094e8cc8faa7e8a9b8291220cd439c345f31efcd6
 MISC metadata.xml 432 RMD160 d9aff20605911867abd7ece1972d919822f9ccbb SHA1 2064fb96d6774184a003a4e51946c1ff79f91622 SHA256 074659ce30f8be65ae473571ab32faa44562b5ff318e62a56a7690032b323423
diff --git a/app-emulation/opennebula/files/2.0_beta1-recognize_floppy_type.patch b/app-emulation/opennebula/files/2.0_beta1-recognize_floppy_type.patch
new file mode 100644
index 000000000000..4d361383d251
--- /dev/null
+++ b/app-emulation/opennebula/files/2.0_beta1-recognize_floppy_type.patch
@@ -0,0 +1,17 @@
+diff --git a/src/vmm/LibVirtDriver.cc b/src/vmm/LibVirtDriver.cc
+index c55468d..ede911a 100644
+--- a/src/vmm/LibVirtDriver.cc
++++ b/src/vmm/LibVirtDriver.cc
+@@ -296,6 +296,12 @@ int LibVirtDriver::deployment_description(
+                  << "\t\t\t<source file='" << vm->get_remote_dir() << "/disk."
+                  << i << "'/>" << endl;
+         }
++        else if ( type == "FLOPPY" )
++        {
++            file << "\t\t<disk type='file' device='floppy'>" << endl
++                 << "\t\t\t<source file='" << vm->get_remote_dir() << "/disk."
++                 << i << "'/>" << endl;
++        }
+         else
+         {
+             file << "\t\t<disk type='file' device='disk'>" << endl
diff --git a/app-emulation/opennebula/opennebula-2.0_beta1-r1.ebuild b/app-emulation/opennebula/opennebula-2.0_beta1-r1.ebuild
new file mode 100644
index 000000000000..9245801253dd
--- /dev/null
+++ b/app-emulation/opennebula/opennebula-2.0_beta1-r1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/opennebula/opennebula-2.0_beta1-r1.ebuild,v 1.1 2010/08/15 22:54:46 dev-zero Exp $
+
+EAPI=3
+USE_RUBY="ruby18"
+
+inherit eutils multilib ruby-ng
+
+MY_P="one-${PV/_/-}"
+DOWNLOAD_ID="177"
+
+DESCRIPTION="OpenNebula Virtual Infrastructure Engine"
+HOMEPAGE="http://www.opennebula.org/"
+SRC_URI="http://dev.opennebula.org/attachments/download/${DOWNLOAD_ID}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="qemu mysql sqlite xen"
+
+RDEPEND=">=dev-libs/xmlrpc-c-1.18.02[abyss,cxx,threads]
+	dev-lang/ruby:1.8
+	mysql? ( dev-db/mysql )
+	dev-db/sqlite:3[threadsafe]
+	net-misc/openssh
+	qemu? ( app-emulation/libvirt[libvirtd,qemu] )
+	xen? ( app-emulation/xen-tools )"
+DEPEND="${RDEPEND}
+	>=dev-util/scons-1.2.0-r1"
+
+ruby_add_rdepend "dev-ruby/nokogiri
+	dev-ruby/crack"
+
+# make sure no eclass is running tests
+RESTRICT="tests"
+
+S="${WORKDIR}/${MY_P}"
+
+ONEUSER="oneadmin"
+ONEGROUP="oneadmin"
+
+pkg_setup () {
+	enewgroup ${ONEGROUP}
+	enewuser ${ONEUSER} -1 /bin/bash /var/lib/one ${ONEGROUP}
+}
+
+src_unpack() {
+	default
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${PV}-respect_flags.patch" \
+		"${FILESDIR}/${PV}-o_creat.patch" \
+		"${FILESDIR}/${PV}-recognize_floppy_type.patch"
+
+	sed -i -e 's|chmod|true|' install.sh || die "sed failed"
+}
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	local myconf
+	use mysql && myconf+="mysql=yes " || myconf+="mysql=no "
+	scons \
+		${myconf} \
+		$(sed -r 's/.*(-j\s*|--jobs=)([0-9]+).*/-j\2/' <<< ${MAKEOPTS}) \
+		|| die "building ${PN} failed"
+}
+
+src_install() {
+	DESTDIR=${T} ./install.sh || die "install failed"
+
+	cd "${T}"
+
+	# fixing paths
+	sed -i \
+		-e 's|//share/hooks|/usr/share/one/hooks|' \
+		etc/oned.conf || die "sed failed"
+
+	# installing things for real
+	dobin bin/*
+
+	dodir /usr/$(get_libdir)/one
+	# we have to preserve the executable bits
+	cp -a lib/* "${D}/usr/$(get_libdir)/one/" || die "copying lib files failed"
+
+	insinto /usr/share/doc/${PF}
+	doins -r share/examples
+
+	dodir /usr/share/one
+	# we have to preserve the executable bits
+	cp -a share/hooks "${D}/usr/share/one" || die "copying hooks failed"
+
+	keepdir /var/lock/one
+	keepdir /var/lib/one
+	keepdir /var/log/one
+	keepdir /var/run/one
+	keepdir /var/images
+
+	fowners ${ONEUSER}:${ONEGROUP} /var/{lock,lib,log,run}/one /var/images
+	fperms 3770 /var/images
+
+	doenvd "${FILESDIR}/99one"
+
+	newinitd "${FILESDIR}/opennebula.initd" opennebula
+	newconfd "${FILESDIR}/opennebula.confd" opennebula
+
+	insinto /etc/one
+	insopts -m 0640
+	doins -r etc/*
+	doins "${FILESDIR}/one_auth"
+	fowners -R root:${ONEGROUP} /etc/one
+	fowners ${ONEUSER}:${ONEGROUP} /etc/one/one_auth
+}
+
+pkg_postinst() {
+	local onedir="${EROOT}var/lib/one"
+	if [ ! -d "${onedir}/.ssh" ] ; then
+		einfo "Generating ssh-key..."
+		umask 0027 || die "setting umask failed"
+		mkdir "${onedir}/.ssh" || die "creating ssh directory failed"
+		ssh-keygen -q -t dsa -N "" -f "${onedir}/.ssh/id_dsa" || die "ssh-keygen failed"
+		cat > "${onedir}/.ssh/config" <<EOF
+UserKnownHostsFile /dev/null
+Host *
+    StrictHostKeyChecking no
+EOF
+		cat "${onedir}/.ssh/id_dsa.pub"  >> "${onedir}/.ssh/authorized_keys" || die "adding key failed"
+		chown -R ${ONEUSER}:${ONEGROUP} "${onedir}/.ssh" || die "changing owner failed"
+	fi
+
+	if use qemu ; then
+		elog "Make sure that the user ${ONEUSER} has access to the libvirt control socket"
+		elog "  /var/run/libvirt/libvirt-sock"
+		elog "You can easily check this by executing the following command as ${ONEUSER} user"
+		elog "  virsh -c qemu:///system nodeinfo"
+		elog "If not using using policykit in libvirt, the file you should take a look at is:"
+		elog "  /etc/libvirt/libvirtd.conf (look for the unix_sock_*_perms parameters)"
+		elog "Failure to do so may lead to nodes hanging in PENDING state forever without further notice."
+		echo ""
+		elog "Should a node hang in PENDING state even with correct permissions, try the following to get more information."
+		elog "In /tmp/one-im execute the following command for the biggest one_im-* file:"
+		elog "  ruby -wd one_im-???"
+		echo ""
+		elog "OpenNebula doesn't allow you to specify the disc format."
+		elog "Unfortunately the default in libvirt is not to guess and"
+		elog "it therefores assumes a 'raw' format when using qemu/kvm."
+		elog "Set 'allow_disk_format_probing = 0' in /etc/libvirt/qemu.conf"
+		elog "to work around this until OpenNebula fixes it."
+	fi
+}