* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/files/, app-emulation/ganeti/
@ 2020-08-05 1:07 Patrick McLean
0 siblings, 0 replies; 10+ messages in thread
From: Patrick McLean @ 2020-08-05 1:07 UTC (permalink / raw
To: gentoo-commits
commit: 35fb22a523f8a0019be5a3171a1a81f5041a915f
Author: Austin English <austin.m.english <AT> sony <DOT> com>
AuthorDate: Wed Aug 5 00:24:32 2020 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Wed Aug 5 01:07:20 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35fb22a5
app-emulation/ganeti: disable rebuilding manpages
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Austin English <austin.m.english <AT> sony.com>
Closes: https://github.com/gentoo/gentoo/pull/17003
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
.../ganeti/files/ganeti-2.15-disable-docs.patch | 44 ++++++++++++++++++++++
app-emulation/ganeti/ganeti-2.15.2-r11.ebuild | 1 +
2 files changed, 45 insertions(+)
diff --git a/app-emulation/ganeti/files/ganeti-2.15-disable-docs.patch b/app-emulation/ganeti/files/ganeti-2.15-disable-docs.patch
new file mode 100644
index 00000000000..adc2813d6a3
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti-2.15-disable-docs.patch
@@ -0,0 +1,44 @@
+--- a/Makefile.am 2020-08-04 18:21:12.395282115 +0000
++++ b/Makefile.am 2020-08-04 18:21:48.636729501 +0000
+@@ -1160,41 +1160,6 @@
+ # has to exist in order for the sphinx module to be loaded
+ # successfully, but we certainly don't want the docs to be rebuilt if
+ # it changes
+-doc/html/index.html doc/man-html/index.html: $(docinput) doc/conf.py \
+- configure.ac $(RUN_IN_TEMPDIR) lib/build/sphinx_ext.py \
+- lib/build/shell_example_lexer.py lib/ht.py \
+- doc/css/style.css lib/rapi/connector.py lib/rapi/rlib2.py \
+- autotools/sphinx-wrapper | $(built_python_sources)
+- @test -n "$(SPHINX)" || \
+- { echo 'sphinx-build' not found during configure; exit 1; }
+-if !MANPAGES_IN_DOC
+- if test -n '$(ENABLE_MANPAGES)'; then \
+- echo 'Man pages in documentation were disabled at configure time' >&2; \
+- exit 1; \
+- fi
+-endif
+-## Sphinx provides little control over what content should be included. Some
+-## mechanisms exist, but they all have drawbacks or actual issues. Since we
+-## build two different versions of the documentation--once without man pages and
+-## once, if enabled, with them--some control is necessary. xmpp-wrapper provides
+-## us with this, but requires running in a temporary directory. It moves the
+-## correct files into place depending on environment variables.
+- dir=$(dir $@) && \
+- @mkdir_p@ $$dir && \
+- PYTHONPATH=. ENABLE_MANPAGES=$(ENABLE_MANPAGES) COPY_DOC=1 \
+- HTML_THEME=$(SPHINX_HTML_THEME) \
+- $(RUN_IN_TEMPDIR) autotools/sphinx-wrapper $(SPHINX) -q -W -b html \
+- -d . \
+- -D version="$(VERSION_MAJOR).$(VERSION_MINOR)" \
+- -D release="$(PACKAGE_VERSION)" \
+- -D graphviz_dot="$(DOT)" \
+- doc $(CURDIR)/$$dir && \
+- rm -f $$dir/.buildinfo $$dir/objects.inv
+- touch $@
+-
+-doc/html: doc/html/index.html
+-
+-doc/man-html: doc/man-html/index.html
+
+ doc/install-quick.rst: INSTALL
+ doc/news.rst: NEWS
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r11.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r11.ebuild
index 13b15c79546..0bd0b47f753 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r11.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r11.ebuild
@@ -20,6 +20,7 @@ SRC_URI="
KEYWORDS="~amd64 ~x86"
PATCHES=(
"${FILESDIR}"/ganeti-2.15-use-balloon-device.patch
+ "${FILESDIR}"/ganeti-2.15-disable-docs.patch
"${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch
"${WORKDIR}"/debian/patches/Makefile.am-use-C.UTF-8
"${WORKDIR}"/debian/patches/relax-deps
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/files/, app-emulation/ganeti/
@ 2019-02-07 19:51 Patrick McLean
0 siblings, 0 replies; 10+ messages in thread
From: Patrick McLean @ 2019-02-07 19:51 UTC (permalink / raw
To: gentoo-commits
commit: 884c1c6614a3b6ed83b4ca1bcc3f9eae6b09aa39
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Thu Feb 7 19:36:46 2019 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Thu Feb 7 19:46:27 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=884c1c66
app-emulation/ganeti: Revbump, libdir fix qemu opts fix
- Fix for libdir with SYMLINK_LIB=no
- Qemu no longer supports -balloon, switch to virtio-balloon,id=balloon
instead
- Add QA_FLAGS_IGNORED for haskell daemons
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
.../files/ganeti-2.15-use-balloon-device.patch | 13 +
app-emulation/ganeti/files/ganeti.initd-r3 | 4 +-
.../files/{ganeti.initd-r3 => ganeti.initd-r4} | 4 +-
app-emulation/ganeti/ganeti-2.15.2-r8.ebuild | 378 +++++++++++++++++++++
4 files changed, 395 insertions(+), 4 deletions(-)
diff --git a/app-emulation/ganeti/files/ganeti-2.15-use-balloon-device.patch b/app-emulation/ganeti/files/ganeti-2.15-use-balloon-device.patch
new file mode 100644
index 00000000000..ae57a213fc0
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti-2.15-use-balloon-device.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/hypervisor/hv_kvm/__init__.py b/lib/hypervisor/hv_kvm/__init__.py
+index 174621fcc..1f598e7ef 100644
+--- a/lib/hypervisor/hv_kvm/__init__.py
++++ b/lib/hypervisor/hv_kvm/__init__.py
+@@ -1094,7 +1094,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
+ # Add id to ballon and place to the first available slot (3 or 4)
+ addr = utils.GetFreeSlot(pci_reservations, reserve=True)
+ pci_info = ",bus=pci.0,addr=%s" % hex(addr)
+- kvm_cmd.extend(["-balloon", "virtio,id=balloon%s" % pci_info])
++ kvm_cmd.extend(["-device", "virtio-balloon,id=balloon%s" % pci_info])
+ kvm_cmd.extend(["-daemonize"])
+ if not instance.hvparams[constants.HV_ACPI]:
+ kvm_cmd.extend(["-no-acpi"])
diff --git a/app-emulation/ganeti/files/ganeti.initd-r3 b/app-emulation/ganeti/files/ganeti.initd-r3
index 6869f48313d..7257e992257 100644
--- a/app-emulation/ganeti/files/ganeti.initd-r3
+++ b/app-emulation/ganeti/files/ganeti.initd-r3
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
extra_commands="forcestart is_master"
@@ -10,7 +10,7 @@ depend() {
use net
}
-DAEMON_UTIL="/usr/lib/ganeti/daemon-util"
+DAEMON_UTIL="/usr/lib64/ganeti/daemon-util"
is_master() {
[ -z "${ganeti_master}" ] && ganeti_master="$(gnt-cluster getmaster)"
diff --git a/app-emulation/ganeti/files/ganeti.initd-r3 b/app-emulation/ganeti/files/ganeti.initd-r4
similarity index 96%
copy from app-emulation/ganeti/files/ganeti.initd-r3
copy to app-emulation/ganeti/files/ganeti.initd-r4
index 6869f48313d..6393de8e280 100644
--- a/app-emulation/ganeti/files/ganeti.initd-r3
+++ b/app-emulation/ganeti/files/ganeti.initd-r4
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
extra_commands="forcestart is_master"
@@ -10,7 +10,7 @@ depend() {
use net
}
-DAEMON_UTIL="/usr/lib/ganeti/daemon-util"
+DAEMON_UTIL="/usr/%LIBDIR%/ganeti/daemon-util"
is_master() {
[ -z "${ganeti_master}" ] && ganeti_master="$(gnt-cluster getmaster)"
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild
new file mode 100644
index 00000000000..0d2eaac25e1
--- /dev/null
+++ b/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild
@@ -0,0 +1,378 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python2_7)
+PYTHON_REQ_USE="ipv6(+)?"
+
+inherit user autotools bash-completion-r1 python-single-r1
+
+MY_PV="${PV/_rc/~rc}"
+MY_PV="${MY_PV/_beta/~beta}"
+MY_P="${PN}-${MY_PV}"
+SERIES="$(ver_cut 1-2)"
+
+DEBIAN_PATCH=11
+SRC_URI="
+ http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz
+ mirror://debian/pool/main/g/ganeti-${SERIES}/ganeti-${SERIES}_${PV}-${DEBIAN_PATCH}.debian.tar.xz
+"
+KEYWORDS="~amd64 ~x86"
+PATCHES=(
+ "${FILESDIR}"/ganeti-2.15-use-balloon-device.patch
+ "${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch
+ "${WORKDIR}"/debian/patches/Makefile.am-use-C.UTF-8
+ "${WORKDIR}"/debian/patches/relax-deps
+ "${WORKDIR}"/debian/patches/zlib-0.6-compatibility
+ "${WORKDIR}"/debian/patches/fix_FTBFS_with_sphinx-1.3.5
+ "${WORKDIR}"/debian/patches/fix_ftbfs_with_sphinx_1.4
+ "${WORKDIR}"/debian/patches/use-proper-cabal-dev.patch
+ "${WORKDIR}"/debian/patches/0001-Drop-dependency-on-MonadCatchIO-transformers.patch
+ "${WORKDIR}"/debian/patches/0001-GHC-8-support.patch
+ "${WORKDIR}"/debian/patches/ghc8-fixes
+ "${WORKDIR}"/debian/patches/snap-server-1.0-compat
+ "${WORKDIR}"/debian/patches/non-DSA-SSH-key-support.patch
+ "${WORKDIR}"/debian/patches/fix-ssh-key-renewal-on-single-node-clusters.patch
+ "${WORKDIR}"/debian/patches/set-defaults-for-ssh-type-bits.patch
+ "${WORKDIR}"/debian/patches/use-hv-class-to-check-for-migration.patch
+ "${WORKDIR}"/debian/patches/do-not-specify-socat-ssl-method.patch
+ "${WORKDIR}"/debian/patches/fix-ftbfs-with-sphinx-1.5.patch
+ "${WORKDIR}"/debian/patches/fix-failover-from-dead-node.patch
+ "${WORKDIR}"/debian/patches/fix-cpu-affinity.patch
+ "${WORKDIR}"/debian/patches/fix-fcntl-i386.patch
+ "${WORKDIR}"/debian/patches/fix-ovf-test-path.patch
+ "${WORKDIR}"/debian/patches/fix-qa-ssconf-race.patch
+ "${WORKDIR}"/debian/patches/relax-sphinx-version-check.patch
+ #"${WORKDIR}"/debian/patches/THH-2.12.patch
+ "${WORKDIR}"/debian/patches/sphinx-1.7.patch
+ "${WORKDIR}"/debian/patches/ca-use-sha256-md.patch
+ "${WORKDIR}"/debian/patches/impexpd-fix-certificate-verification-with-new-socat.patch
+ "${WORKDIR}"/debian/patches/impexpd-fix-certificate-verification-with-new-socat-2.patch
+)
+
+DESCRIPTION="Ganeti is a virtual server management software tool"
+HOMEPAGE="http://www.ganeti.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="drbd experimental haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands"
+
+REQUIRED_USE="|| ( kvm xen lxc )
+ test? ( ipv6 )
+ kvm? ( || ( amd64 x86 ) )
+ ${PYTHON_REQUIRED_USE}"
+
+USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
+GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
+
+DEPEND="
+ dev-libs/openssl:0
+ dev-python/paramiko[${PYTHON_USEDEP}]
+ dev-python/pyopenssl[${PYTHON_USEDEP}]
+ dev-python/simplejson[${PYTHON_USEDEP}]
+ dev-python/pyparsing[${PYTHON_USEDEP}]
+ dev-python/pyinotify[${PYTHON_USEDEP}]
+ dev-python/pycurl[${PYTHON_USEDEP}]
+ dev-python/ipaddr[${PYTHON_USEDEP}]
+ dev-python/bitarray[${PYTHON_USEDEP}]
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/fdsend[${PYTHON_USEDEP}]
+ || (
+ net-misc/iputils[arping]
+ net-analyzer/arping
+ )
+ net-analyzer/fping
+ net-misc/bridge-utils
+ net-misc/curl[ssl]
+ net-misc/openssh
+ net-misc/socat
+ sys-apps/iproute2
+ >=sys-fs/lvm2-2.02.181
+ >=sys-apps/baselayout-2.0
+ >=dev-lang/ghc-8.0:0=
+ <dev-lang/ghc-8.1:0=
+ dev-haskell/cabal:0=
+ dev-haskell/cabal-install:0=
+ !<app-emulation/ganeti-instance-image-0.6-r1
+ >=dev-haskell/mtl-2.1.1:0=
+ >=dev-haskell/old-time-1.1.0.0:0=
+ >=dev-haskell/random-1.0.1.1:0=
+ haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= )
+ >=dev-haskell/transformers-0.3.0.0:0=
+
+ >=dev-haskell/attoparsec-0.10.1.1:0=
+ <dev-haskell/attoparsec-0.14:0
+ >=dev-haskell/base64-bytestring-1.0.0.1:0=
+ <dev-haskell/base64-bytestring-1.1:0=
+ >=dev-haskell/crypto-4.2.4:0=
+ <dev-haskell/crypto-4.3:0=
+ >=dev-haskell/curl-1.3.7:0=
+ <dev-haskell/curl-1.4:0=
+ >=dev-haskell/hinotify-0.3.2:0=
+ <dev-haskell/hinotify-0.4:0=
+ >=dev-haskell/hslogger-1.1.4:0=
+ <dev-haskell/hslogger-1.3:0=
+ >=dev-haskell/json-0.5:0=
+ >=dev-haskell/lens-3.10:0=
+ >=dev-haskell/lifted-base-0.2.0.3:0=
+ <dev-haskell/lifted-base-0.3:0=
+ >=dev-haskell/monad-control-1.0.1.0:0=
+ <dev-haskell/monad-control-1.0.2:0=
+ >=dev-haskell/network-2.3.0.13:0=
+ <dev-haskell/network-2.7:0=
+ >=dev-haskell/parallel-3.2.0.2:3=
+ <dev-haskell/parallel-3.3:3=
+ >=dev-haskell/temporary-1.1.2.3:0=
+ <dev-haskell/temporary-1.3:0=
+ >=dev-haskell/regex-pcre-0.94.2:0=
+ <dev-haskell/regex-pcre-0.95:0=
+ >=dev-haskell/transformers-base-0.4:0=
+ <dev-haskell/transformers-base-0.5:0=
+ >=dev-haskell/utf8-string-0.3.7:0=
+ >=dev-haskell/zlib-0.5.3.3:0=
+ <dev-haskell/zlib-0.7:0=
+
+ >=dev-haskell/psqueue-1.1:0=
+ <dev-haskell/psqueue-1.2:0=
+ >=dev-haskell/snap-core-1.0.1:0=
+ <dev-haskell/snap-core-1.1:0=
+ >=dev-haskell/snap-server-1.0.1:0=
+ <dev-haskell/snap-server-1.1:0=
+ >=dev-haskell/case-insensitive-0.4.0.1
+
+ dev-haskell/vector:0=
+ xen? ( >=app-emulation/xen-3.0 )
+ kvm? (
+ dev-python/psutil
+ app-emulation/qemu
+ )
+ lxc? ( app-emulation/lxc )
+ drbd? ( sys-cluster/drbd-utils )
+ rbd? ( sys-cluster/ceph )
+ ipv6? ( net-misc/ndisc6 )
+ ${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+ !app-emulation/ganeti-htools"
+DEPEND+="
+ sys-devel/m4
+ app-text/pandoc
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ media-fonts/urw-fonts
+ media-gfx/graphviz
+ >=dev-haskell/test-framework-0.6:0=
+ <dev-haskell/test-framework-0.9:0=
+ >=dev-haskell/test-framework-hunit-0.2.7:0=
+ <dev-haskell/test-framework-hunit-0.4:0=
+ >=dev-haskell/test-framework-quickcheck2-0.2.12.1:0=
+ <dev-haskell/test-framework-quickcheck2-0.4:0=
+ test? (
+ dev-python/mock
+ dev-python/pyyaml
+ dev-haskell/haddock:0=
+ >=dev-haskell/hunit-1.2.4.2:0=
+ <dev-haskell/hunit-1.3:0=
+ >=dev-haskell/quickcheck-2.4.2:2=
+ <dev-haskell/quickcheck-2.8.3:2=
+ sys-apps/fakeroot
+ >=net-misc/socat-1.7
+ dev-util/shelltestrunner
+ )"
+
+PATCHES+=(
+ "${FILESDIR}/${PN}-2.12-start-stop-daemon-args.patch"
+ "${FILESDIR}/${PN}-2.11-add-pgrep.patch"
+ "${FILESDIR}/${PN}-2.15-daemon-util.patch"
+ "${FILESDIR}/${PN}-2.9-disable-root-tests.patch"
+ "${FILESDIR}/${PN}-2.9-skip-cli-test.patch"
+ "${FILESDIR}/${PN}-2.10-rundir.patch"
+ "${FILESDIR}/${PN}-2.12-qemu-enable-kvm.patch"
+ "${FILESDIR}/${PN}-2.11-tests.patch"
+ "${FILESDIR}/${PN}-lockdir.patch"
+ "${FILESDIR}/${PN}-2.11-dont-nest-libdir.patch"
+ "${FILESDIR}/${PN}-2.11-dont-print-man-help.patch"
+ "${FILESDIR}/${PN}-2.11-daemon-util-tests.patch"
+ "${FILESDIR}/${PN}-2.13-process_unittest.patch"
+ "${FILESDIR}/${PN}-2.15-python-mock.patch"
+ "${FILESDIR}/${PN}-2.15.2-remove-sandbox-failing-tests.patch"
+ "${FILESDIR}/${PN}-2.15-noded-must-run-as-root.patch"
+ "${FILESDIR}/${PN}-2.15-kvmd-run-as-daemon-user.patch"
+ "${FILESDIR}/${PN}-2.15-dont-invert-return-values-for-man-warnings.patch"
+ "${FILESDIR}/${PN}-2.15-respect-HFLAGS.patch"
+ "${FILESDIR}/ganeti-2.15.2-bdev_py.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+QA_WX_LOAD="
+ usr/lib*/${PN}/${SERIES}/usr/sbin/ganeti-*d
+ usr/lib*/${PN}/${SERIES}/usr/bin/htools
+"
+# haskell...
+QA_FLAGS_IGNORED="
+ /usr/lib64/ganeti/2.15/usr/sbin/ganeti-metad
+ /usr/lib64/ganeti/2.15/usr/sbin/ganeti-wconfd
+ /usr/lib64/ganeti/2.15/usr/sbin/ganeti-confd
+ /usr/lib64/ganeti/2.15/usr/sbin/ganeti-luxid
+ /usr/lib64/ganeti/2.15/usr/sbin/ganeti-kvmd
+ /usr/lib64/ganeti/2.15/usr/bin/htools
+"
+
+pkg_setup () {
+ local user
+ python-single-r1_pkg_setup
+
+ if use multiple-users; then
+ for user in gnt-{masterd,confd,luxid,rapi,daemons,admin}; do
+ enewgroup ${user}
+ enewuser ${user} -1 -1 -1 ${user}
+ done
+ fi
+}
+
+src_prepare() {
+ local testfile
+ if has_version '>=dev-lang/ghc-7.10'; then
+ # Breaks the build on 7.8
+ PATCHES+=(
+ "${WORKDIR}"/debian/patches/ghc-7.10-compatibility.patch
+ )
+ fi
+ if use experimental; then
+ ewarn "Experimental patches have been applied! RPC between daemons with different patches applied may cause breakage!"
+ PATCHES+=(
+ # QEMU Agent accepted upstream for 2.16, not yet in a tagged release
+ # backport available for 2.15, but refused upstream due to RPC breakage.
+ "${FILESDIR}"/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.15.patch
+ )
+ fi
+ eapply "${PATCHES[@]}"
+ # Upstream commits:
+ # 4c3c2ca2a97a69c0287a3d23e064bc17978105eb
+ # 24618882737fd7c189adf99f4acc767d48f572c3
+ sed -i \
+ -e '/QuickCheck/s,< 2.8,< 2.8.3,g' \
+ cabal/ganeti.template.cabal
+ # Neuter -Werror
+ sed -i \
+ -e '/^if DEVELOPER_MODE/,/^endif/s/-Werror//' \
+ Makefile.am
+
+ # not sure why these tests are failing
+ # should remove this on next version bump if possible
+ for testfile in test/py/import-export_unittest.bash; do
+ printf '#!/bin/bash\ntrue\n' > "${testfile}"
+ done
+
+ # take the sledgehammer approach to bug #526270
+ grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g'
+
+ sed "s:%LIBDIR%:$(get_libdir):g" "${FILESDIR}/ganeti.initd-r4" \
+ > "${T}/ganeti.initd"
+
+ eapply_user
+
+ [[ ${PV} =~ [9]{4,} ]] && ./autogen.sh
+ rm autotools/missing
+ eautoreconf
+}
+
+src_configure () {
+ # this is kind of a hack to work around the removal of the qemu-kvm wrapper
+ local kvm_arch
+
+ if use amd64; then
+ kvm_arch=x86_64
+ elif use x86; then
+ kvm_arch=i386
+ elif use kvm; then
+ die "Could not determine qemu system to use for kvm"
+ fi
+
+ econf --localstatedir=/var \
+ --sharedstatedir=/var \
+ --disable-symlinks \
+ --with-ssh-initscript=/etc/init.d/sshd \
+ --with-export-dir=/var/lib/ganeti-storage/export \
+ --with-os-search-path=/usr/share/${PN}/os \
+ $(use_enable restricted-commands) \
+ $(use_enable test haskell-tests) \
+ $(usex multiple-users "--with-default-user=" "" "gnt-daemons" "") \
+ $(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" "") \
+ $(usex multiple-users "--with-default-group=" "" "gnt-daemons" "") \
+ $(usex multiple-users "--with-group-prefix=" "" "${GROUP_PREFIX}" "") \
+ $(use_enable syslog) \
+ $(use_enable monitoring) \
+ $(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \
+ $(usex haskell-daemons "--enable-confd=haskell" '' '' '') \
+ --with-haskell-flags="-optl -Wl,-z,relro -optl -Wl,--as-needed" \
+ --enable-socat-escape \
+ --enable-socat-compress
+}
+
+src_install () {
+ emake V=1 DESTDIR="${D}" install
+
+ newinitd "${T}"/ganeti.initd ${PN}
+ newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN}
+
+ if use kvm; then
+ newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
+ newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff
+ fi
+
+ # ganeti installs it's own docs in a generic location
+ rm -rf "${D}"/{usr/share/doc/${PN},run}
+
+ sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" doc/examples/bash_completion
+ newbashcomp doc/examples/bash_completion gnt-instance
+ bashcomp_alias gnt-instance burnin ganeti-{cleaner,confd} \
+ h{space,check,scan,info,ail,arep,roller,squeeze,bal} \
+ gnt-{os,job,filter,debug,storage,group,node,network,backup,cluster}
+
+ use monitoring && bashcomp_alias gnt-instance mon-collector
+
+ dodoc INSTALL UPGRADE NEWS README doc/*.rst
+
+ docinto html
+ dodoc -r doc/html/* doc/css/*.css
+
+ docinto examples
+ dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf
+
+ docinto examples/hooks
+ dodoc doc/examples/hooks/{ipsec,ethers}
+
+ insinto /etc/cron.d
+ newins doc/examples/ganeti.cron ${PN}
+
+ insinto /etc/logrotate.d
+ newins doc/examples/ganeti.logrotate ${PN}
+
+ # need to dodir rather than keepdir here (bug #552482)
+ dodir /var/lib/${PN}
+
+ keepdir /var/log/${PN}/
+ keepdir /usr/share/${PN}/${SERIES}/os/
+ keepdir /var/lib/ganeti-storage/{export,file,shared}/
+
+ dosym ${SERIES} "/usr/share/${PN}/default"
+ dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default"
+
+ python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES}
+}
+
+pkg_postinst() {
+ if use multiple-users; then
+ elog "You have enable multiple user support, the users for this must"
+ elog "be created. You can use the provided tool for this, which is"
+ elog "located at:"
+ elog " /usr/$(get_libdir)/${PN}/tools/users-setup"
+ fi
+}
+
+src_test () {
+ PATH="${S}/scripts:${S}/src:${PATH}" \
+ TMPDIR="/tmp" \
+ GANETI_MASTER="$(hostname -f)" \
+ emake check || die "emake check failed"
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/files/, app-emulation/ganeti/
@ 2018-09-08 0:29 Patrick McLean
0 siblings, 0 replies; 10+ messages in thread
From: Patrick McLean @ 2018-09-08 0:29 UTC (permalink / raw
To: gentoo-commits
commit: 1a07768ab93de7b1744d73304c5c1d92d6ff7d6d
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 8 00:28:48 2018 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Sat Sep 8 00:29:05 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a07768a
app-emulation/ganeti: Revbump, update debian patches, update deps
Package-Manager: Portage-2.3.49, Repoman-2.3.10
app-emulation/ganeti/Manifest | 1 +
.../ganeti/files/ganeti-2.15.2-bdev_py.patch | 16 +
app-emulation/ganeti/ganeti-2.15.2-r7.ebuild | 365 +++++++++++++++++++++
3 files changed, 382 insertions(+)
diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index 88ce5ff98b4..df3d85b7bc5 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -1,4 +1,5 @@
DIST ganeti-2.15.2.tar.gz 4723007 BLAKE2B d49d2ed9df515514a99d42303799e5ffc751eb8e6b397f86174cb3d48ec846fd3d146737240eea9ec0ce6fd9d07e04a27831a45a4354d3d49597b9f5cff33d7b SHA512 e0707aa535857779622e0eb18cccb89bc34fe4acf373628c30524e3f7e572c4b3d628946ad219149c14615d6471c4d72dbd0c6e3e1855a9f3644b4605544df85
+DIST ganeti-2.15_2.15.2-11.debian.tar.xz 67652 BLAKE2B d10f83a59a1c2d05fa6704dfdc46867f0e3eed276086de9ad2e86def1e7894012b89f3f9c111076c37ef37b857967e4bae5cf769eaabf5907b3a42bc806b4472 SHA512 1c992b9842f1a8492eeaaab8950939c96cc03abf679234211753b92f4753278b086a0a77e2e32b912d4a69635c11e8305d350cda8285734d706cce741d897aa3
DIST ganeti-2.16.0~rc1.tar.gz 4794934 BLAKE2B 867d7d48e98d4490db8279b83b44006e0afc1a421592d523db2d04b4b04636090686773ef890c89df41f0311cbf3c4d5a2c314c39c4429f50b07a7a6d1a9616f SHA512 a4bed40e48ecd8ee1f3f8137faf28aea38ffb8955f48bbd233be17660035679fa27d0ef6f8fe20507d34ca9e1dd594e564c9c53412364b6cc05dc8ed2f5602be
DIST ganeti-2.17.0~beta1.tar.gz 4880091 BLAKE2B bd094ac421b8b49abcd7643641aa4c2d62aa2f8a4ab55289711cef8c47cc32634bf06b99adbf9383de3945766112a1838d2191dfb51013dc4fba81676e264e64 SHA512 d836444ea5696c9689ee0fae56192720ef79b2a4a8962c031abacc7ef02ebbb9e9cdadd15aa5d315c2d3da6cbe5043b6c22b9ed94fd13883b5dfa23e08a2867e
DIST ganeti_2.15.2-4.debian.tar.xz 42440 BLAKE2B 5c329baa90bd801a3e4b550da0a4c8bb59f3d17801ff0d66a35ae0383f34a5c1cc7f3d6d67a5e07157085290019b22c6b5349224ed43b5ec40fbdc37ded77e88 SHA512 e405f54996236fe5166c89190c529256899458594d30e4daee85a9381400e618bc8cc578c43a166ed6d868ed3c5118e4bddc5103b596db89a504de3ba3a1f403
diff --git a/app-emulation/ganeti/files/ganeti-2.15.2-bdev_py.patch b/app-emulation/ganeti/files/ganeti-2.15.2-bdev_py.patch
new file mode 100644
index 00000000000..a1fea166580
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti-2.15.2-bdev_py.patch
@@ -0,0 +1,16 @@
+--- a/lib/storage/bdev.py 2018-09-06 19:20:03.970318746 +0000
++++ b/lib/storage/bdev.py 2018-09-06 19:18:59.799346241 +0000
+@@ -413,6 +413,16 @@
+ if not self.minor and not self.Attach():
+ # the LV does not exist
+ return
++
++ import glob
++
++ for partdev in glob.glob("/dev/mapper/%s-%sp*" % (self._vg_name, self._lv_name.replace("-", "--"))):
++ result = utils.RunCmd(["dmsetup", "remove", partdev])
++
++ if result.failed:
++ base.ThrowError("Can't dmsetup remove %s: %s-%s",
++ partdev, result.fail_reason, result.output)
++
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r7.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r7.ebuild
new file mode 100644
index 00000000000..22e58cde08e
--- /dev/null
+++ b/app-emulation/ganeti/ganeti-2.15.2-r7.ebuild
@@ -0,0 +1,365 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python2_7)
+PYTHON_REQ_USE="ipv6(+)?"
+
+inherit user autotools bash-completion-r1 python-single-r1
+
+MY_PV="${PV/_rc/~rc}"
+MY_PV="${MY_PV/_beta/~beta}"
+MY_P="${PN}-${MY_PV}"
+SERIES="$(ver_cut 1-2)"
+
+DEBIAN_PATCH=11
+SRC_URI="
+ http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz
+ mirror://debian/pool/main/g/ganeti-${SERIES}/ganeti-${SERIES}_${PV}-${DEBIAN_PATCH}.debian.tar.xz
+"
+KEYWORDS="~amd64 ~x86"
+PATCHES=(
+ "${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch
+ "${WORKDIR}"/debian/patches/Makefile.am-use-C.UTF-8
+ "${WORKDIR}"/debian/patches/relax-deps
+ "${WORKDIR}"/debian/patches/zlib-0.6-compatibility
+ "${WORKDIR}"/debian/patches/fix_FTBFS_with_sphinx-1.3.5
+ "${WORKDIR}"/debian/patches/fix_ftbfs_with_sphinx_1.4
+ "${WORKDIR}"/debian/patches/use-proper-cabal-dev.patch
+ "${WORKDIR}"/debian/patches/0001-Drop-dependency-on-MonadCatchIO-transformers.patch
+ "${WORKDIR}"/debian/patches/0001-GHC-8-support.patch
+ "${WORKDIR}"/debian/patches/ghc8-fixes
+ "${WORKDIR}"/debian/patches/snap-server-1.0-compat
+ "${WORKDIR}"/debian/patches/non-DSA-SSH-key-support.patch
+ "${WORKDIR}"/debian/patches/fix-ssh-key-renewal-on-single-node-clusters.patch
+ "${WORKDIR}"/debian/patches/set-defaults-for-ssh-type-bits.patch
+ "${WORKDIR}"/debian/patches/use-hv-class-to-check-for-migration.patch
+ "${WORKDIR}"/debian/patches/do-not-specify-socat-ssl-method.patch
+ "${WORKDIR}"/debian/patches/fix-ftbfs-with-sphinx-1.5.patch
+ "${WORKDIR}"/debian/patches/fix-failover-from-dead-node.patch
+ "${WORKDIR}"/debian/patches/fix-cpu-affinity.patch
+ "${WORKDIR}"/debian/patches/fix-fcntl-i386.patch
+ "${WORKDIR}"/debian/patches/fix-ovf-test-path.patch
+ "${WORKDIR}"/debian/patches/fix-qa-ssconf-race.patch
+ "${WORKDIR}"/debian/patches/relax-sphinx-version-check.patch
+ #"${WORKDIR}"/debian/patches/THH-2.12.patch
+ "${WORKDIR}"/debian/patches/sphinx-1.7.patch
+ "${WORKDIR}"/debian/patches/ca-use-sha256-md.patch
+ "${WORKDIR}"/debian/patches/impexpd-fix-certificate-verification-with-new-socat.patch
+ "${WORKDIR}"/debian/patches/impexpd-fix-certificate-verification-with-new-socat-2.patch
+)
+
+DESCRIPTION="Ganeti is a virtual server management software tool"
+HOMEPAGE="http://www.ganeti.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="drbd experimental haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands"
+
+REQUIRED_USE="|| ( kvm xen lxc )
+ test? ( ipv6 )
+ kvm? ( || ( amd64 x86 ) )
+ ${PYTHON_REQUIRED_USE}"
+
+USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
+GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
+
+DEPEND="
+ dev-libs/openssl:0
+ dev-python/paramiko[${PYTHON_USEDEP}]
+ dev-python/pyopenssl[${PYTHON_USEDEP}]
+ dev-python/simplejson[${PYTHON_USEDEP}]
+ dev-python/pyparsing[${PYTHON_USEDEP}]
+ dev-python/pyinotify[${PYTHON_USEDEP}]
+ dev-python/pycurl[${PYTHON_USEDEP}]
+ dev-python/ipaddr[${PYTHON_USEDEP}]
+ dev-python/bitarray[${PYTHON_USEDEP}]
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/fdsend[${PYTHON_USEDEP}]
+ || (
+ net-misc/iputils[arping]
+ net-analyzer/arping
+ )
+ net-analyzer/fping
+ net-misc/bridge-utils
+ net-misc/curl[ssl]
+ net-misc/openssh
+ net-misc/socat
+ sys-apps/iproute2
+ >=sys-fs/lvm2-2.02.181
+ >=sys-apps/baselayout-2.0
+ >=dev-lang/ghc-8.0:0=
+ <dev-lang/ghc-8.1:0=
+ dev-haskell/cabal:0=
+ dev-haskell/cabal-install:0=
+ !<app-emulation/ganeti-instance-image-0.6-r1
+ >=dev-haskell/mtl-2.1.1:0=
+ >=dev-haskell/old-time-1.1.0.0:0=
+ >=dev-haskell/random-1.0.1.1:0=
+ haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= )
+ >=dev-haskell/transformers-0.3.0.0:0=
+
+ >=dev-haskell/attoparsec-0.10.1.1:0=
+ <dev-haskell/attoparsec-0.14:0
+ >=dev-haskell/base64-bytestring-1.0.0.1:0=
+ <dev-haskell/base64-bytestring-1.1:0=
+ >=dev-haskell/crypto-4.2.4:0=
+ <dev-haskell/crypto-4.3:0=
+ >=dev-haskell/curl-1.3.7:0=
+ <dev-haskell/curl-1.4:0=
+ >=dev-haskell/hinotify-0.3.2:0=
+ <dev-haskell/hinotify-0.4:0=
+ >=dev-haskell/hslogger-1.1.4:0=
+ <dev-haskell/hslogger-1.3:0=
+ >=dev-haskell/json-0.5:0=
+ >=dev-haskell/lens-3.10:0=
+ >=dev-haskell/lifted-base-0.2.0.3:0=
+ <dev-haskell/lifted-base-0.3:0=
+ >=dev-haskell/monad-control-1.0.1.0:0=
+ <dev-haskell/monad-control-1.0.2:0=
+ >=dev-haskell/network-2.3.0.13:0=
+ <dev-haskell/network-2.7:0=
+ >=dev-haskell/parallel-3.2.0.2:3=
+ <dev-haskell/parallel-3.3:3=
+ >=dev-haskell/temporary-1.1.2.3:0=
+ <dev-haskell/temporary-1.3:0=
+ >=dev-haskell/regex-pcre-0.94.2:0=
+ <dev-haskell/regex-pcre-0.95:0=
+ >=dev-haskell/transformers-base-0.4:0=
+ <dev-haskell/transformers-base-0.5:0=
+ >=dev-haskell/utf8-string-0.3.7:0=
+ >=dev-haskell/zlib-0.5.3.3:0=
+ <dev-haskell/zlib-0.7:0=
+
+ >=dev-haskell/psqueue-1.1:0=
+ <dev-haskell/psqueue-1.2:0=
+ >=dev-haskell/snap-core-1.0.1:0=
+ <dev-haskell/snap-core-1.1:0=
+ >=dev-haskell/snap-server-1.0.1:0=
+ <dev-haskell/snap-server-1.1:0=
+ >=dev-haskell/case-insensitive-0.4.0.1
+
+ dev-haskell/vector:0=
+ xen? ( >=app-emulation/xen-3.0 )
+ kvm? (
+ dev-python/psutil
+ app-emulation/qemu
+ )
+ lxc? ( app-emulation/lxc )
+ drbd? ( sys-cluster/drbd-utils )
+ rbd? ( sys-cluster/ceph )
+ ipv6? ( net-misc/ndisc6 )
+ ${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+ !app-emulation/ganeti-htools"
+DEPEND+="
+ sys-devel/m4
+ app-text/pandoc
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ media-fonts/urw-fonts
+ media-gfx/graphviz
+ >=dev-haskell/test-framework-0.6:0=
+ <dev-haskell/test-framework-0.9:0=
+ >=dev-haskell/test-framework-hunit-0.2.7:0=
+ <dev-haskell/test-framework-hunit-0.4:0=
+ >=dev-haskell/test-framework-quickcheck2-0.2.12.1:0=
+ <dev-haskell/test-framework-quickcheck2-0.4:0=
+ test? (
+ dev-python/mock
+ dev-python/pyyaml
+ dev-haskell/haddock:0=
+ >=dev-haskell/hunit-1.2.4.2:0=
+ <dev-haskell/hunit-1.3:0=
+ >=dev-haskell/quickcheck-2.4.2:2=
+ <dev-haskell/quickcheck-2.8.3:2=
+ sys-apps/fakeroot
+ >=net-misc/socat-1.7
+ dev-util/shelltestrunner
+ )"
+
+PATCHES+=(
+ "${FILESDIR}/${PN}-2.12-start-stop-daemon-args.patch"
+ "${FILESDIR}/${PN}-2.11-add-pgrep.patch"
+ "${FILESDIR}/${PN}-2.15-daemon-util.patch"
+ "${FILESDIR}/${PN}-2.9-disable-root-tests.patch"
+ "${FILESDIR}/${PN}-2.9-skip-cli-test.patch"
+ "${FILESDIR}/${PN}-2.10-rundir.patch"
+ "${FILESDIR}/${PN}-2.12-qemu-enable-kvm.patch"
+ "${FILESDIR}/${PN}-2.11-tests.patch"
+ "${FILESDIR}/${PN}-lockdir.patch"
+ "${FILESDIR}/${PN}-2.11-dont-nest-libdir.patch"
+ "${FILESDIR}/${PN}-2.11-dont-print-man-help.patch"
+ "${FILESDIR}/${PN}-2.11-daemon-util-tests.patch"
+ "${FILESDIR}/${PN}-2.13-process_unittest.patch"
+ "${FILESDIR}/${PN}-2.15-python-mock.patch"
+ "${FILESDIR}/${PN}-2.15.2-remove-sandbox-failing-tests.patch"
+ "${FILESDIR}/${PN}-2.15-noded-must-run-as-root.patch"
+ "${FILESDIR}/${PN}-2.15-kvmd-run-as-daemon-user.patch"
+ "${FILESDIR}/${PN}-2.15-dont-invert-return-values-for-man-warnings.patch"
+ "${FILESDIR}/${PN}-2.15-respect-HFLAGS.patch"
+ "${FILESDIR}/ganeti-2.15.2-bdev_py.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+QA_WX_LOAD="
+ usr/lib*/${PN}/${SERIES}/usr/sbin/ganeti-*d
+ usr/lib*/${PN}/${SERIES}/usr/bin/htools
+"
+
+pkg_setup () {
+ local user
+ python-single-r1_pkg_setup
+
+ if use multiple-users; then
+ for user in gnt-{masterd,confd,luxid,rapi,daemons,admin}; do
+ enewgroup ${user}
+ enewuser ${user} -1 -1 -1 ${user}
+ done
+ fi
+}
+
+src_prepare() {
+ local testfile
+ if has_version '>=dev-lang/ghc-7.10'; then
+ # Breaks the build on 7.8
+ PATCHES+=(
+ "${WORKDIR}"/debian/patches/ghc-7.10-compatibility.patch
+ )
+ fi
+ if use experimental; then
+ ewarn "Experimental patches have been applied! RPC between daemons with different patches applied may cause breakage!"
+ PATCHES+=(
+ # QEMU Agent accepted upstream for 2.16, not yet in a tagged release
+ # backport available for 2.15, but refused upstream due to RPC breakage.
+ "${FILESDIR}"/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.15.patch
+ )
+ fi
+ eapply "${PATCHES[@]}"
+ # Upstream commits:
+ # 4c3c2ca2a97a69c0287a3d23e064bc17978105eb
+ # 24618882737fd7c189adf99f4acc767d48f572c3
+ sed -i \
+ -e '/QuickCheck/s,< 2.8,< 2.8.3,g' \
+ cabal/ganeti.template.cabal
+ # Neuter -Werror
+ sed -i \
+ -e '/^if DEVELOPER_MODE/,/^endif/s/-Werror//' \
+ Makefile.am
+
+ # not sure why these tests are failing
+ # should remove this on next version bump if possible
+ for testfile in test/py/import-export_unittest.bash; do
+ printf '#!/bin/bash\ntrue\n' > "${testfile}"
+ done
+
+ # take the sledgehammer approach to bug #526270
+ grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g'
+
+ eapply_user
+
+ [[ ${PV} =~ [9]{4,} ]] && ./autogen.sh
+ rm autotools/missing
+ eautoreconf
+}
+
+src_configure () {
+ # this is kind of a hack to work around the removal of the qemu-kvm wrapper
+ local kvm_arch
+
+ if use amd64; then
+ kvm_arch=x86_64
+ elif use x86; then
+ kvm_arch=i386
+ elif use kvm; then
+ die "Could not determine qemu system to use for kvm"
+ fi
+
+ econf --localstatedir=/var \
+ --sharedstatedir=/var \
+ --disable-symlinks \
+ --with-ssh-initscript=/etc/init.d/sshd \
+ --with-export-dir=/var/lib/ganeti-storage/export \
+ --with-os-search-path=/usr/share/${PN}/os \
+ $(use_enable restricted-commands) \
+ $(use_enable test haskell-tests) \
+ $(usex multiple-users "--with-default-user=" "" "gnt-daemons" "") \
+ $(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" "") \
+ $(usex multiple-users "--with-default-group=" "" "gnt-daemons" "") \
+ $(usex multiple-users "--with-group-prefix=" "" "${GROUP_PREFIX}" "") \
+ $(use_enable syslog) \
+ $(use_enable monitoring) \
+ $(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \
+ $(usex haskell-daemons "--enable-confd=haskell" '' '' '') \
+ --with-haskell-flags="-optl -Wl,-z,relro -optl -Wl,--as-needed" \
+ --enable-socat-escape \
+ --enable-socat-compress
+}
+
+src_install () {
+ emake V=1 DESTDIR="${D}" install
+
+ newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN}
+ newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN}
+
+ if use kvm; then
+ newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
+ newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff
+ fi
+
+ # ganeti installs it's own docs in a generic location
+ rm -rf "${D}"/{usr/share/doc/${PN},run}
+
+ sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" doc/examples/bash_completion
+ newbashcomp doc/examples/bash_completion gnt-instance
+ bashcomp_alias gnt-instance burnin ganeti-{cleaner,confd} \
+ h{space,check,scan,info,ail,arep,roller,squeeze,bal} \
+ gnt-{os,job,filter,debug,storage,group,node,network,backup,cluster}
+
+ use monitoring && bashcomp_alias gnt-instance mon-collector
+
+ dodoc INSTALL UPGRADE NEWS README doc/*.rst
+
+ docinto html
+ dodoc -r doc/html/* doc/css/*.css
+
+ docinto examples
+ dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf
+
+ docinto examples/hooks
+ dodoc doc/examples/hooks/{ipsec,ethers}
+
+ insinto /etc/cron.d
+ newins doc/examples/ganeti.cron ${PN}
+
+ insinto /etc/logrotate.d
+ newins doc/examples/ganeti.logrotate ${PN}
+
+ # need to dodir rather than keepdir here (bug #552482)
+ dodir /var/lib/${PN}
+
+ keepdir /var/log/${PN}/
+ keepdir /usr/share/${PN}/${SERIES}/os/
+ keepdir /var/lib/ganeti-storage/{export,file,shared}/
+
+ dosym ${SERIES} "/usr/share/${PN}/default"
+ dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default"
+
+ python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES}
+}
+
+pkg_postinst() {
+ if use multiple-users; then
+ elog "You have enable multiple user support, the users for this must"
+ elog "be created. You can use the provided tool for this, which is"
+ elog "located at:"
+ elog " /usr/$(get_libdir)/${PN}/tools/users-setup"
+ fi
+}
+
+src_test () {
+ PATH="${S}/scripts:${S}/src:${PATH}" \
+ TMPDIR="/tmp" \
+ GANETI_MASTER="$(hostname -f)" \
+ emake check || die "emake check failed"
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/files/, app-emulation/ganeti/
@ 2017-01-07 0:37 Robin H. Johnson
0 siblings, 0 replies; 10+ messages in thread
From: Robin H. Johnson @ 2017-01-07 0:37 UTC (permalink / raw
To: gentoo-commits
commit: 5c38f0da839a3acec372559f3fdc9c2708c2232c
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 7 00:37:02 2017 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Jan 7 00:37:38 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c38f0da
app-emulation/ganeti: now with QEMU Guest Agent support (merged upstream for 2.16, not yet released).
Package-Manager: portage-2.3.2
...st_agent-QEMU-Guest-Agent-sup.stable-2.15.patch | 122 +++++++++++++++++++++
...st_agent-QEMU-Guest-Agent-sup.stable-2.16.patch | 122 +++++++++++++++++++++
...st_agent-QEMU-Guest-Agent-sup.stable-2.17.patch | 122 +++++++++++++++++++++
...i-2.16.0_rc1.ebuild => ganeti-2.15.2-r6.ebuild} | 26 +++--
app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild | 10 +-
app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild | 10 +-
app-emulation/ganeti/metadata.xml | 1 +
7 files changed, 401 insertions(+), 12 deletions(-)
diff --git a/app-emulation/ganeti/files/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.15.patch b/app-emulation/ganeti/files/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.15.patch
new file mode 100644
index 00000000..460636f
--- /dev/null
+++ b/app-emulation/ganeti/files/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.15.patch
@@ -0,0 +1,122 @@
+From c3697936405ed8c95b674a7d412886e364306f5f Mon Sep 17 00:00:00 2001
+Message-Id: <c3697936405ed8c95b674a7d412886e364306f5f.1483650125.git.robbat2@gentoo.org>
+From: "Robin H. Johnson" <robbat2@gentoo.org>
+Date: Thu, 29 Sep 2016 08:57:28 -0700
+Subject: [PATCH-2.15] kvm: use_guest_agent: QEMU Guest Agent support
+
+Implement the QEMU Guest Agent sockets, so that code/scripts on the
+hypervisors can communicate with guest operating systems easily.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+---
+ lib/hypervisor/hv_kvm/__init__.py | 23 +++++++++++++++++++++++
+ man/gnt-instance.rst | 7 +++++++
+ src/Ganeti/Constants.hs | 5 +++++
+ 3 files changed, 35 insertions(+)
+
+diff --git a/lib/hypervisor/hv_kvm/__init__.py b/lib/hypervisor/hv_kvm/__init__.py
+index cd29baa38..89bc18b85 100644
+--- a/lib/hypervisor/hv_kvm/__init__.py
++++ b/lib/hypervisor/hv_kvm/__init__.py
+@@ -351,6 +351,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
+ constants.HV_MIGRATION_BANDWIDTH: hv_base.REQ_NONNEGATIVE_INT_CHECK,
+ constants.HV_MIGRATION_DOWNTIME: hv_base.REQ_NONNEGATIVE_INT_CHECK,
+ constants.HV_MIGRATION_MODE: hv_base.MIGRATION_MODE_CHECK,
++ constants.HV_USE_GUEST_AGENT: hv_base.NO_CHECK,
+ constants.HV_USE_LOCALTIME: hv_base.NO_CHECK,
+ constants.HV_DISK_CACHE:
+ hv_base.ParamInSet(True, constants.HT_VALID_CACHE_TYPES),
+@@ -581,6 +582,13 @@ class KVMHypervisor(hv_base.BaseHypervisor):
+ """
+ return utils.PathJoin(cls._CTRL_DIR, "%s.qmp" % instance_name)
+
++ @classmethod
++ def _InstanceQemuGuestAgentMonitor(cls, instance_name):
++ """Returns the instance serial QEMU Guest Agent socket name
++
++ """
++ return utils.PathJoin(cls._CTRL_DIR, "%s.qga" % instance_name)
++
+ @classmethod
+ def _InstanceKvmdMonitor(cls, instance_name):
+ """Returns the instance kvm daemon socket name
+@@ -667,6 +675,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
+ utils.RemoveFile(cls._InstanceMonitor(instance_name))
+ utils.RemoveFile(cls._InstanceSerial(instance_name))
+ utils.RemoveFile(cls._InstanceQmpMonitor(instance_name))
++ utils.RemoveFile(cls._InstanceQemuGuestAgentMonitor(instance_name))
+ utils.RemoveFile(cls._InstanceKVMRuntime(instance_name))
+ utils.RemoveFile(cls._InstanceKeymapFile(instance_name))
+ uid_file = cls._InstanceUidFile(instance_name)
+@@ -1376,6 +1385,20 @@ class KVMHypervisor(hv_base.BaseHypervisor):
+ if self._UUID_RE.search(kvmhelp):
+ kvm_cmd.extend(["-uuid", instance.uuid])
+
++ # Add guest agent socket
++ if hvp[constants.HV_USE_GUEST_AGENT]:
++ qga_addr = utils.GetFreeSlot(pci_reservations, reserve=True)
++ qga_pci_info = "bus=%s,addr=%s" % ('pci.0', hex(qga_addr))
++ qga_path = self._InstanceQemuGuestAgentMonitor(instance.name)
++ logging.info("KVM: Guest Agent available at %s", qga_path)
++ # The 'qga0' identified can change, but the 'org.qemu.guest_agent.0' string is
++ # the default expected by the Guest Agent.
++ kvm_cmd.extend([
++ "-chardev", "socket,path=%s,server,nowait,id=qga0" % qga_path,
++ "-device", "virtio-serial,id=qga0,%s" % qga_pci_info,
++ "-device", "virtserialport,chardev=qga0,name=org.qemu.guest_agent.0",
++ ])
++
+ if hvp[constants.HV_KVM_EXTRA]:
+ kvm_cmd.extend(hvp[constants.HV_KVM_EXTRA].split(" "))
+
+diff --git a/man/gnt-instance.rst b/man/gnt-instance.rst
+index a29fd7972..433b1f3b1 100644
+--- a/man/gnt-instance.rst
++++ b/man/gnt-instance.rst
+@@ -526,6 +526,13 @@ viridian
+ viridian (Hyper-V) for this instance. The default is false,
+ disabling viridian support.
+
++use\_guest\_agent
++ Valid for the KVM hypervisor.
++
++ A boolean option that specifies if the hypervisor should enable
++ the QEMU Guest Agent protocol for this instance. By default, the
++ Guest Agent is disabled.
++
+ use\_localtime
+ Valid for the Xen HVM and KVM hypervisors.
+
+diff --git a/src/Ganeti/Constants.hs b/src/Ganeti/Constants.hs
+index 09783d4bf..cf5421946 100644
+--- a/src/Ganeti/Constants.hs
++++ b/src/Ganeti/Constants.hs
+@@ -1806,6 +1806,9 @@ hvUsbMouse = "usb_mouse"
+ hvUseBootloader :: String
+ hvUseBootloader = "use_bootloader"
+
++hvUseGuestAgent :: String
++hvUseGuestAgent = "use_guest_agent"
++
+ hvUseLocaltime :: String
+ hvUseLocaltime = "use_localtime"
+
+@@ -1938,6 +1941,7 @@ hvsParameterTypes = Map.fromList
+ , (hvUsbDevices, VTypeString)
+ , (hvUsbMouse, VTypeString)
+ , (hvUseBootloader, VTypeBool)
++ , (hvUseGuestAgent, VTypeBool)
+ , (hvUseLocaltime, VTypeBool)
+ , (hvVga, VTypeString)
+ , (hvVhostNet, VTypeBool)
+@@ -3996,6 +4000,7 @@ hvcDefaults =
+ , (hvMigrationBandwidth, PyValueEx (32 :: Int))
+ , (hvMigrationDowntime, PyValueEx (30 :: Int))
+ , (hvMigrationMode, PyValueEx htMigrationLive)
++ , (hvUseGuestAgent, PyValueEx False)
+ , (hvUseLocaltime, PyValueEx False)
+ , (hvDiskCache, PyValueEx htCacheDefault)
+ , (hvSecurityModel, PyValueEx htSmNone)
+--
+2.11.0.rc2
+
diff --git a/app-emulation/ganeti/files/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.16.patch b/app-emulation/ganeti/files/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.16.patch
new file mode 100644
index 00000000..6bca593
--- /dev/null
+++ b/app-emulation/ganeti/files/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.16.patch
@@ -0,0 +1,122 @@
+From 16a08ecb268062a2634dbfc081b4729cb749b7b4 Mon Sep 17 00:00:00 2001
+Message-Id: <16a08ecb268062a2634dbfc081b4729cb749b7b4.1483650125.git.robbat2@gentoo.org>
+From: "Robin H. Johnson" <robbat2@gentoo.org>
+Date: Thu, 29 Sep 2016 08:57:28 -0700
+Subject: [PATCH-2.16] kvm: use_guest_agent: QEMU Guest Agent support
+
+Implement the QEMU Guest Agent sockets, so that code/scripts on the
+hypervisors can communicate with guest operating systems easily.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+---
+ lib/hypervisor/hv_kvm/__init__.py | 23 +++++++++++++++++++++++
+ man/gnt-instance.rst | 7 +++++++
+ src/Ganeti/Constants.hs | 5 +++++
+ 3 files changed, 35 insertions(+)
+
+diff --git a/lib/hypervisor/hv_kvm/__init__.py b/lib/hypervisor/hv_kvm/__init__.py
+index ac02ff56c..b865d6f3a 100644
+--- a/lib/hypervisor/hv_kvm/__init__.py
++++ b/lib/hypervisor/hv_kvm/__init__.py
+@@ -497,6 +497,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
+ constants.HV_MIGRATION_BANDWIDTH: hv_base.REQ_NONNEGATIVE_INT_CHECK,
+ constants.HV_MIGRATION_DOWNTIME: hv_base.REQ_NONNEGATIVE_INT_CHECK,
+ constants.HV_MIGRATION_MODE: hv_base.MIGRATION_MODE_CHECK,
++ constants.HV_USE_GUEST_AGENT: hv_base.NO_CHECK,
+ constants.HV_USE_LOCALTIME: hv_base.NO_CHECK,
+ constants.HV_DISK_CACHE:
+ hv_base.ParamInSet(True, constants.HT_VALID_CACHE_TYPES),
+@@ -750,6 +751,13 @@ class KVMHypervisor(hv_base.BaseHypervisor):
+ """
+ return utils.PathJoin(cls._CTRL_DIR, "%s.qmp" % instance_name)
+
++ @classmethod
++ def _InstanceQemuGuestAgentMonitor(cls, instance_name):
++ """Returns the instance serial QEMU Guest Agent socket name
++
++ """
++ return utils.PathJoin(cls._CTRL_DIR, "%s.qga" % instance_name)
++
+ @classmethod
+ def _InstanceKvmdMonitor(cls, instance_name):
+ """Returns the instance kvm daemon socket name
+@@ -836,6 +844,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
+ utils.RemoveFile(cls._InstanceMonitor(instance_name))
+ utils.RemoveFile(cls._InstanceSerial(instance_name))
+ utils.RemoveFile(cls._InstanceQmpMonitor(instance_name))
++ utils.RemoveFile(cls._InstanceQemuGuestAgentMonitor(instance_name))
+ utils.RemoveFile(cls._InstanceKVMRuntime(instance_name))
+ utils.RemoveFile(cls._InstanceKeymapFile(instance_name))
+ uid_file = cls._InstanceUidFile(instance_name)
+@@ -1544,6 +1553,20 @@ class KVMHypervisor(hv_base.BaseHypervisor):
+ if self._UUID_RE.search(kvmhelp):
+ kvm_cmd.extend(["-uuid", instance.uuid])
+
++ # Add guest agent socket
++ if hvp[constants.HV_USE_GUEST_AGENT]:
++ qga_addr = utils.GetFreeSlot(bus_slots[_PCI_BUS], reserve=True)
++ qga_pci_info = "bus=%s,addr=%s" % (_PCI_BUS, hex(qga_addr))
++ qga_path = self._InstanceQemuGuestAgentMonitor(instance.name)
++ logging.info("KVM: Guest Agent available at %s", qga_path)
++ # The 'qga0' identified can change, but the 'org.qemu.guest_agent.0' string is
++ # the default expected by the Guest Agent.
++ kvm_cmd.extend([
++ "-chardev", "socket,path=%s,server,nowait,id=qga0" % qga_path,
++ "-device", "virtio-serial,id=qga0,%s" % qga_pci_info,
++ "-device", "virtserialport,chardev=qga0,name=org.qemu.guest_agent.0",
++ ])
++
+ if hvp[constants.HV_KVM_EXTRA]:
+ kvm_cmd.extend(hvp[constants.HV_KVM_EXTRA].split(" "))
+
+diff --git a/man/gnt-instance.rst b/man/gnt-instance.rst
+index 283392cc8..493ae929d 100644
+--- a/man/gnt-instance.rst
++++ b/man/gnt-instance.rst
+@@ -545,6 +545,13 @@ viridian
+ viridian (Hyper-V) for this instance. The default is false,
+ disabling viridian support.
+
++use\_guest\_agent
++ Valid for the KVM hypervisor.
++
++ A boolean option that specifies if the hypervisor should enable
++ the QEMU Guest Agent protocol for this instance. By default, the
++ Guest Agent is disabled.
++
+ use\_localtime
+ Valid for the Xen HVM and KVM hypervisors.
+
+diff --git a/src/Ganeti/Constants.hs b/src/Ganeti/Constants.hs
+index 420ccb6cd..4aa5edf63 100644
+--- a/src/Ganeti/Constants.hs
++++ b/src/Ganeti/Constants.hs
+@@ -1814,6 +1814,9 @@ hvUsbMouse = "usb_mouse"
+ hvUseBootloader :: String
+ hvUseBootloader = "use_bootloader"
+
++hvUseGuestAgent :: String
++hvUseGuestAgent = "use_guest_agent"
++
+ hvUseLocaltime :: String
+ hvUseLocaltime = "use_localtime"
+
+@@ -1948,6 +1951,7 @@ hvsParameterTypes = Map.fromList
+ , (hvUsbDevices, VTypeString)
+ , (hvUsbMouse, VTypeString)
+ , (hvUseBootloader, VTypeBool)
++ , (hvUseGuestAgent, VTypeBool)
+ , (hvUseLocaltime, VTypeBool)
+ , (hvVga, VTypeString)
+ , (hvVhostNet, VTypeBool)
+@@ -4099,6 +4103,7 @@ hvcDefaults =
+ , (hvMigrationBandwidth, PyValueEx (32 :: Int))
+ , (hvMigrationDowntime, PyValueEx (30 :: Int))
+ , (hvMigrationMode, PyValueEx htMigrationLive)
++ , (hvUseGuestAgent, PyValueEx False)
+ , (hvUseLocaltime, PyValueEx False)
+ , (hvDiskCache, PyValueEx htCacheDefault)
+ , (hvSecurityModel, PyValueEx htSmNone)
+--
+2.11.0.rc2
+
diff --git a/app-emulation/ganeti/files/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.17.patch b/app-emulation/ganeti/files/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.17.patch
new file mode 100644
index 00000000..f7a664f
--- /dev/null
+++ b/app-emulation/ganeti/files/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.17.patch
@@ -0,0 +1,122 @@
+From e91ae73f593115dba1f77af6a3af30cf2219f880 Mon Sep 17 00:00:00 2001
+Message-Id: <e91ae73f593115dba1f77af6a3af30cf2219f880.1483650125.git.robbat2@gentoo.org>
+From: "Robin H. Johnson" <robbat2@gentoo.org>
+Date: Thu, 29 Sep 2016 08:57:28 -0700
+Subject: [PATCH-2.17] kvm: use_guest_agent: QEMU Guest Agent support
+
+Implement the QEMU Guest Agent sockets, so that code/scripts on the
+hypervisors can communicate with guest operating systems easily.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+---
+ lib/hypervisor/hv_kvm/__init__.py | 23 +++++++++++++++++++++++
+ man/gnt-instance.rst | 7 +++++++
+ src/Ganeti/Constants.hs | 5 +++++
+ 3 files changed, 35 insertions(+)
+
+diff --git a/lib/hypervisor/hv_kvm/__init__.py b/lib/hypervisor/hv_kvm/__init__.py
+index ac02ff56c..b865d6f3a 100644
+--- a/lib/hypervisor/hv_kvm/__init__.py
++++ b/lib/hypervisor/hv_kvm/__init__.py
+@@ -497,6 +497,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
+ constants.HV_MIGRATION_BANDWIDTH: hv_base.REQ_NONNEGATIVE_INT_CHECK,
+ constants.HV_MIGRATION_DOWNTIME: hv_base.REQ_NONNEGATIVE_INT_CHECK,
+ constants.HV_MIGRATION_MODE: hv_base.MIGRATION_MODE_CHECK,
++ constants.HV_USE_GUEST_AGENT: hv_base.NO_CHECK,
+ constants.HV_USE_LOCALTIME: hv_base.NO_CHECK,
+ constants.HV_DISK_CACHE:
+ hv_base.ParamInSet(True, constants.HT_VALID_CACHE_TYPES),
+@@ -750,6 +751,13 @@ class KVMHypervisor(hv_base.BaseHypervisor):
+ """
+ return utils.PathJoin(cls._CTRL_DIR, "%s.qmp" % instance_name)
+
++ @classmethod
++ def _InstanceQemuGuestAgentMonitor(cls, instance_name):
++ """Returns the instance serial QEMU Guest Agent socket name
++
++ """
++ return utils.PathJoin(cls._CTRL_DIR, "%s.qga" % instance_name)
++
+ @classmethod
+ def _InstanceKvmdMonitor(cls, instance_name):
+ """Returns the instance kvm daemon socket name
+@@ -836,6 +844,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
+ utils.RemoveFile(cls._InstanceMonitor(instance_name))
+ utils.RemoveFile(cls._InstanceSerial(instance_name))
+ utils.RemoveFile(cls._InstanceQmpMonitor(instance_name))
++ utils.RemoveFile(cls._InstanceQemuGuestAgentMonitor(instance_name))
+ utils.RemoveFile(cls._InstanceKVMRuntime(instance_name))
+ utils.RemoveFile(cls._InstanceKeymapFile(instance_name))
+ uid_file = cls._InstanceUidFile(instance_name)
+@@ -1544,6 +1553,20 @@ class KVMHypervisor(hv_base.BaseHypervisor):
+ if self._UUID_RE.search(kvmhelp):
+ kvm_cmd.extend(["-uuid", instance.uuid])
+
++ # Add guest agent socket
++ if hvp[constants.HV_USE_GUEST_AGENT]:
++ qga_addr = utils.GetFreeSlot(bus_slots[_PCI_BUS], reserve=True)
++ qga_pci_info = "bus=%s,addr=%s" % (_PCI_BUS, hex(qga_addr))
++ qga_path = self._InstanceQemuGuestAgentMonitor(instance.name)
++ logging.info("KVM: Guest Agent available at %s", qga_path)
++ # The 'qga0' identified can change, but the 'org.qemu.guest_agent.0' string is
++ # the default expected by the Guest Agent.
++ kvm_cmd.extend([
++ "-chardev", "socket,path=%s,server,nowait,id=qga0" % qga_path,
++ "-device", "virtio-serial,id=qga0,%s" % qga_pci_info,
++ "-device", "virtserialport,chardev=qga0,name=org.qemu.guest_agent.0",
++ ])
++
+ if hvp[constants.HV_KVM_EXTRA]:
+ kvm_cmd.extend(hvp[constants.HV_KVM_EXTRA].split(" "))
+
+diff --git a/man/gnt-instance.rst b/man/gnt-instance.rst
+index 283392cc8..493ae929d 100644
+--- a/man/gnt-instance.rst
++++ b/man/gnt-instance.rst
+@@ -545,6 +545,13 @@ viridian
+ viridian (Hyper-V) for this instance. The default is false,
+ disabling viridian support.
+
++use\_guest\_agent
++ Valid for the KVM hypervisor.
++
++ A boolean option that specifies if the hypervisor should enable
++ the QEMU Guest Agent protocol for this instance. By default, the
++ Guest Agent is disabled.
++
+ use\_localtime
+ Valid for the Xen HVM and KVM hypervisors.
+
+diff --git a/src/Ganeti/Constants.hs b/src/Ganeti/Constants.hs
+index 13bff2e71..7f43f89f9 100644
+--- a/src/Ganeti/Constants.hs
++++ b/src/Ganeti/Constants.hs
+@@ -1821,6 +1821,9 @@ hvUsbMouse = "usb_mouse"
+ hvUseBootloader :: String
+ hvUseBootloader = "use_bootloader"
+
++hvUseGuestAgent :: String
++hvUseGuestAgent = "use_guest_agent"
++
+ hvUseLocaltime :: String
+ hvUseLocaltime = "use_localtime"
+
+@@ -1955,6 +1958,7 @@ hvsParameterTypes = Map.fromList
+ , (hvUsbDevices, VTypeString)
+ , (hvUsbMouse, VTypeString)
+ , (hvUseBootloader, VTypeBool)
++ , (hvUseGuestAgent, VTypeBool)
+ , (hvUseLocaltime, VTypeBool)
+ , (hvVga, VTypeString)
+ , (hvVhostNet, VTypeBool)
+@@ -4111,6 +4115,7 @@ hvcDefaults =
+ , (hvMigrationBandwidth, PyValueEx (32 :: Int))
+ , (hvMigrationDowntime, PyValueEx (30 :: Int))
+ , (hvMigrationMode, PyValueEx htMigrationLive)
++ , (hvUseGuestAgent, PyValueEx False)
+ , (hvUseLocaltime, PyValueEx False)
+ , (hvDiskCache, PyValueEx htCacheDefault)
+ , (hvSecurityModel, PyValueEx htSmNone)
+--
+2.11.0.rc2
+
diff --git a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild
similarity index 91%
copy from app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
copy to app-emulation/ganeti/ganeti-2.15.2-r6.ebuild
index a939819..f87f125 100644
--- a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild
@@ -19,11 +19,10 @@ if [[ ${PV} =~ [9]{4,} ]] ; then
KEYWORDS=""
PATCHES=()
else
- DEBIAN_PV=${MY_PV}
- DEBIAN_PATCH=1
- SRC_URI="http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz"
- [[ -n "${DEBIAN_PATCH}" ]] && SRC_URI="${SRC_URI}
- mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${DEBIAN_PV}-${DEBIAN_PATCH}.debian.tar.xz
+ DEBIAN_PATCH=4
+ SRC_URI="
+ http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz
+ mirror://ubuntu/pool/universe/${PN:0:1}/${PN}/${PN}_${PV}-${DEBIAN_PATCH}.debian.tar.xz
"
KEYWORDS="~amd64 ~x86"
PATCHES=(
@@ -32,7 +31,7 @@ else
"${WORKDIR}"/debian/patches/relax-deps
"${WORKDIR}"/debian/patches/zlib-0.6-compatibility
"${WORKDIR}"/debian/patches/fix_FTBFS_with_sphinx-1.3.5
- #"${WORKDIR}"/debian/patches/fix_ftbfs_with_sphinx_1.4 # ported manually
+ "${WORKDIR}"/debian/patches/fix_ftbfs_with_sphinx_1.4
)
fi
@@ -41,7 +40,7 @@ HOMEPAGE="http://www.ganeti.org/"
LICENSE="GPL-2"
SLOT="0"
-IUSE="drbd haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands"
+IUSE="drbd experimental haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands"
REQUIRED_USE="|| ( kvm xen lxc )
test? ( ipv6 )
@@ -180,10 +179,9 @@ PATCHES+=(
"${FILESDIR}/${PN}-2.13-process_unittest.patch"
"${FILESDIR}/${PN}-2.15-python-mock.patch"
"${FILESDIR}/${PN}-2.15.2-remove-sandbox-failing-tests.patch"
- "${FILESDIR}/${PN}-2.16-noded-must-run-as-root.patch"
- "${FILESDIR}/${PN}-2.16-kvmd-run-as-daemon-user.patch"
+ "${FILESDIR}/${PN}-2.15-noded-must-run-as-root.patch"
+ "${FILESDIR}/${PN}-2.15-kvmd-run-as-daemon-user.patch"
"${FILESDIR}/${PN}-2.15-dont-invert-return-values-for-man-warnings.patch"
- "${FILESDIR}/fix_ftbfs_with_sphinx_1.4"
)
S="${WORKDIR}/${MY_P}"
@@ -213,6 +211,14 @@ src_prepare() {
"${WORKDIR}"/debian/patches/ghc-7.10-compatibility.patch
)
fi
+ if use experimental; then
+ ewarn "Experimental patches have been applied! RPC between daemons with different patches applied may cause breakage!"
+ PATCHES+=(
+ # QEMU Agent accepted upstream for 2.16, not yet in a tagged release
+ # backport available for 2.15, but refused upstream due to RPC breakage.
+ "${FILESDIR}"/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.15.patch
+ )
+ fi
eapply "${PATCHES[@]}"
# Upstream commits:
# 4c3c2ca2a97a69c0287a3d23e064bc17978105eb
diff --git a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
index a939819..ebe1bac 100644
--- a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
@@ -41,7 +41,7 @@ HOMEPAGE="http://www.ganeti.org/"
LICENSE="GPL-2"
SLOT="0"
-IUSE="drbd haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands"
+IUSE="drbd experimental haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands"
REQUIRED_USE="|| ( kvm xen lxc )
test? ( ipv6 )
@@ -213,6 +213,14 @@ src_prepare() {
"${WORKDIR}"/debian/patches/ghc-7.10-compatibility.patch
)
fi
+ if use experimental; then
+ ewarn "Experimental patches have been applied! RPC between daemons with different patches applied may cause breakage!"
+ PATCHES+=(
+ # QEMU Agent accepted upstream for 2.16, not yet in a tagged release
+ # backport available for 2.15, but refused upstream due to RPC breakage.
+ "${FILESDIR}"/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.16.patch
+ )
+ fi
eapply "${PATCHES[@]}"
# Upstream commits:
# 4c3c2ca2a97a69c0287a3d23e064bc17978105eb
diff --git a/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild b/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
index 85001c9..829a788 100644
--- a/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
@@ -41,7 +41,7 @@ HOMEPAGE="http://www.ganeti.org/"
LICENSE="GPL-2"
SLOT="0"
-IUSE="drbd haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands"
+IUSE="drbd experimental haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands"
REQUIRED_USE="|| ( kvm xen lxc )
test? ( ipv6 )
@@ -214,6 +214,14 @@ src_prepare() {
"${WORKDIR}"/debian/patches/ghc-7.10-compatibility.patch
)
fi
+ if use experimental; then
+ ewarn "Experimental patches have been applied! RPC between daemons with different patches applied may cause breakage!"
+ PATCHES+=(
+ # QEMU Agent accepted upstream for 2.16, not yet in a tagged release
+ # backport available for 2.15, but refused upstream due to RPC breakage.
+ "${FILESDIR}"/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.16.patch
+ )
+ fi
eapply "${PATCHES[@]}"
# Upstream commits:
# 4c3c2ca2a97a69c0287a3d23e064bc17978105eb
diff --git a/app-emulation/ganeti/metadata.xml b/app-emulation/ganeti/metadata.xml
index 2693e91..d591fbc 100644
--- a/app-emulation/ganeti/metadata.xml
+++ b/app-emulation/ganeti/metadata.xml
@@ -34,5 +34,6 @@
<flag name="restricted-commands">Enable restricted commands in the node daemon</flag>
<flag name="rbd">Enable rados block device support via sys-cluster/ceph</flag>
<flag name="xen">Enable Xen support</flag>
+ <flag name="experimental">Enable experimental patches. Warning! This will break RPC within major versions if the patches applied differ!</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/files/, app-emulation/ganeti/
@ 2017-01-05 19:58 Robin H. Johnson
0 siblings, 0 replies; 10+ messages in thread
From: Robin H. Johnson @ 2017-01-05 19:58 UTC (permalink / raw
To: gentoo-commits
commit: 9021cdfa7682bdfebee8d612a2dbb1f33b60710b
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 5 19:39:48 2017 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Jan 5 19:57:54 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9021cdfa
app-emulation/ganeti: version bump for early testing (not production usage)
Package-Manager: portage-2.3.2
app-emulation/ganeti/Manifest | 3 +
.../ganeti/files/fix_ftbfs_with_sphinx_1.4 | 47 +++
.../ganeti-2.16-kvmd-run-as-daemon-user.patch | 30 ++
.../files/ganeti-2.16-noded-must-run-as-root.patch | 26 ++
.../ganeti/files/ganeti-2.17-relax-deps.patch | 21 ++
app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild | 343 ++++++++++++++++++++
app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild | 344 +++++++++++++++++++++
7 files changed, 814 insertions(+)
diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index d0025a3..a27173f 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -1,2 +1,5 @@
DIST ganeti-2.15.2.tar.gz 4723007 SHA256 1e09d29cae5020142d20a96165b23f3b62b5511b875051b6374d09c4c13c0b83 SHA512 e0707aa535857779622e0eb18cccb89bc34fe4acf373628c30524e3f7e572c4b3d628946ad219149c14615d6471c4d72dbd0c6e3e1855a9f3644b4605544df85 WHIRLPOOL a09a13d64e7c6fa7823072d767fa6495cd814bb22e7a5fc708c8b339103a41da4e45f38574a2c665fe89c8774f220a2715c3aba180eb674eae603730dd2d25ad
+DIST ganeti-2.16.0~rc1.tar.gz 4794934 SHA256 014cbc02b05c681ef216791d23de33e3355adf2153fede91c4fb09f924efb5f1 SHA512 a4bed40e48ecd8ee1f3f8137faf28aea38ffb8955f48bbd233be17660035679fa27d0ef6f8fe20507d34ca9e1dd594e564c9c53412364b6cc05dc8ed2f5602be WHIRLPOOL e5a367ca728757a1a406519110b232875800ed5efe3dc4ba33ab2f0e97e0112d3eebf6235786e2074397c363a73991bf80ed21684a8b608eaba74b3ec102070b
+DIST ganeti-2.17.0~beta1.tar.gz 4880091 SHA256 57de10d300ee4a1b4f1a6625ef24ad4a459c6c5bf1ea83d73a95b0cf9cb6ddb9 SHA512 d836444ea5696c9689ee0fae56192720ef79b2a4a8962c031abacc7ef02ebbb9e9cdadd15aa5d315c2d3da6cbe5043b6c22b9ed94fd13883b5dfa23e08a2867e WHIRLPOOL 3d2ba633e1a4b0c14ece75b1144920720497b533f83c93af3bdf6c2dcdefd3269b581ad4f75497866613ae3a51805ba855aa55b29c6271b9f660b96d48f56a64
DIST ganeti_2.15.2-4.debian.tar.xz 42440 SHA256 d2b907ad54b6fad8bc9c023c718c6f1a35cbc487fa065291f465f1e518df6d02 SHA512 e405f54996236fe5166c89190c529256899458594d30e4daee85a9381400e618bc8cc578c43a166ed6d868ed3c5118e4bddc5103b596db89a504de3ba3a1f403 WHIRLPOOL 16acab23919541bfd1748ff9f5e243c483ed4b5b10bcd5c233821c06968671ce0fcdab86ec95a30f6162a308df1eca16424e94b80ea095dfc90931a4be930b26
+DIST ganeti_2.16.0~rc1-1.debian.tar.xz 41892 SHA256 bb97edb134d45dffb2678604dff7f3b91904aa4b4e16c3c29e44e9919e45a737 SHA512 4501bc058b65adee6285c3d0dcf76ee8bfc4759af6bb11b0414503c6990c7d09942f3cc8e08d270e76bcf13211cc113f44304393dadd2bb8588d9b15230538af WHIRLPOOL 11712b4232ec1e7401d2e8fbf2c66465ffacfb52129dc7d2736cfcb45140ef7734a43510688fd2b8dbac088b6547aacadd596d0def64f9a1cd1f3b88c053f39c
diff --git a/app-emulation/ganeti/files/fix_ftbfs_with_sphinx_1.4 b/app-emulation/ganeti/files/fix_ftbfs_with_sphinx_1.4
new file mode 100644
index 00000000..0050203
--- /dev/null
+++ b/app-emulation/ganeti/files/fix_ftbfs_with_sphinx_1.4
@@ -0,0 +1,47 @@
+Copied from 2.15.2 Debian Patches, as it was missed in the 2.16.0~rc1 debian patches.
+
+Author: Apollon Oikonomopoulos <apoikos@debian.org>
+Description: Fix FTBFS with sphinx 1.4
+ Suppress app.add_role warnings, as upstream knowingly overrides sphinx's
+ built-in manpage role. Without this, a warning is emitted which then turns to
+ an error when sphinx is run with the `-W' switch.
+ .
+ Also replace unicode ellipses in doc/design-query2.rst with three ascii dots,
+ as sphinx emits another warning for not being able to properly highlight these
+ lines as Python code.
+Last-Update: 2016-07-09
+Forwarded: no
+--- a/doc/conf.py
++++ b/doc/conf.py
+@@ -229,3 +229,8 @@
+
+ # If false, no module index is generated.
+ latex_use_modindex = False
++
++# We override the manpage role and sphinx issues a warning, which is treated as
++# error. Suppress role_add warnings to avoid FTBFS.
++
++suppress_warnings = ["app.add_role"]
+--- a/doc/design-query2.rst
++++ b/doc/design-query2.rst
+@@ -129,16 +129,16 @@
+ specific names, the filter must be specified as follows, with the
+ inner part repeated for each name::
+
+- ["|", ["=", "name", "node1"], ["=", "name", "node2"], …]
++ ["|", ["=", "name", "node1"], ["=", "name", "node2"], ...]
+
+- Filters consist of S-expressions (``["operator", <operants…>]``) and
++ Filters consist of S-expressions (``["operator", <operants...>]``) and
+ extensions will be made in the future to allow for more operators and
+ fields. Such extensions might include a Python-style "in" operator,
+ but for simplicity only "=" is supported in this implementation.
+
+ To reiterate: Filters for this implementation must consist of exactly
+- one OR expression (``["|", …]``) and one or more name equality filters
+- (``["=", "name", "…"]``).
++ one OR expression (``["|", ...]``) and one or more name equality filters
++ (``["=", "name", "..."]``).
+
+ Support for synchronous queries, currently available in the interface
+ but disabled in the master daemon, will be dropped. Direct calls to
diff --git a/app-emulation/ganeti/files/ganeti-2.16-kvmd-run-as-daemon-user.patch b/app-emulation/ganeti/files/ganeti-2.16-kvmd-run-as-daemon-user.patch
new file mode 100644
index 00000000..d74a6ca
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti-2.16-kvmd-run-as-daemon-user.patch
@@ -0,0 +1,30 @@
+--- ganeti-2.16.0~rc1.orig/Makefile.am 2017-01-05 10:09:56.568213273 -0800
++++ ganeti-2.16.0~rc1/Makefile.am 2017-01-05 10:10:51.260260697 -0800
+@@ -2477,6 +2477,7 @@
+ echo 's#@''PKGLIBDIR@#$(libdir)/ganeti#g'; \
+ echo 's#@''GNTMASTERUSER@#$(MASTERD_USER)#g'; \
+ echo 's#@''GNTRAPIUSER@#$(RAPI_USER)#g'; \
++ echo 's#@''GNTKVMDUSER@#$(KVMD_USER)#g'; \
+ echo 's#@''GNTCONFDUSER@#$(CONFD_USER)#g'; \
+ echo 's#@''GNTWCONFDUSER@#$(WCONFD_USER)#g'; \
+ echo 's#@''GNTLUXIDUSER@#$(LUXID_USER)#g'; \
+@@ -2484,6 +2485,7 @@
+ echo 's#@''GNTMONDUSER@#$(MOND_USER)#g'; \
+ echo 's#@''GNTMETADUSER@#$(METAD_USER)#g'; \
+ echo 's#@''GNTRAPIGROUP@#$(RAPI_GROUP)#g'; \
++ echo 's#@''GNTKVMDGROUP@#$(KVMD_GROUP)#g'; \
+ echo 's#@''GNTADMINGROUP@#$(ADMIN_GROUP)#g'; \
+ echo 's#@''GNTCONFDGROUP@#$(CONFD_GROUP)#g'; \
+ echo 's#@''GNTNODEDGROUP@#$(NODED_GROUP)#g'; \
+--- ganeti-2.16.0~rc1.orig/daemons/daemon-util.in 2017-01-05 10:09:56.450211013 -0800
++++ ganeti-2.16.0~rc1/daemons/daemon-util.in 2017-01-05 10:11:17.804769059 -0800
+@@ -103,6 +103,9 @@
+ rapi)
+ echo "@GNTRAPIUSER@:@GNTRAPIGROUP@"
+ ;;
++ kvmd)
++ echo "@GNTKVMDUSER@:@GNTKVMDGROUP@"
++ ;;
+ noded)
+ echo "@GNTNODEDUSER@:@GNTNODEDGROUP@"
+ ;;
diff --git a/app-emulation/ganeti/files/ganeti-2.16-noded-must-run-as-root.patch b/app-emulation/ganeti/files/ganeti-2.16-noded-must-run-as-root.patch
new file mode 100644
index 00000000..d6c440b
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti-2.16-noded-must-run-as-root.patch
@@ -0,0 +1,26 @@
+--- ganeti-2.16.0~rc1.orig/configure.ac 2017-01-05 10:09:56.480211588 -0800
++++ ganeti-2.16.0~rc1/configure.ac 2017-01-05 10:15:34.462684390 -0800
+@@ -380,9 +380,9 @@
+ group_luxid="${withval}luxid";
+ group_masterd="${withval}masterd";
+ group_metad="${withval}metad";
+- group_noded="$group_default";
++ group_noded="root";
+ group_daemons="${withval}daemons";
+- group_mond="$group_default"],
++ group_mond="root"],
+ [group_rapi="$group_default";
+ group_admin="$group_default";
+ group_confd="$group_default";
+@@ -391,9 +391,9 @@
+ group_luxid="$group_default";
+ group_masterd="$group_default";
+ group_metad="$group_default";
+- group_noded="$group_default";
++ group_noded="root";
+ group_daemons="$group_default";
+- group_mond="$group_default"])
++ group_mond="root"])
+ AC_SUBST(RAPI_GROUP, $group_rapi)
+ AC_SUBST(ADMIN_GROUP, $group_admin)
+ AC_SUBST(CONFD_GROUP, $group_confd)
diff --git a/app-emulation/ganeti/files/ganeti-2.17-relax-deps.patch b/app-emulation/ganeti/files/ganeti-2.17-relax-deps.patch
new file mode 100644
index 00000000..ef4be08
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti-2.17-relax-deps.patch
@@ -0,0 +1,21 @@
+--- ganeti-2.17.0~beta1/cabal/ganeti.template.cabal 2017-01-05 10:29:49.936067812 -0800
++++ ganeti-2.17.0~beta1/cabal/ganeti.template.cabal 2017-01-05 10:33:03.248770000 -0800
+@@ -54,15 +54,15 @@
+ , transformers >= 0.3.0.0
+ , unix >= 2.5.1.0
+
+- , attoparsec >= 0.10.1.1 && < 0.13
++ , attoparsec >= 0.10.1.1 && < 0.14
+ , base64-bytestring >= 1.0.0.1 && < 1.1
+ , case-insensitive >= 0.4.0.1 && < 1.3
+ , Crypto >= 4.2.4 && < 4.3
+ , curl >= 1.3.7 && < 1.4
+ , hinotify >= 0.3.2 && < 0.4
+ , hslogger >= 1.1.4 && < 1.3
+- , json >= 0.5 && < 1.0
+- , lens >= 3.10 && < 4.13
++ , json >= 0.5
++ , lens >= 3.10
+ , lifted-base >= 0.2.0.3 && < 0.3
+ , monad-control >= 0.3.1.3 && < 1.1
+ , MonadCatchIO-transformers >= 0.3.0.0 && < 0.4
diff --git a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
new file mode 100644
index 00000000..a939819
--- /dev/null
+++ b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
@@ -0,0 +1,343 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=(python2_7)
+PYTHON_REQ_USE="ipv6(+)?"
+
+inherit user autotools bash-completion-r1 python-single-r1 versionator
+
+MY_PV="${PV/_rc/~rc}"
+MY_PV="${MY_PV/_beta/~beta}"
+MY_P="${PN}-${MY_PV}"
+SERIES="$(get_version_component_range 1-2)"
+
+if [[ ${PV} =~ [9]{4,} ]] ; then
+ EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
+ inherit git-2
+ KEYWORDS=""
+ PATCHES=()
+else
+ DEBIAN_PV=${MY_PV}
+ DEBIAN_PATCH=1
+ SRC_URI="http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz"
+ [[ -n "${DEBIAN_PATCH}" ]] && SRC_URI="${SRC_URI}
+ mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${DEBIAN_PV}-${DEBIAN_PATCH}.debian.tar.xz
+ "
+ KEYWORDS="~amd64 ~x86"
+ PATCHES=(
+ "${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch
+ "${WORKDIR}"/debian/patches/Makefile.am-use-C.UTF-8
+ "${WORKDIR}"/debian/patches/relax-deps
+ "${WORKDIR}"/debian/patches/zlib-0.6-compatibility
+ "${WORKDIR}"/debian/patches/fix_FTBFS_with_sphinx-1.3.5
+ #"${WORKDIR}"/debian/patches/fix_ftbfs_with_sphinx_1.4 # ported manually
+ )
+fi
+
+DESCRIPTION="Ganeti is a virtual server management software tool"
+HOMEPAGE="http://www.ganeti.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="drbd haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands"
+
+REQUIRED_USE="|| ( kvm xen lxc )
+ test? ( ipv6 )
+ kvm? ( || ( amd64 x86 ) )
+ ${PYTHON_REQUIRED_USE}"
+
+USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
+GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
+
+DEPEND="
+ dev-libs/openssl:0
+ dev-python/paramiko[${PYTHON_USEDEP}]
+ dev-python/pyopenssl[${PYTHON_USEDEP}]
+ dev-python/simplejson[${PYTHON_USEDEP}]
+ dev-python/pyparsing[${PYTHON_USEDEP}]
+ dev-python/pyinotify[${PYTHON_USEDEP}]
+ dev-python/pycurl[${PYTHON_USEDEP}]
+ dev-python/ipaddr[${PYTHON_USEDEP}]
+ dev-python/bitarray[${PYTHON_USEDEP}]
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/fdsend[${PYTHON_USEDEP}]
+ net-analyzer/arping
+ net-analyzer/fping
+ net-misc/bridge-utils
+ net-misc/curl[ssl]
+ net-misc/openssh
+ net-misc/socat
+ sys-apps/iproute2
+ sys-fs/lvm2
+ >=sys-apps/baselayout-2.0
+ dev-lang/ghc:0=
+ dev-haskell/cabal:0=
+ dev-haskell/cabal-install:0=
+ >=dev-haskell/mtl-2.1.1:0=
+ >=dev-haskell/old-time-1.1.0.0:0=
+ >=dev-haskell/random-1.0.1.1:0=
+ haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= )
+ >=dev-haskell/transformers-0.3.0.0:0=
+
+ >=dev-haskell/attoparsec-0.10.1.1:0=
+ <dev-haskell/attoparsec-0.14:0
+ >=dev-haskell/base64-bytestring-1.0.0.1:0=
+ <dev-haskell/base64-bytestring-1.1:0=
+ >=dev-haskell/crypto-4.2.4:0=
+ <dev-haskell/crypto-4.3:0=
+ >=dev-haskell/curl-1.3.7:0=
+ <dev-haskell/curl-1.4:0=
+ >=dev-haskell/hinotify-0.3.2:0=
+ <dev-haskell/hinotify-0.4:0=
+ >=dev-haskell/hslogger-1.1.4:0=
+ <dev-haskell/hslogger-1.3:0=
+ >=dev-haskell/json-0.5:0=
+ >=dev-haskell/lens-3.10:0=
+ >=dev-haskell/lifted-base-0.2.0.3:0=
+ <dev-haskell/lifted-base-0.3:0=
+ >=dev-haskell/monad-control-0.3.1.3:0=
+ <dev-haskell/monad-control-1.1:0=
+ >=dev-haskell/network-2.3.0.13:0=
+ <dev-haskell/network-2.7:0=
+ >=dev-haskell/parallel-3.2.0.2:3=
+ <dev-haskell/parallel-3.3:3=
+ >=dev-haskell/temporary-1.1.2.3:0=
+ <dev-haskell/temporary-1.3:0=
+ >=dev-haskell/regex-pcre-0.94.2:0=
+ <dev-haskell/regex-pcre-0.95:0=
+ >=dev-haskell/transformers-base-0.4.1:0=
+ <dev-haskell/transformers-base-0.5:0=
+ >=dev-haskell/utf8-string-0.3.7:0=
+ >=dev-haskell/zlib-0.5.3.3:0=
+ <dev-haskell/zlib-0.7:0=
+
+ >=dev-haskell/psqueue-1.1:0=
+ <dev-haskell/psqueue-1.2:0=
+ >=dev-haskell/snap-core-0.8.1:0=
+ <dev-haskell/snap-core-0.10:0=
+ >=dev-haskell/snap-server-0.8.1:0=
+ <dev-haskell/snap-server-0.10:0=
+ >=dev-haskell/case-insensitive-0.4.0.1
+
+ dev-haskell/vector:0=
+ xen? ( >=app-emulation/xen-3.0 )
+ kvm? (
+ dev-python/psutil
+ app-emulation/qemu
+ )
+ lxc? ( app-emulation/lxc )
+ drbd? (
+ || (
+ <sys-cluster/drbd-8.5
+ sys-cluster/drbd-utils
+ )
+ )
+ rbd? ( sys-cluster/ceph )
+ ipv6? ( net-misc/ndisc6 )
+ ${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+ !app-emulation/ganeti-htools"
+DEPEND+="
+ sys-devel/m4
+ app-text/pandoc
+ <=dev-python/sphinx-1.3.5[${PYTHON_USEDEP}]
+ media-fonts/urw-fonts
+ media-gfx/graphviz
+ >=dev-haskell/test-framework-0.6:0=
+ <dev-haskell/test-framework-0.9:0=
+ >=dev-haskell/test-framework-hunit-0.2.7:0=
+ <dev-haskell/test-framework-hunit-0.4:0=
+ >=dev-haskell/test-framework-quickcheck2-0.2.12.1:0=
+ <dev-haskell/test-framework-quickcheck2-0.4:0=
+ test? (
+ dev-python/mock
+ dev-python/pyyaml
+ dev-haskell/haddock:0=
+ >=dev-haskell/hunit-1.2.4.2:0=
+ <dev-haskell/hunit-1.3:0=
+ >=dev-haskell/quickcheck-2.4.2:2=
+ <dev-haskell/quickcheck-2.8.3:2=
+ sys-apps/fakeroot
+ >=net-misc/socat-1.7
+ dev-util/shelltestrunner
+ )"
+
+PATCHES+=(
+ "${FILESDIR}/${PN}-2.12-start-stop-daemon-args.patch"
+ "${FILESDIR}/${PN}-2.11-add-pgrep.patch"
+ "${FILESDIR}/${PN}-2.15-daemon-util.patch"
+ "${FILESDIR}/${PN}-2.9-disable-root-tests.patch"
+ "${FILESDIR}/${PN}-2.9-skip-cli-test.patch"
+ "${FILESDIR}/${PN}-2.10-rundir.patch"
+ "${FILESDIR}/${PN}-2.12-qemu-enable-kvm.patch"
+ "${FILESDIR}/${PN}-2.11-tests.patch"
+ "${FILESDIR}/${PN}-lockdir.patch"
+ "${FILESDIR}/${PN}-2.11-dont-nest-libdir.patch"
+ "${FILESDIR}/${PN}-2.11-dont-print-man-help.patch"
+ "${FILESDIR}/${PN}-2.11-daemon-util-tests.patch"
+ "${FILESDIR}/${PN}-2.13-process_unittest.patch"
+ "${FILESDIR}/${PN}-2.15-python-mock.patch"
+ "${FILESDIR}/${PN}-2.15.2-remove-sandbox-failing-tests.patch"
+ "${FILESDIR}/${PN}-2.16-noded-must-run-as-root.patch"
+ "${FILESDIR}/${PN}-2.16-kvmd-run-as-daemon-user.patch"
+ "${FILESDIR}/${PN}-2.15-dont-invert-return-values-for-man-warnings.patch"
+ "${FILESDIR}/fix_ftbfs_with_sphinx_1.4"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+QA_WX_LOAD="
+ usr/lib*/${PN}/${SERIES}/usr/sbin/ganeti-*d
+ usr/lib*/${PN}/${SERIES}/usr/bin/htools
+"
+
+pkg_setup () {
+ local user
+ python-single-r1_pkg_setup
+
+ if use multiple-users; then
+ for user in gnt-{masterd,confd,luxid,rapi,daemons,admin}; do
+ enewgroup ${user}
+ enewuser ${user} -1 -1 -1 ${user}
+ done
+ fi
+}
+
+src_prepare() {
+ local testfile
+ if has_version '>=dev-lang/ghc-7.10'; then
+ # Breaks the build on 7.8
+ PATCHES+=(
+ "${WORKDIR}"/debian/patches/ghc-7.10-compatibility.patch
+ )
+ fi
+ eapply "${PATCHES[@]}"
+ # Upstream commits:
+ # 4c3c2ca2a97a69c0287a3d23e064bc17978105eb
+ # 24618882737fd7c189adf99f4acc767d48f572c3
+ sed -i \
+ -e '/QuickCheck/s,< 2.8,< 2.8.3,g' \
+ cabal/ganeti.template.cabal
+ # Neuter -Werror
+ sed -i \
+ -e '/^if DEVELOPER_MODE/,/^endif/s/-Werror//' \
+ Makefile.am
+
+ # not sure why these tests are failing
+ # should remove this on next version bump if possible
+ for testfile in test/py/import-export_unittest.bash; do
+ printf '#!/bin/bash\ntrue\n' > "${testfile}"
+ done
+
+ # take the sledgehammer approach to bug #526270
+ grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g'
+
+ eapply_user
+
+ [[ ${PV} =~ [9]{4,} ]] && ./autogen.sh
+ rm autotools/missing
+ eautoreconf
+}
+
+src_configure () {
+ # this is kind of a hack to work around the removal of the qemu-kvm wrapper
+ local kvm_arch
+
+ if use amd64; then
+ kvm_arch=x86_64
+ elif use x86; then
+ kvm_arch=i386
+ elif use kvm; then
+ die "Could not determine qemu system to use for kvm"
+ fi
+
+ econf --localstatedir=/var \
+ --sharedstatedir=/var \
+ --disable-symlinks \
+ --with-ssh-initscript=/etc/init.d/sshd \
+ --with-export-dir=/var/lib/ganeti-storage/export \
+ --with-os-search-path=/usr/share/${PN}/os \
+ $(use_enable restricted-commands) \
+ $(use_enable test haskell-tests) \
+ $(usex multiple-users "--with-default-user=" "" "gnt-daemons" "") \
+ $(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" "") \
+ $(usex multiple-users "--with-default-group=" "" "gnt-daemons" "") \
+ $(usex multiple-users "--with-group-prefix=" "" "${GROUP_PREFIX}" "") \
+ $(use_enable syslog) \
+ $(use_enable monitoring) \
+ $(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \
+ $(usex haskell-daemons "--enable-confd=haskell" '' '' '') \
+ --with-haskell-flags="-optl -Wl,-z,relro -optl -Wl,--as-needed" \
+ --enable-socat-escape \
+ --enable-socat-compress
+}
+
+src_install () {
+ emake V=1 DESTDIR="${D}" install
+
+ newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN}
+ newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN}
+
+ if use kvm; then
+ newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
+ newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff
+ fi
+
+ # ganeti installs it's own docs in a generic location
+ rm -rf "${D}"/{usr/share/doc/${PN},run}
+
+ sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" doc/examples/bash_completion
+ newbashcomp doc/examples/bash_completion gnt-instance
+ bashcomp_alias gnt-instance burnin ganeti-{cleaner,confd} \
+ h{space,check,scan,info,ail,arep,roller,squeeze,bal} \
+ gnt-{os,job,filter,debug,storage,group,node,network,backup,cluster}
+
+ use monitoring && bashcomp_alias gnt-instance mon-collector
+
+ dodoc INSTALL UPGRADE NEWS README doc/*.rst
+
+ docinto html
+ dodoc -r doc/html/* doc/css/*.css
+
+ docinto examples
+ dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf
+
+ docinto examples/hooks
+ dodoc doc/examples/hooks/{ipsec,ethers}
+
+ insinto /etc/cron.d
+ newins doc/examples/ganeti.cron ${PN}
+
+ insinto /etc/logrotate.d
+ newins doc/examples/ganeti.logrotate ${PN}
+
+ # need to dodir rather than keepdir here (bug #552482)
+ dodir /var/lib/${PN}
+
+ keepdir /var/log/${PN}/
+ keepdir /usr/share/${PN}/${SERIES}/os/
+ keepdir /var/lib/ganeti-storage/{export,file,shared}/
+
+ dosym ${SERIES} "/usr/share/${PN}/default"
+ dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default"
+
+ python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES}
+}
+
+pkg_postinst() {
+ if use multiple-users; then
+ elog "You have enable multiple user support, the users for this must"
+ elog "be created. You can use the provided tool for this, which is"
+ elog "located at:"
+ elog " /usr/$(get_libdir)/${PN}/tools/users-setup"
+ fi
+}
+
+src_test () {
+ PATH="${S}/scripts:${S}/src:${PATH}" \
+ TMPDIR="/tmp" \
+ GANETI_MASTER="$(hostname -f)" \
+ emake check || die "emake check failed"
+}
diff --git a/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild b/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
new file mode 100644
index 00000000..85001c9
--- /dev/null
+++ b/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
@@ -0,0 +1,344 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=(python2_7)
+PYTHON_REQ_USE="ipv6(+)?"
+
+inherit user autotools bash-completion-r1 python-single-r1 versionator
+
+MY_PV="${PV/_rc/~rc}"
+MY_PV="${MY_PV/_beta/~beta}"
+MY_P="${PN}-${MY_PV}"
+SERIES="$(get_version_component_range 1-2)"
+
+if [[ ${PV} =~ [9]{4,} ]] ; then
+ EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
+ inherit git-2
+ KEYWORDS=""
+ PATCHES=()
+else
+ DEBIAN_PV='2.16.0~rc1'
+ DEBIAN_PATCH=1
+ SRC_URI="http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz"
+ [[ -n "${DEBIAN_PATCH}" ]] && SRC_URI="${SRC_URI}
+ mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${DEBIAN_PV}-${DEBIAN_PATCH}.debian.tar.xz
+ "
+ KEYWORDS="~amd64 ~x86"
+ PATCHES=(
+ "${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch
+ "${WORKDIR}"/debian/patches/Makefile.am-use-C.UTF-8
+ #"${WORKDIR}"/debian/patches/relax-deps # Ported manually
+ "${WORKDIR}"/debian/patches/zlib-0.6-compatibility
+ "${WORKDIR}"/debian/patches/fix_FTBFS_with_sphinx-1.3.5
+ #"${WORKDIR}"/debian/patches/fix_ftbfs_with_sphinx_1.4 # ported manually
+ )
+fi
+
+DESCRIPTION="Ganeti is a virtual server management software tool"
+HOMEPAGE="http://www.ganeti.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="drbd haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands"
+
+REQUIRED_USE="|| ( kvm xen lxc )
+ test? ( ipv6 )
+ kvm? ( || ( amd64 x86 ) )
+ ${PYTHON_REQUIRED_USE}"
+
+USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
+GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
+
+DEPEND="
+ dev-libs/openssl:0
+ dev-python/paramiko[${PYTHON_USEDEP}]
+ dev-python/pyopenssl[${PYTHON_USEDEP}]
+ dev-python/simplejson[${PYTHON_USEDEP}]
+ dev-python/pyparsing[${PYTHON_USEDEP}]
+ dev-python/pyinotify[${PYTHON_USEDEP}]
+ dev-python/pycurl[${PYTHON_USEDEP}]
+ dev-python/ipaddr[${PYTHON_USEDEP}]
+ dev-python/bitarray[${PYTHON_USEDEP}]
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/fdsend[${PYTHON_USEDEP}]
+ net-analyzer/arping
+ net-analyzer/fping
+ net-misc/bridge-utils
+ net-misc/curl[ssl]
+ net-misc/openssh
+ net-misc/socat
+ sys-apps/iproute2
+ sys-fs/lvm2
+ >=sys-apps/baselayout-2.0
+ dev-lang/ghc:0=
+ dev-haskell/cabal:0=
+ dev-haskell/cabal-install:0=
+ >=dev-haskell/mtl-2.1.1:0=
+ >=dev-haskell/old-time-1.1.0.0:0=
+ >=dev-haskell/random-1.0.1.1:0=
+ haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= )
+ >=dev-haskell/transformers-0.3.0.0:0=
+
+ >=dev-haskell/attoparsec-0.10.1.1:0=
+ <dev-haskell/attoparsec-0.14:0
+ >=dev-haskell/base64-bytestring-1.0.0.1:0=
+ <dev-haskell/base64-bytestring-1.1:0=
+ >=dev-haskell/crypto-4.2.4:0=
+ <dev-haskell/crypto-4.3:0=
+ >=dev-haskell/curl-1.3.7:0=
+ <dev-haskell/curl-1.4:0=
+ >=dev-haskell/hinotify-0.3.2:0=
+ <dev-haskell/hinotify-0.4:0=
+ >=dev-haskell/hslogger-1.1.4:0=
+ <dev-haskell/hslogger-1.3:0=
+ >=dev-haskell/json-0.5:0=
+ >=dev-haskell/lens-3.10:0=
+ >=dev-haskell/lifted-base-0.2.0.3:0=
+ <dev-haskell/lifted-base-0.3:0=
+ >=dev-haskell/monad-control-0.3.1.3:0=
+ <dev-haskell/monad-control-1.1:0=
+ >=dev-haskell/network-2.3.0.13:0=
+ <dev-haskell/network-2.7:0=
+ >=dev-haskell/parallel-3.2.0.2:3=
+ <dev-haskell/parallel-3.3:3=
+ >=dev-haskell/temporary-1.1.2.3:0=
+ <dev-haskell/temporary-1.3:0=
+ >=dev-haskell/regex-pcre-0.94.2:0=
+ <dev-haskell/regex-pcre-0.95:0=
+ >=dev-haskell/transformers-base-0.4.1:0=
+ <dev-haskell/transformers-base-0.5:0=
+ >=dev-haskell/utf8-string-0.3.7:0=
+ >=dev-haskell/zlib-0.5.3.3:0=
+ <dev-haskell/zlib-0.7:0=
+
+ >=dev-haskell/psqueue-1.1:0=
+ <dev-haskell/psqueue-1.2:0=
+ >=dev-haskell/snap-core-0.8.1:0=
+ <dev-haskell/snap-core-0.10:0=
+ >=dev-haskell/snap-server-0.8.1:0=
+ <dev-haskell/snap-server-0.10:0=
+ >=dev-haskell/case-insensitive-0.4.0.1
+
+ dev-haskell/vector:0=
+ xen? ( >=app-emulation/xen-3.0 )
+ kvm? (
+ dev-python/psutil
+ app-emulation/qemu
+ )
+ lxc? ( app-emulation/lxc )
+ drbd? (
+ || (
+ <sys-cluster/drbd-8.5
+ sys-cluster/drbd-utils
+ )
+ )
+ rbd? ( sys-cluster/ceph )
+ ipv6? ( net-misc/ndisc6 )
+ ${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+ !app-emulation/ganeti-htools"
+DEPEND+="
+ sys-devel/m4
+ app-text/pandoc
+ <=dev-python/sphinx-1.3.5[${PYTHON_USEDEP}]
+ media-fonts/urw-fonts
+ media-gfx/graphviz
+ >=dev-haskell/test-framework-0.6:0=
+ <dev-haskell/test-framework-0.9:0=
+ >=dev-haskell/test-framework-hunit-0.2.7:0=
+ <dev-haskell/test-framework-hunit-0.4:0=
+ >=dev-haskell/test-framework-quickcheck2-0.2.12.1:0=
+ <dev-haskell/test-framework-quickcheck2-0.4:0=
+ test? (
+ dev-python/mock
+ dev-python/pyyaml
+ dev-haskell/haddock:0=
+ >=dev-haskell/hunit-1.2.4.2:0=
+ <dev-haskell/hunit-1.3:0=
+ >=dev-haskell/quickcheck-2.4.2:2=
+ <dev-haskell/quickcheck-2.8.3:2=
+ sys-apps/fakeroot
+ >=net-misc/socat-1.7
+ dev-util/shelltestrunner
+ )"
+
+PATCHES+=(
+ "${FILESDIR}/${PN}-2.12-start-stop-daemon-args.patch"
+ "${FILESDIR}/${PN}-2.11-add-pgrep.patch"
+ "${FILESDIR}/${PN}-2.15-daemon-util.patch"
+ "${FILESDIR}/${PN}-2.9-disable-root-tests.patch"
+ "${FILESDIR}/${PN}-2.9-skip-cli-test.patch"
+ "${FILESDIR}/${PN}-2.10-rundir.patch"
+ "${FILESDIR}/${PN}-2.12-qemu-enable-kvm.patch"
+ "${FILESDIR}/${PN}-2.11-tests.patch"
+ "${FILESDIR}/${PN}-lockdir.patch"
+ "${FILESDIR}/${PN}-2.11-dont-nest-libdir.patch"
+ "${FILESDIR}/${PN}-2.11-dont-print-man-help.patch"
+ "${FILESDIR}/${PN}-2.11-daemon-util-tests.patch"
+ "${FILESDIR}/${PN}-2.13-process_unittest.patch"
+ "${FILESDIR}/${PN}-2.15-python-mock.patch"
+ "${FILESDIR}/${PN}-2.15.2-remove-sandbox-failing-tests.patch"
+ "${FILESDIR}/${PN}-2.16-noded-must-run-as-root.patch"
+ "${FILESDIR}/${PN}-2.16-kvmd-run-as-daemon-user.patch"
+ "${FILESDIR}/${PN}-2.15-dont-invert-return-values-for-man-warnings.patch"
+ "${FILESDIR}/fix_ftbfs_with_sphinx_1.4"
+ "${FILESDIR}/${PN}-2.17-relax-deps.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+QA_WX_LOAD="
+ usr/lib*/${PN}/${SERIES}/usr/sbin/ganeti-*d
+ usr/lib*/${PN}/${SERIES}/usr/bin/htools
+"
+
+pkg_setup () {
+ local user
+ python-single-r1_pkg_setup
+
+ if use multiple-users; then
+ for user in gnt-{masterd,confd,luxid,rapi,daemons,admin}; do
+ enewgroup ${user}
+ enewuser ${user} -1 -1 -1 ${user}
+ done
+ fi
+}
+
+src_prepare() {
+ local testfile
+ if has_version '>=dev-lang/ghc-7.10'; then
+ # Breaks the build on 7.8
+ PATCHES+=(
+ "${WORKDIR}"/debian/patches/ghc-7.10-compatibility.patch
+ )
+ fi
+ eapply "${PATCHES[@]}"
+ # Upstream commits:
+ # 4c3c2ca2a97a69c0287a3d23e064bc17978105eb
+ # 24618882737fd7c189adf99f4acc767d48f572c3
+ sed -i \
+ -e '/QuickCheck/s,< 2.8,< 2.8.3,g' \
+ cabal/ganeti.template.cabal
+ # Neuter -Werror
+ sed -i \
+ -e '/^if DEVELOPER_MODE/,/^endif/s/-Werror//' \
+ Makefile.am
+
+ # not sure why these tests are failing
+ # should remove this on next version bump if possible
+ for testfile in test/py/import-export_unittest.bash; do
+ printf '#!/bin/bash\ntrue\n' > "${testfile}"
+ done
+
+ # take the sledgehammer approach to bug #526270
+ grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g'
+
+ eapply_user
+
+ [[ ${PV} =~ [9]{4,} ]] && ./autogen.sh
+ rm autotools/missing
+ eautoreconf
+}
+
+src_configure () {
+ # this is kind of a hack to work around the removal of the qemu-kvm wrapper
+ local kvm_arch
+
+ if use amd64; then
+ kvm_arch=x86_64
+ elif use x86; then
+ kvm_arch=i386
+ elif use kvm; then
+ die "Could not determine qemu system to use for kvm"
+ fi
+
+ econf --localstatedir=/var \
+ --sharedstatedir=/var \
+ --disable-symlinks \
+ --with-ssh-initscript=/etc/init.d/sshd \
+ --with-export-dir=/var/lib/ganeti-storage/export \
+ --with-os-search-path=/usr/share/${PN}/os \
+ $(use_enable restricted-commands) \
+ $(use_enable test haskell-tests) \
+ $(usex multiple-users "--with-default-user=" "" "gnt-daemons" "") \
+ $(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" "") \
+ $(usex multiple-users "--with-default-group=" "" "gnt-daemons" "") \
+ $(usex multiple-users "--with-group-prefix=" "" "${GROUP_PREFIX}" "") \
+ $(use_enable syslog) \
+ $(use_enable monitoring) \
+ $(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \
+ $(usex haskell-daemons "--enable-confd=haskell" '' '' '') \
+ --with-haskell-flags="-optl -Wl,-z,relro -optl -Wl,--as-needed" \
+ --enable-socat-escape \
+ --enable-socat-compress
+}
+
+src_install () {
+ emake V=1 DESTDIR="${D}" install
+
+ newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN}
+ newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN}
+
+ if use kvm; then
+ newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
+ newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff
+ fi
+
+ # ganeti installs it's own docs in a generic location
+ rm -rf "${D}"/{usr/share/doc/${PN},run}
+
+ sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" doc/examples/bash_completion
+ newbashcomp doc/examples/bash_completion gnt-instance
+ bashcomp_alias gnt-instance burnin ganeti-{cleaner,confd} \
+ h{space,check,scan,info,ail,arep,roller,squeeze,bal} \
+ gnt-{os,job,filter,debug,storage,group,node,network,backup,cluster}
+
+ use monitoring && bashcomp_alias gnt-instance mon-collector
+
+ dodoc INSTALL UPGRADE NEWS README doc/*.rst
+
+ docinto html
+ dodoc -r doc/html/* doc/css/*.css
+
+ docinto examples
+ dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf
+
+ docinto examples/hooks
+ dodoc doc/examples/hooks/{ipsec,ethers}
+
+ insinto /etc/cron.d
+ newins doc/examples/ganeti.cron ${PN}
+
+ insinto /etc/logrotate.d
+ newins doc/examples/ganeti.logrotate ${PN}
+
+ # need to dodir rather than keepdir here (bug #552482)
+ dodir /var/lib/${PN}
+
+ keepdir /var/log/${PN}/
+ keepdir /usr/share/${PN}/${SERIES}/os/
+ keepdir /var/lib/ganeti-storage/{export,file,shared}/
+
+ dosym ${SERIES} "/usr/share/${PN}/default"
+ dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default"
+
+ python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES}
+}
+
+pkg_postinst() {
+ if use multiple-users; then
+ elog "You have enable multiple user support, the users for this must"
+ elog "be created. You can use the provided tool for this, which is"
+ elog "located at:"
+ elog " /usr/$(get_libdir)/${PN}/tools/users-setup"
+ fi
+}
+
+src_test () {
+ PATH="${S}/scripts:${S}/src:${PATH}" \
+ TMPDIR="/tmp" \
+ GANETI_MASTER="$(hostname -f)" \
+ emake check || die "emake check failed"
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/files/, app-emulation/ganeti/
@ 2016-05-25 4:05 Patrick McLean
0 siblings, 0 replies; 10+ messages in thread
From: Patrick McLean @ 2016-05-25 4:05 UTC (permalink / raw
To: gentoo-commits
commit: 5a9df6a22b2fed43184421965c86a2c207841ae4
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Wed May 25 04:05:23 2016 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Wed May 25 04:05:23 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a9df6a2
app-emulation/ganeti: Add patch to not invert the check-man-warnings return code
Gentoo-Bug: 579550
Package-Manager: portage-2.3.0_rc1
...aneti-2.15-dont-invert-return-values-for-man-warnings.patch | 10 ++++++++++
app-emulation/ganeti/ganeti-2.15.2-r4.ebuild | 1 +
2 files changed, 11 insertions(+)
diff --git a/app-emulation/ganeti/files/ganeti-2.15-dont-invert-return-values-for-man-warnings.patch b/app-emulation/ganeti/files/ganeti-2.15-dont-invert-return-values-for-man-warnings.patch
new file mode 100644
index 0000000..37a6875
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti-2.15-dont-invert-return-values-for-man-warnings.patch
@@ -0,0 +1,10 @@
+--- a/autotools/check-man-warnings 2015-12-03 19:50:34.000000000 +0000
++++ b/autotools/check-man-warnings 2016-05-22 11:19:31.678635696 +0000
+@@ -35,6 +35,6 @@
+ loc="en_US.UTF-8"
+ fi
+
+-! LANG="$loc" LC_ALL="$loc" MANWIDTH=80 \
++LANG="$loc" LC_ALL="$loc" MANWIDTH=80 \
+ man --warnings --encoding=utf8 --local-file "$1" 2>&1 >/dev/null | \
+ grep -v -e "cannot adjust line" -e "can't break line" | \
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r4.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r4.ebuild
index c5dac05..704f938 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r4.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r4.ebuild
@@ -173,6 +173,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.15.2-remove-sandbox-failing-tests.patch"
"${FILESDIR}/${PN}-2.15-noded-must-run-as-root.patch"
"${FILESDIR}/${PN}-2.15-kvmd-run-as-daemon-user.patch"
+ "${FILESDIR}/${PN}-2.15-dont-invert-return-values-for-man-warnings.patch"
)
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/files/, app-emulation/ganeti/
@ 2016-04-05 23:18 Patrick McLean
0 siblings, 0 replies; 10+ messages in thread
From: Patrick McLean @ 2016-04-05 23:18 UTC (permalink / raw
To: gentoo-commits
commit: 0745f7c477ed0626e71072a4ba0b818bcb887855
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 5 23:16:03 2016 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Tue Apr 5 23:18:39 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0745f7c4
app-emulation/ganeti: revision bump, fix kvmd user patch
Package-Manager: portage-2.2.28
.../ganeti-2.15-kvmd-run-as-daemon-user.patch | 23 +-
app-emulation/ganeti/ganeti-2.15.2-r4.ebuild | 312 +++++++++++++++++++++
2 files changed, 333 insertions(+), 2 deletions(-)
diff --git a/app-emulation/ganeti/files/ganeti-2.15-kvmd-run-as-daemon-user.patch b/app-emulation/ganeti/files/ganeti-2.15-kvmd-run-as-daemon-user.patch
index bb1bd09..ce347ce 100644
--- a/app-emulation/ganeti/files/ganeti-2.15-kvmd-run-as-daemon-user.patch
+++ b/app-emulation/ganeti/files/ganeti-2.15-kvmd-run-as-daemon-user.patch
@@ -1,5 +1,24 @@
+diff --git a/Makefile.am b/Makefile.am
+index 8910b08..1bbe5fd 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2452,12 +2452,14 @@ $(REPLACE_VARS_SED): $(SHELL_ENV_INIT) Makefile stamp-directories
+ echo 's#@''PKGLIBDIR@#$(libdir)/ganeti#g'; \
+ echo 's#@''GNTMASTERUSER@#$(MASTERD_USER)#g'; \
+ echo 's#@''GNTRAPIUSER@#$(RAPI_USER)#g'; \
++ echo 's#@''GNTKVMDUSER@#$(KVMD_USER)#g'; \
+ echo 's#@''GNTCONFDUSER@#$(CONFD_USER)#g'; \
+ echo 's#@''GNTWCONFDUSER@#$(WCONFD_USER)#g'; \
+ echo 's#@''GNTLUXIDUSER@#$(LUXID_USER)#g'; \
+ echo 's#@''GNTNODEDUSER@#$(NODED_USER)#g'; \
+ echo 's#@''GNTMONDUSER@#$(MOND_USER)#g'; \
+ echo 's#@''GNTRAPIGROUP@#$(RAPI_GROUP)#g'; \
++ echo 's#@''GNTKVMDGROUP@#$(KVMD_GROUP)#g'; \
+ echo 's#@''GNTADMINGROUP@#$(ADMIN_GROUP)#g'; \
+ echo 's#@''GNTCONFDGROUP@#$(CONFD_GROUP)#g'; \
+ echo 's#@''GNTNODEDGROUP@#$(NODED_GROUP)#g'; \
diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in
-index 7636fc9..aec5c92 100644
+index 7636fc9..91ea20b 100644
--- a/daemons/daemon-util.in
+++ b/daemons/daemon-util.in
@@ -102,6 +102,9 @@ _daemon_usergroup() {
@@ -7,7 +26,7 @@ index 7636fc9..aec5c92 100644
echo "@GNTRAPIUSER@:@GNTRAPIGROUP@"
;;
+ kvmd)
-+ echo "@GNTDAEMONSUSER@:@GNTDAEMONSGROUP@"
++ echo "@GNTKVMDUSER@:@GNTKVMDGROUP@"
+ ;;
noded)
echo "@GNTNODEDUSER@:@GNTNODEDGROUP@"
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r4.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r4.ebuild
new file mode 100644
index 0000000..c5dac05
--- /dev/null
+++ b/app-emulation/ganeti/ganeti-2.15.2-r4.ebuild
@@ -0,0 +1,312 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=(python2_7)
+PYTHON_REQ_USE="ipv6(+)?"
+
+inherit user autotools bash-completion-r1 python-single-r1 versionator
+
+MY_PV="${PV/_rc/~rc}"
+MY_PV="${MY_PV/_beta/~beta}"
+MY_P="${PN}-${MY_PV}"
+SERIES="$(get_version_component_range 1-2)"
+
+if [[ ${PV} =~ [9]{4,} ]] ; then
+ EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
+ inherit git-2
+ KEYWORDS=""
+else
+ SRC_URI="http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Ganeti is a virtual server management software tool"
+HOMEPAGE="http://www.ganeti.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="drbd haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen"
+
+REQUIRED_USE="|| ( kvm xen lxc )
+ test? ( ipv6 )
+ kvm? ( || ( amd64 x86 ) )
+ ${PYTHON_REQUIRED_USE}"
+
+USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
+GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
+
+DEPEND="
+ dev-libs/openssl:0
+ dev-python/paramiko[${PYTHON_USEDEP}]
+ dev-python/pyopenssl[${PYTHON_USEDEP}]
+ dev-python/simplejson[${PYTHON_USEDEP}]
+ dev-python/pyparsing[${PYTHON_USEDEP}]
+ dev-python/pyinotify[${PYTHON_USEDEP}]
+ dev-python/pycurl[${PYTHON_USEDEP}]
+ dev-python/ipaddr[${PYTHON_USEDEP}]
+ dev-python/bitarray[${PYTHON_USEDEP}]
+ dev-python/docutils[${PYTHON_USEDEP}]
+ net-analyzer/arping
+ net-analyzer/fping
+ net-misc/bridge-utils
+ net-misc/curl[ssl]
+ net-misc/openssh
+ net-misc/socat
+ sys-apps/iproute2
+ sys-fs/lvm2
+ >=sys-apps/baselayout-2.0
+ dev-lang/ghc:0=
+ dev-haskell/cabal:0=
+ dev-haskell/cabal-install:0=
+ >=dev-haskell/mtl-2.1.1:0=
+ >=dev-haskell/old-time-1.1.0.0:0=
+ >=dev-haskell/random-1.0.1.1:0=
+ haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= )
+ >=dev-haskell/transformers-0.3.0.0:0=
+
+ >=dev-haskell/attoparsec-0.10.1.1:0=
+ <dev-haskell/attoparsec-0.13:0
+ >=dev-haskell/base64-bytestring-1.0.0.1:0=
+ <dev-haskell/base64-bytestring-1.1:0=
+ >=dev-haskell/crypto-4.2.4:0=
+ <dev-haskell/crypto-4.3:0=
+ >=dev-haskell/curl-1.3.7:0=
+ <dev-haskell/curl-1.4:0=
+ >=dev-haskell/hinotify-0.3.2:0=
+ <dev-haskell/hinotify-0.4:0=
+ >=dev-haskell/hslogger-1.1.4:0=
+ <dev-haskell/hslogger-1.3:0=
+ >=dev-haskell/json-0.5:0=
+ <dev-haskell/json-0.9:0=
+ >=dev-haskell/lens-3.10:0=
+ <dev-haskell/lens-4.8:0=
+ >=dev-haskell/lifted-base-0.2.0.3:0=
+ <dev-haskell/lifted-base-0.3:0=
+ >=dev-haskell/monad-control-0.3.1.3:0=
+ <dev-haskell/monad-control-1.1:0=
+ >=dev-haskell/network-2.3.0.13:0=
+ <dev-haskell/network-2.7:0=
+ >=dev-haskell/parallel-3.2.0.2:3=
+ <dev-haskell/parallel-3.3:3=
+ >=dev-haskell/temporary-1.1.2.3:0=
+ <dev-haskell/temporary-1.3:0=
+ >=dev-haskell/regex-pcre-0.94.2:0=
+ <dev-haskell/regex-pcre-0.95:0=
+ >=dev-haskell/transformers-base-0.4.1:0=
+ <dev-haskell/transformers-base-0.5:0=
+ >=dev-haskell/utf8-string-0.3.7:0=
+ <dev-haskell/utf8-string-0.4:0=
+ >=dev-haskell/zlib-0.5.3.3:0=
+ <dev-haskell/zlib-0.6:0=
+
+ >=dev-haskell/psqueue-1.1:0=
+ <dev-haskell/psqueue-1.2:0=
+ >=dev-haskell/snap-core-0.8.1:0=
+ <dev-haskell/snap-core-0.10:0=
+ >=dev-haskell/snap-server-0.8.1:0=
+ <dev-haskell/snap-server-0.10:0=
+ >=dev-haskell/case-insensitive-0.4.0.1
+
+ dev-haskell/vector:0=
+ <dev-haskell/semigroupoids-4.1:0=
+ <dev-haskell/contravariant-0.6
+ <dev-haskell/transformers-compat-0.4[three]
+ xen? ( >=app-emulation/xen-3.0 )
+ kvm? (
+ dev-python/psutil
+ app-emulation/qemu
+ )
+ lxc? ( app-emulation/lxc )
+ drbd? (
+ || (
+ <sys-cluster/drbd-8.5
+ sys-cluster/drbd-utils
+ )
+ )
+ rbd? ( sys-cluster/ceph )
+ ipv6? ( net-misc/ndisc6 )
+ ${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+ !app-emulation/ganeti-htools"
+DEPEND+="
+ sys-devel/m4
+ app-text/pandoc
+ <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+ media-fonts/urw-fonts
+ media-gfx/graphviz
+ >=dev-haskell/test-framework-0.6:0=
+ <dev-haskell/test-framework-0.9:0=
+ >=dev-haskell/test-framework-hunit-0.2.7:0=
+ <dev-haskell/test-framework-hunit-0.4:0=
+ >=dev-haskell/test-framework-quickcheck2-0.2.12.1:0=
+ <dev-haskell/test-framework-quickcheck2-0.4:0=
+ test? (
+ dev-python/mock
+ dev-python/pyyaml
+ dev-haskell/haddock:0=
+ >=dev-haskell/hunit-1.2.4.2:0=
+ <dev-haskell/hunit-1.3:0=
+ >=dev-haskell/quickcheck-2.4.2:2=
+ <dev-haskell/quickcheck-2.8:2=
+ sys-apps/fakeroot
+ net-misc/socat
+ dev-util/shelltestrunner
+ )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.12-start-stop-daemon-args.patch"
+ "${FILESDIR}/${PN}-2.11-add-pgrep.patch"
+ "${FILESDIR}/${PN}-2.15-daemon-util.patch"
+ "${FILESDIR}/${PN}-2.9-disable-root-tests.patch"
+ "${FILESDIR}/${PN}-2.9-skip-cli-test.patch"
+ "${FILESDIR}/${PN}-2.10-rundir.patch"
+ "${FILESDIR}/${PN}-2.12-qemu-enable-kvm.patch"
+ "${FILESDIR}/${PN}-2.11-tests.patch"
+ "${FILESDIR}/${PN}-lockdir.patch"
+ "${FILESDIR}/${PN}-2.11-dont-nest-libdir.patch"
+ "${FILESDIR}/${PN}-2.11-dont-print-man-help.patch"
+ "${FILESDIR}/${PN}-2.11-daemon-util-tests.patch"
+ "${FILESDIR}/${PN}-2.13-process_unittest.patch"
+ "${FILESDIR}/${PN}-2.15-python-mock.patch"
+ "${FILESDIR}/${PN}-2.15.2-remove-sandbox-failing-tests.patch"
+ "${FILESDIR}/${PN}-2.15-noded-must-run-as-root.patch"
+ "${FILESDIR}/${PN}-2.15-kvmd-run-as-daemon-user.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+QA_WX_LOAD="
+ usr/lib*/${PN}/${SERIES}/usr/sbin/ganeti-*d
+ usr/lib*/${PN}/${SERIES}/usr/bin/htools
+"
+
+pkg_setup () {
+ local user
+ python-single-r1_pkg_setup
+
+ if use multiple-users; then
+ for user in gnt-{masterd,confd,luxid,rapi,daemons,admin}; do
+ enewgroup ${user}
+ enewuser ${user} -1 -1 -1 ${user}
+ done
+ fi
+}
+
+src_prepare() {
+ local testfile
+ eapply "${PATCHES[@]}"
+
+ # not sure why these tests are failing
+ # should remove this on next version bump if possible
+ for testfile in test/py/import-export_unittest.bash; do
+ printf '#!/bin/bash\ntrue\n' > "${testfile}"
+ done
+
+ # take the sledgehammer approach to bug #526270
+ grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g'
+
+ eapply_user
+
+ [[ ${PV} =~ [9]{4,} ]] && ./autogen.sh
+ rm autotools/missing
+ eautoreconf
+}
+
+src_configure () {
+ # this is kind of a hack to work around the removal of the qemu-kvm wrapper
+ local kvm_arch
+
+ if use amd64; then
+ kvm_arch=x86_64
+ elif use x86; then
+ kvm_arch=i386
+ elif use kvm; then
+ die "Could not determine qemu system to use for kvm"
+ fi
+
+ econf --localstatedir=/var \
+ --sharedstatedir=/var \
+ --disable-symlinks \
+ --with-ssh-initscript=/etc/init.d/sshd \
+ --with-export-dir=/var/lib/ganeti-storage/export \
+ --with-os-search-path=/usr/share/${PN}/os \
+ $(use_enable test haskell-tests) \
+ $(usex multiple-users "--with-default-user=" "" "gnt-daemons" "") \
+ $(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" "") \
+ $(usex multiple-users "--with-default-group=" "" "gnt-daemons" "") \
+ $(usex multiple-users "--with-group-prefix=" "" "${GROUP_PREFIX}" "") \
+ $(use_enable syslog) \
+ $(use_enable monitoring) \
+ $(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \
+ $(usex haskell-daemons "--enable-confd=haskell" '' '' '')
+}
+
+src_install () {
+ emake V=1 DESTDIR="${D}" install
+
+ newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN}
+ newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN}
+
+ if use kvm; then
+ newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
+ newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff
+ fi
+
+ # ganeti installs it's own docs in a generic location
+ rm -rf "${D}"/{usr/share/doc/${PN},run}
+
+ sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" doc/examples/bash_completion
+ newbashcomp doc/examples/bash_completion gnt-instance
+ bashcomp_alias gnt-instance burnin ganeti-{cleaner,confd} \
+ h{space,check,scan,info,ail,arep,roller,squeeze,bal} \
+ gnt-{os,job,filter,debug,storage,group,node,network,backup,cluster}
+
+ use monitoring && bashcomp_alias gnt-instance mon-collector
+
+ dodoc INSTALL UPGRADE NEWS README doc/*.rst
+
+ docinto html
+ dodoc -r doc/html/* doc/css/*.css
+
+ docinto examples
+ dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf
+
+ docinto examples/hooks
+ dodoc doc/examples/hooks/{ipsec,ethers}
+
+ insinto /etc/cron.d
+ newins doc/examples/ganeti.cron ${PN}
+
+ insinto /etc/logrotate.d
+ newins doc/examples/ganeti.logrotate ${PN}
+
+ # need to dodir rather than keepdir here (bug #552482)
+ dodir /var/lib/${PN}
+
+ keepdir /var/log/${PN}/
+ keepdir /usr/share/${PN}/${SERIES}/os/
+ keepdir /var/lib/ganeti-storage/{export,file,shared}/
+
+ dosym ${SERIES} "/usr/share/${PN}/default"
+ dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default"
+
+ python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES}
+}
+
+pkg_postinst() {
+ if use multiple-users; then
+ elog "You have enable multiple user support, the users for this must"
+ elog "be created. You can use the provided tool for this, which is"
+ elog "located at:"
+ elog " /usr/$(get_libdir)/${PN}/tools/users-setup"
+ fi
+}
+
+src_test () {
+ PATH="${S}/scripts:${S}/src:${PATH}" \
+ TMPDIR="/tmp" \
+ GANETI_MASTER="$(hostname -f)" \
+ emake check || die "emake check failed"
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/files/, app-emulation/ganeti/
@ 2016-04-05 18:42 Patrick McLean
0 siblings, 0 replies; 10+ messages in thread
From: Patrick McLean @ 2016-04-05 18:42 UTC (permalink / raw
To: gentoo-commits
commit: a198359e12f23bfb2115ee14f3795e66a9e28d39
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 5 18:27:20 2016 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Tue Apr 5 18:42:20 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a198359e
app-emulation/ganeti: revision bump, port to EAPI=6, force <sphinx-1.3
Package-Manager: portage-2.2.28
.../ganeti/files/ganeti-2.9-skip-cli-test.patch | 4 +-
app-emulation/ganeti/ganeti-2.15.2-r3.ebuild | 312 +++++++++++++++++++++
2 files changed, 314 insertions(+), 2 deletions(-)
diff --git a/app-emulation/ganeti/files/ganeti-2.9-skip-cli-test.patch b/app-emulation/ganeti/files/ganeti-2.9-skip-cli-test.patch
index 7e1badc..c0977ca 100644
--- a/app-emulation/ganeti/files/ganeti-2.9-skip-cli-test.patch
+++ b/app-emulation/ganeti/files/ganeti-2.9-skip-cli-test.patch
@@ -1,5 +1,5 @@
---- Makefile.am.orig 2013-11-13 02:19:49.198992622 +0000
-+++ Makefile.am 2013-11-13 02:20:12.709305182 +0000
+--- a/Makefile.am.orig 2013-11-13 02:19:49.198992622 +0000
++++ b/Makefile.am 2013-11-13 02:20:12.709305182 +0000
@@ -1332,7 +1332,6 @@
test/py/daemon-util_unittest.bash \
test/py/ganeti-cleaner_unittest.bash \
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r3.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r3.ebuild
new file mode 100644
index 0000000..c5dac05
--- /dev/null
+++ b/app-emulation/ganeti/ganeti-2.15.2-r3.ebuild
@@ -0,0 +1,312 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=(python2_7)
+PYTHON_REQ_USE="ipv6(+)?"
+
+inherit user autotools bash-completion-r1 python-single-r1 versionator
+
+MY_PV="${PV/_rc/~rc}"
+MY_PV="${MY_PV/_beta/~beta}"
+MY_P="${PN}-${MY_PV}"
+SERIES="$(get_version_component_range 1-2)"
+
+if [[ ${PV} =~ [9]{4,} ]] ; then
+ EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
+ inherit git-2
+ KEYWORDS=""
+else
+ SRC_URI="http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Ganeti is a virtual server management software tool"
+HOMEPAGE="http://www.ganeti.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="drbd haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen"
+
+REQUIRED_USE="|| ( kvm xen lxc )
+ test? ( ipv6 )
+ kvm? ( || ( amd64 x86 ) )
+ ${PYTHON_REQUIRED_USE}"
+
+USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
+GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
+
+DEPEND="
+ dev-libs/openssl:0
+ dev-python/paramiko[${PYTHON_USEDEP}]
+ dev-python/pyopenssl[${PYTHON_USEDEP}]
+ dev-python/simplejson[${PYTHON_USEDEP}]
+ dev-python/pyparsing[${PYTHON_USEDEP}]
+ dev-python/pyinotify[${PYTHON_USEDEP}]
+ dev-python/pycurl[${PYTHON_USEDEP}]
+ dev-python/ipaddr[${PYTHON_USEDEP}]
+ dev-python/bitarray[${PYTHON_USEDEP}]
+ dev-python/docutils[${PYTHON_USEDEP}]
+ net-analyzer/arping
+ net-analyzer/fping
+ net-misc/bridge-utils
+ net-misc/curl[ssl]
+ net-misc/openssh
+ net-misc/socat
+ sys-apps/iproute2
+ sys-fs/lvm2
+ >=sys-apps/baselayout-2.0
+ dev-lang/ghc:0=
+ dev-haskell/cabal:0=
+ dev-haskell/cabal-install:0=
+ >=dev-haskell/mtl-2.1.1:0=
+ >=dev-haskell/old-time-1.1.0.0:0=
+ >=dev-haskell/random-1.0.1.1:0=
+ haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= )
+ >=dev-haskell/transformers-0.3.0.0:0=
+
+ >=dev-haskell/attoparsec-0.10.1.1:0=
+ <dev-haskell/attoparsec-0.13:0
+ >=dev-haskell/base64-bytestring-1.0.0.1:0=
+ <dev-haskell/base64-bytestring-1.1:0=
+ >=dev-haskell/crypto-4.2.4:0=
+ <dev-haskell/crypto-4.3:0=
+ >=dev-haskell/curl-1.3.7:0=
+ <dev-haskell/curl-1.4:0=
+ >=dev-haskell/hinotify-0.3.2:0=
+ <dev-haskell/hinotify-0.4:0=
+ >=dev-haskell/hslogger-1.1.4:0=
+ <dev-haskell/hslogger-1.3:0=
+ >=dev-haskell/json-0.5:0=
+ <dev-haskell/json-0.9:0=
+ >=dev-haskell/lens-3.10:0=
+ <dev-haskell/lens-4.8:0=
+ >=dev-haskell/lifted-base-0.2.0.3:0=
+ <dev-haskell/lifted-base-0.3:0=
+ >=dev-haskell/monad-control-0.3.1.3:0=
+ <dev-haskell/monad-control-1.1:0=
+ >=dev-haskell/network-2.3.0.13:0=
+ <dev-haskell/network-2.7:0=
+ >=dev-haskell/parallel-3.2.0.2:3=
+ <dev-haskell/parallel-3.3:3=
+ >=dev-haskell/temporary-1.1.2.3:0=
+ <dev-haskell/temporary-1.3:0=
+ >=dev-haskell/regex-pcre-0.94.2:0=
+ <dev-haskell/regex-pcre-0.95:0=
+ >=dev-haskell/transformers-base-0.4.1:0=
+ <dev-haskell/transformers-base-0.5:0=
+ >=dev-haskell/utf8-string-0.3.7:0=
+ <dev-haskell/utf8-string-0.4:0=
+ >=dev-haskell/zlib-0.5.3.3:0=
+ <dev-haskell/zlib-0.6:0=
+
+ >=dev-haskell/psqueue-1.1:0=
+ <dev-haskell/psqueue-1.2:0=
+ >=dev-haskell/snap-core-0.8.1:0=
+ <dev-haskell/snap-core-0.10:0=
+ >=dev-haskell/snap-server-0.8.1:0=
+ <dev-haskell/snap-server-0.10:0=
+ >=dev-haskell/case-insensitive-0.4.0.1
+
+ dev-haskell/vector:0=
+ <dev-haskell/semigroupoids-4.1:0=
+ <dev-haskell/contravariant-0.6
+ <dev-haskell/transformers-compat-0.4[three]
+ xen? ( >=app-emulation/xen-3.0 )
+ kvm? (
+ dev-python/psutil
+ app-emulation/qemu
+ )
+ lxc? ( app-emulation/lxc )
+ drbd? (
+ || (
+ <sys-cluster/drbd-8.5
+ sys-cluster/drbd-utils
+ )
+ )
+ rbd? ( sys-cluster/ceph )
+ ipv6? ( net-misc/ndisc6 )
+ ${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+ !app-emulation/ganeti-htools"
+DEPEND+="
+ sys-devel/m4
+ app-text/pandoc
+ <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+ media-fonts/urw-fonts
+ media-gfx/graphviz
+ >=dev-haskell/test-framework-0.6:0=
+ <dev-haskell/test-framework-0.9:0=
+ >=dev-haskell/test-framework-hunit-0.2.7:0=
+ <dev-haskell/test-framework-hunit-0.4:0=
+ >=dev-haskell/test-framework-quickcheck2-0.2.12.1:0=
+ <dev-haskell/test-framework-quickcheck2-0.4:0=
+ test? (
+ dev-python/mock
+ dev-python/pyyaml
+ dev-haskell/haddock:0=
+ >=dev-haskell/hunit-1.2.4.2:0=
+ <dev-haskell/hunit-1.3:0=
+ >=dev-haskell/quickcheck-2.4.2:2=
+ <dev-haskell/quickcheck-2.8:2=
+ sys-apps/fakeroot
+ net-misc/socat
+ dev-util/shelltestrunner
+ )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.12-start-stop-daemon-args.patch"
+ "${FILESDIR}/${PN}-2.11-add-pgrep.patch"
+ "${FILESDIR}/${PN}-2.15-daemon-util.patch"
+ "${FILESDIR}/${PN}-2.9-disable-root-tests.patch"
+ "${FILESDIR}/${PN}-2.9-skip-cli-test.patch"
+ "${FILESDIR}/${PN}-2.10-rundir.patch"
+ "${FILESDIR}/${PN}-2.12-qemu-enable-kvm.patch"
+ "${FILESDIR}/${PN}-2.11-tests.patch"
+ "${FILESDIR}/${PN}-lockdir.patch"
+ "${FILESDIR}/${PN}-2.11-dont-nest-libdir.patch"
+ "${FILESDIR}/${PN}-2.11-dont-print-man-help.patch"
+ "${FILESDIR}/${PN}-2.11-daemon-util-tests.patch"
+ "${FILESDIR}/${PN}-2.13-process_unittest.patch"
+ "${FILESDIR}/${PN}-2.15-python-mock.patch"
+ "${FILESDIR}/${PN}-2.15.2-remove-sandbox-failing-tests.patch"
+ "${FILESDIR}/${PN}-2.15-noded-must-run-as-root.patch"
+ "${FILESDIR}/${PN}-2.15-kvmd-run-as-daemon-user.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+QA_WX_LOAD="
+ usr/lib*/${PN}/${SERIES}/usr/sbin/ganeti-*d
+ usr/lib*/${PN}/${SERIES}/usr/bin/htools
+"
+
+pkg_setup () {
+ local user
+ python-single-r1_pkg_setup
+
+ if use multiple-users; then
+ for user in gnt-{masterd,confd,luxid,rapi,daemons,admin}; do
+ enewgroup ${user}
+ enewuser ${user} -1 -1 -1 ${user}
+ done
+ fi
+}
+
+src_prepare() {
+ local testfile
+ eapply "${PATCHES[@]}"
+
+ # not sure why these tests are failing
+ # should remove this on next version bump if possible
+ for testfile in test/py/import-export_unittest.bash; do
+ printf '#!/bin/bash\ntrue\n' > "${testfile}"
+ done
+
+ # take the sledgehammer approach to bug #526270
+ grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g'
+
+ eapply_user
+
+ [[ ${PV} =~ [9]{4,} ]] && ./autogen.sh
+ rm autotools/missing
+ eautoreconf
+}
+
+src_configure () {
+ # this is kind of a hack to work around the removal of the qemu-kvm wrapper
+ local kvm_arch
+
+ if use amd64; then
+ kvm_arch=x86_64
+ elif use x86; then
+ kvm_arch=i386
+ elif use kvm; then
+ die "Could not determine qemu system to use for kvm"
+ fi
+
+ econf --localstatedir=/var \
+ --sharedstatedir=/var \
+ --disable-symlinks \
+ --with-ssh-initscript=/etc/init.d/sshd \
+ --with-export-dir=/var/lib/ganeti-storage/export \
+ --with-os-search-path=/usr/share/${PN}/os \
+ $(use_enable test haskell-tests) \
+ $(usex multiple-users "--with-default-user=" "" "gnt-daemons" "") \
+ $(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" "") \
+ $(usex multiple-users "--with-default-group=" "" "gnt-daemons" "") \
+ $(usex multiple-users "--with-group-prefix=" "" "${GROUP_PREFIX}" "") \
+ $(use_enable syslog) \
+ $(use_enable monitoring) \
+ $(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \
+ $(usex haskell-daemons "--enable-confd=haskell" '' '' '')
+}
+
+src_install () {
+ emake V=1 DESTDIR="${D}" install
+
+ newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN}
+ newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN}
+
+ if use kvm; then
+ newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
+ newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff
+ fi
+
+ # ganeti installs it's own docs in a generic location
+ rm -rf "${D}"/{usr/share/doc/${PN},run}
+
+ sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" doc/examples/bash_completion
+ newbashcomp doc/examples/bash_completion gnt-instance
+ bashcomp_alias gnt-instance burnin ganeti-{cleaner,confd} \
+ h{space,check,scan,info,ail,arep,roller,squeeze,bal} \
+ gnt-{os,job,filter,debug,storage,group,node,network,backup,cluster}
+
+ use monitoring && bashcomp_alias gnt-instance mon-collector
+
+ dodoc INSTALL UPGRADE NEWS README doc/*.rst
+
+ docinto html
+ dodoc -r doc/html/* doc/css/*.css
+
+ docinto examples
+ dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf
+
+ docinto examples/hooks
+ dodoc doc/examples/hooks/{ipsec,ethers}
+
+ insinto /etc/cron.d
+ newins doc/examples/ganeti.cron ${PN}
+
+ insinto /etc/logrotate.d
+ newins doc/examples/ganeti.logrotate ${PN}
+
+ # need to dodir rather than keepdir here (bug #552482)
+ dodir /var/lib/${PN}
+
+ keepdir /var/log/${PN}/
+ keepdir /usr/share/${PN}/${SERIES}/os/
+ keepdir /var/lib/ganeti-storage/{export,file,shared}/
+
+ dosym ${SERIES} "/usr/share/${PN}/default"
+ dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default"
+
+ python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES}
+}
+
+pkg_postinst() {
+ if use multiple-users; then
+ elog "You have enable multiple user support, the users for this must"
+ elog "be created. You can use the provided tool for this, which is"
+ elog "located at:"
+ elog " /usr/$(get_libdir)/${PN}/tools/users-setup"
+ fi
+}
+
+src_test () {
+ PATH="${S}/scripts:${S}/src:${PATH}" \
+ TMPDIR="/tmp" \
+ GANETI_MASTER="$(hostname -f)" \
+ emake check || die "emake check failed"
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/files/, app-emulation/ganeti/
@ 2016-04-01 23:57 Patrick McLean
0 siblings, 0 replies; 10+ messages in thread
From: Patrick McLean @ 2016-04-01 23:57 UTC (permalink / raw
To: gentoo-commits
commit: b3b274b57fc6d07cae1dad8272c3904d78e982aa
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 1 23:56:01 2016 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri Apr 1 23:56:01 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3b274b5
app-emulation/ganeti: revision bump, make sure kvmd is running as the right user
Package-Manager: portage-2.2.28
.../ganeti-2.15-kvmd-run-as-daemon-user.patch | 14 +
app-emulation/ganeti/ganeti-2.15.2-r2.ebuild | 309 +++++++++++++++++++++
2 files changed, 323 insertions(+)
diff --git a/app-emulation/ganeti/files/ganeti-2.15-kvmd-run-as-daemon-user.patch b/app-emulation/ganeti/files/ganeti-2.15-kvmd-run-as-daemon-user.patch
new file mode 100644
index 0000000..bb1bd09
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti-2.15-kvmd-run-as-daemon-user.patch
@@ -0,0 +1,14 @@
+diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in
+index 7636fc9..aec5c92 100644
+--- a/daemons/daemon-util.in
++++ b/daemons/daemon-util.in
+@@ -102,6 +102,9 @@ _daemon_usergroup() {
+ rapi)
+ echo "@GNTRAPIUSER@:@GNTRAPIGROUP@"
+ ;;
++ kvmd)
++ echo "@GNTDAEMONSUSER@:@GNTDAEMONSGROUP@"
++ ;;
+ noded)
+ echo "@GNTNODEDUSER@:@GNTNODEDGROUP@"
+ ;;
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r2.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r2.ebuild
new file mode 100644
index 0000000..9e7840c
--- /dev/null
+++ b/app-emulation/ganeti/ganeti-2.15.2-r2.ebuild
@@ -0,0 +1,309 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=(python2_7)
+PYTHON_REQ_USE="ipv6(+)?"
+
+inherit eutils user autotools bash-completion-r1 python-single-r1 versionator
+
+MY_PV="${PV/_rc/~rc}"
+MY_PV="${MY_PV/_beta/~beta}"
+MY_P="${PN}-${MY_PV}"
+SERIES="$(get_version_component_range 1-2)"
+
+if [[ ${PV} =~ [9]{4,} ]] ; then
+ EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
+ inherit git-2
+ KEYWORDS=""
+ GIT_DEPEND="dev-python/docutils
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ media-gfx/graphviz
+ media-fonts/urw-fonts"
+else
+ SRC_URI="http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Ganeti is a virtual server management software tool"
+HOMEPAGE="http://www.ganeti.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="drbd haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen"
+REQUIRED_USE="|| ( kvm xen lxc ) test? ( ipv6 ) ${PYTHON_REQUIRED_USE}"
+
+USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
+GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
+
+DEPEND="
+ dev-libs/openssl:0
+ dev-python/paramiko[${PYTHON_USEDEP}]
+ dev-python/pyopenssl[${PYTHON_USEDEP}]
+ dev-python/simplejson[${PYTHON_USEDEP}]
+ dev-python/pyparsing[${PYTHON_USEDEP}]
+ dev-python/pyinotify[${PYTHON_USEDEP}]
+ dev-python/pycurl[${PYTHON_USEDEP}]
+ dev-python/ipaddr[${PYTHON_USEDEP}]
+ dev-python/bitarray[${PYTHON_USEDEP}]
+ dev-python/docutils[${PYTHON_USEDEP}]
+ net-analyzer/arping
+ net-analyzer/fping
+ net-misc/bridge-utils
+ net-misc/curl[ssl]
+ net-misc/openssh
+ net-misc/socat
+ sys-apps/iproute2
+ sys-fs/lvm2
+ >=sys-apps/baselayout-2.0
+ dev-lang/ghc
+ dev-haskell/cabal:0=
+ dev-haskell/cabal-install:0=
+ >=dev-haskell/mtl-2.1.1:0=
+ >=dev-haskell/old-time-1.1.0.0:0=
+ >=dev-haskell/random-1.0.1.1:0=
+ haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= )
+ >=dev-haskell/transformers-0.3.0.0:0=
+
+ >=dev-haskell/attoparsec-0.10.1.1:0=
+ <dev-haskell/attoparsec-0.13:0
+ >=dev-haskell/base64-bytestring-1.0.0.1:0=
+ <dev-haskell/base64-bytestring-1.1:0=
+ >=dev-haskell/crypto-4.2.4:0=
+ <dev-haskell/crypto-4.3:0=
+ >=dev-haskell/curl-1.3.7:0=
+ <dev-haskell/curl-1.4:0=
+ >=dev-haskell/hinotify-0.3.2:0=
+ <dev-haskell/hinotify-0.4:0=
+ >=dev-haskell/hslogger-1.1.4:0=
+ <dev-haskell/hslogger-1.3:0=
+ >=dev-haskell/json-0.5:0=
+ <dev-haskell/json-0.9:0=
+ >=dev-haskell/lens-3.10:0=
+ <dev-haskell/lens-4.8:0=
+ >=dev-haskell/lifted-base-0.2.0.3:0=
+ <dev-haskell/lifted-base-0.3:0=
+ >=dev-haskell/monad-control-0.3.1.3:0=
+ <dev-haskell/monad-control-1.1:0=
+ >=dev-haskell/network-2.3.0.13:0=
+ <dev-haskell/network-2.7:0=
+ >=dev-haskell/parallel-3.2.0.2:3=
+ <dev-haskell/parallel-3.3:3=
+ >=dev-haskell/temporary-1.1.2.3:0=
+ <dev-haskell/temporary-1.3:0=
+ >=dev-haskell/regex-pcre-0.94.2:0=
+ <dev-haskell/regex-pcre-0.95:0=
+ >=dev-haskell/transformers-base-0.4.1:0=
+ <dev-haskell/transformers-base-0.5:0=
+ >=dev-haskell/utf8-string-0.3.7:0=
+ <dev-haskell/utf8-string-0.4:0=
+ >=dev-haskell/zlib-0.5.3.3:0=
+ <dev-haskell/zlib-0.6:0=
+
+ >=dev-haskell/psqueue-1.1:0=
+ <dev-haskell/psqueue-1.2:0=
+ >=dev-haskell/snap-core-0.8.1:0=
+ <dev-haskell/snap-core-0.10:0=
+ >=dev-haskell/snap-server-0.8.1:0=
+ <dev-haskell/snap-server-0.10:0=
+ >=dev-haskell/case-insensitive-0.4.0.1
+
+ dev-haskell/vector:0=
+ <dev-haskell/semigroupoids-4.1:0=
+ <dev-haskell/contravariant-0.6
+ <dev-haskell/transformers-compat-0.4[three]
+ xen? ( >=app-emulation/xen-3.0 )
+ kvm? (
+ dev-python/psutil
+ app-emulation/qemu
+ )
+ lxc? ( app-emulation/lxc )
+ drbd? (
+ || (
+ <sys-cluster/drbd-8.5
+ sys-cluster/drbd-utils
+ )
+ )
+ rbd? ( sys-cluster/ceph )
+ ipv6? ( net-misc/ndisc6 )
+ ${PYTHON_DEPS}
+ ${GIT_DEPEND}"
+RDEPEND="${DEPEND}
+ !app-emulation/ganeti-htools"
+DEPEND+="sys-devel/m4
+ app-text/pandoc
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ media-fonts/urw-fonts
+ media-gfx/graphviz
+ >=dev-haskell/test-framework-0.6:0=
+ <dev-haskell/test-framework-0.9:0=
+ >=dev-haskell/test-framework-hunit-0.2.7:0=
+ <dev-haskell/test-framework-hunit-0.4:0=
+ >=dev-haskell/test-framework-quickcheck2-0.2.12.1:0=
+ <dev-haskell/test-framework-quickcheck2-0.4:0=
+ test? (
+ dev-python/mock
+ dev-python/pyyaml
+ dev-haskell/haddock:0=
+ >=dev-haskell/hunit-1.2.4.2:0=
+ <dev-haskell/hunit-1.3:0=
+ >=dev-haskell/quickcheck-2.4.2:2=
+ <dev-haskell/quickcheck-2.8:2=
+ sys-apps/fakeroot
+ net-misc/socat
+ dev-util/shelltestrunner
+ )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.12-start-stop-daemon-args.patch"
+ "${FILESDIR}/${PN}-2.11-add-pgrep.patch"
+ "${FILESDIR}/${PN}-2.15-daemon-util.patch"
+ "${FILESDIR}/${PN}-2.9-disable-root-tests.patch"
+ "${FILESDIR}/${PN}-2.9-skip-cli-test.patch"
+ "${FILESDIR}/${PN}-2.10-rundir.patch"
+ "${FILESDIR}/${PN}-2.12-qemu-enable-kvm.patch"
+ "${FILESDIR}/${PN}-2.11-tests.patch"
+ "${FILESDIR}/${PN}-lockdir.patch"
+ "${FILESDIR}/${PN}-2.11-dont-nest-libdir.patch"
+ "${FILESDIR}/${PN}-2.11-dont-print-man-help.patch"
+ "${FILESDIR}/${PN}-2.11-daemon-util-tests.patch"
+ "${FILESDIR}/${PN}-2.13-process_unittest.patch"
+ "${FILESDIR}/${PN}-2.15-python-mock.patch"
+ "${FILESDIR}/${PN}-2.15.2-remove-sandbox-failing-tests.patch"
+ "${FILESDIR}/${PN}-2.15-noded-must-run-as-root.patch"
+ "${FILESDIR}/${PN}-2.15-kvmd-run-as-daemon-user.patch"
+)
+
+REQUIRED_USE="kvm? ( || ( amd64 x86 ) )"
+
+S="${WORKDIR}/${MY_P}"
+
+QA_WX_LOAD="
+ usr/lib*/${PN}/${SERIES}/usr/sbin/ganeti-*d
+ usr/lib*/${PN}/${SERIES}/usr/bin/htools
+"
+
+pkg_setup () {
+ local user
+ python-single-r1_pkg_setup
+
+ if use multiple-users; then
+ for user in gnt-{masterd,confd,luxid,rapi,daemons,admin}; do
+ enewgroup ${user}
+ enewuser ${user} -1 -1 -1 ${user}
+ done
+ fi
+}
+
+src_prepare() {
+ local testfile
+ epatch "${PATCHES[@]}"
+
+ # not sure why these tests are failing
+ # should remove this on next version bump if possible
+ for testfile in test/py/import-export_unittest.bash; do
+ printf '#!/bin/bash\ntrue\n' > "${testfile}"
+ done
+
+ # take the sledgehammer approach to bug #526270
+ grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g'
+
+ [[ ${PV} =~ [9]{4,} ]] && ./autogen.sh
+ rm autotools/missing
+ eautoreconf
+}
+
+src_configure () {
+ # this is kind of a hack to work around the removal of the qemu-kvm wrapper
+ local kvm_arch
+
+ if use amd64; then
+ kvm_arch=x86_64
+ elif use x86; then
+ kvm_arch=i386
+ elif use kvm; then
+ die "Could not determine qemu system to use for kvm"
+ fi
+
+ econf --localstatedir=/var \
+ --sharedstatedir=/var \
+ --disable-symlinks \
+ --docdir=/usr/share/doc/${P} \
+ --with-ssh-initscript=/etc/init.d/sshd \
+ --with-export-dir=/var/lib/ganeti-storage/export \
+ --with-os-search-path=/usr/share/${PN}/os \
+ $(use_enable test haskell-tests) \
+ $(usex multiple-users "--with-default-user=" "" "gnt-daemons" "") \
+ $(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" "") \
+ $(usex multiple-users "--with-default-group=" "" "gnt-daemons" "") \
+ $(usex multiple-users "--with-group-prefix=" "" "${GROUP_PREFIX}" "") \
+ $(use_enable syslog) \
+ $(use_enable monitoring) \
+ $(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \
+ $(usex haskell-daemons "--enable-confd=haskell" '' '' '')
+}
+
+src_install () {
+ emake V=1 DESTDIR="${D}" install || die "emake install failed"
+
+ newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN}
+ newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN}
+
+ if use kvm; then
+ newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
+ newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff
+ fi
+
+ # ganeti installs it's own docs in a generic location
+ rm -rf "${D}"/{usr/share/doc/${PN},run}
+
+ sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" doc/examples/bash_completion
+ newbashcomp doc/examples/bash_completion gnt-instance
+ bashcomp_alias gnt-instance burnin ganeti-{cleaner,confd} \
+ h{space,check,scan,info,ail,arep,roller,squeeze,bal} \
+ gnt-{os,job,filter,debug,storage,group,node,network,backup,cluster}
+
+ dodoc INSTALL UPGRADE NEWS README doc/*.rst
+ dohtml -r doc/html/* doc/css/*.css
+
+ docinto examples
+ dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf
+
+ docinto examples/hooks
+ dodoc doc/examples/hooks/{ipsec,ethers}
+
+ insinto /etc/cron.d
+ newins doc/examples/ganeti.cron ${PN}
+
+ insinto /etc/logrotate.d
+ newins doc/examples/ganeti.logrotate ${PN}
+
+ # need to dodir rather than keepdir here (bug #552482)
+ dodir /var/lib/${PN}
+
+ keepdir /var/log/${PN}/
+ keepdir /usr/share/${PN}/${SERIES}/os/
+ keepdir /var/lib/ganeti-storage/{export,file,shared}/
+
+ dosym ${SERIES} "/usr/share/${PN}/default"
+ dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default"
+
+ python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES}
+}
+
+pkg_postinst() {
+ if use multiple-users; then
+ elog "You have enable multiple user support, the users for this must"
+ elog "be created. You can use the provided tool for this, which is"
+ elog "located at:"
+ elog " /usr/$(get_libdir)/${PN}/tools/users-setup"
+ fi
+}
+
+src_test () {
+ PATH="${S}/scripts:${S}/src:${PATH}" \
+ TMPDIR="/tmp" \
+ GANETI_MASTER="$(hostname -f)" \
+ emake check || die "emake check failed"
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/files/, app-emulation/ganeti/
@ 2015-11-19 2:33 Patrick McLean
0 siblings, 0 replies; 10+ messages in thread
From: Patrick McLean @ 2015-11-19 2:33 UTC (permalink / raw
To: gentoo-commits
commit: 29e2ed35eb516bd8ebc8dd8aa2edd70474754cfb
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 19 02:33:41 2015 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 02:33:41 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29e2ed35
app-emulation/ganeti: version bump to 2.15.1
Package-Manager: portage-2.2.24
app-emulation/ganeti/Manifest | 1 +
.../ganeti/files/ganeti-2.15-daemon-util.patch | 53 ++++
.../ganeti/files/ganeti-2.15-python-mock.patch | 26 ++
app-emulation/ganeti/ganeti-2.15.1.ebuild | 309 +++++++++++++++++++++
app-emulation/ganeti/metadata.xml | 2 +-
5 files changed, 390 insertions(+), 1 deletion(-)
diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index 5180973..9203439 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -4,4 +4,5 @@ DIST ganeti-2.12.1.tar.gz 4353529 SHA256 bd1b33d12485f4de25cca74dcf2e5354067cdda
DIST ganeti-2.12.3.tar.gz 4373350 SHA256 e66fc4c3dde1e90d85749ceb5c1c90bd6eaed1d139796829833b74337d2d4148 SHA512 7715db8e472e4ac99bf184028cd9853495153485c6638bcddba2d05ce958b6b44d3be07290780bb27b22337ae646881d6b0a30bbe87b7249106ac34d22bdd6c2 WHIRLPOOL e24d695d5acc582905ae7ba003e3fe6e6aa6ea4f9135daf76b953864c392803cd1c6ed81eb0e96652038f289bf450f3ac1a428c46d7a2573bc39a9451a47694e
DIST ganeti-2.13.0.tar.gz 4573781 SHA256 30ccfa971b15d49b45a4bfb75bb9631c0993adbd7feac0562c11305ae8c13753 SHA512 bd847ae7e12cb978fae59a458a4d0e33fee470c51748964453b5d0ea6615e6d959519c84922e92229e942a88f1ad88a6d1cb655f58391d033d5f5dfc249ef941 WHIRLPOOL 925159e36fde1cd36214b4fe54b4e06958cc8bd3ded28e32bc4f99842aafcb4c53c701c8a651421559dc13b4d18ae2cc11f1b9d1d2da1e862561cca81d009bda
DIST ganeti-2.14.1.tar.gz 4655994 SHA256 ae90c69f0c02d2ee558363a1c021dfaaaf4ccb59b662a72fa6485b406766e133 SHA512 2d3927bf888ea56df6b6275a869979c53d4b01e2e527e2dddea2a4835c90e85831e9e7691162999e5c58e9d214e03a37690e84f8fde9f1a0631897b06db348c3 WHIRLPOOL 3554161afd646af41e587fffa9dc85788f6ef13102121c636802946b64161cdeaeea326103171b70577b06635eebf6988b2f3942024a944612642aefd92b89bb
+DIST ganeti-2.15.1.tar.gz 4701531 SHA256 a0bc6b9f78c8c9440ca67a73e2011d4499776e18ff42289dff66e90f0a532b72 SHA512 198dd17c8cb1670b1db39f9dd9fdcc416648d5a8c6ed9cbfc2ef3db32ed88a3b445729774a89516f60d443360f42c1fe3cf5c9c015127a4aa1c95027d86d96ba WHIRLPOOL df03b5334299533b34c063026edc57a1be76af74797266bbf1ffba9c3c36aa4fafb2c04687043d4ed734652c1c07d61a06e3c4281721021351845a21a17d8866
DIST ganeti-2.4.5.tar.gz 1828118 SHA256 9141379f3802238fb209309ec12f7090d872b77d7a473c91fe766d1fcec97c89 SHA512 e3abc2fd7c031fbef41c6e993f4cb129fa1dd4cb8c44961a2574da23832fd8412b8b3664b2e05ba8236cb8e58e8d70c3c9081f3f1b6dba8ffdc28d298c8a5099 WHIRLPOOL 897c2b3cdf0c7b03232a4ec99314439dbd29afd65eb2502d21a9f197cc098323a4b9ec0671c24ef7aad44b5327316ee68731e7e5304c8730d03f8ca908b93b62
diff --git a/app-emulation/ganeti/files/ganeti-2.15-daemon-util.patch b/app-emulation/ganeti/files/ganeti-2.15-daemon-util.patch
new file mode 100644
index 0000000..25233c3
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti-2.15-daemon-util.patch
@@ -0,0 +1,53 @@
+diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in
+index 7636fc9..9c681ab 100644
+--- a/daemons/daemon-util.in
++++ b/daemons/daemon-util.in
+@@ -31,25 +31,26 @@ set -e
+
+ @SHELL_ENV_INIT@
+
+-readonly defaults_file="$SYSCONFDIR/default/ganeti"
+-
+-# This is a list of all daemons and the order in which they're started. The
+-# order is important as there are dependencies between them. On shutdown,
+-# they're stopped in reverse order.
+-DAEMONS=(
+- ganeti-noded
+- ganeti-confd
+- ganeti-wconfd
+- ganeti-rapi
+- ganeti-luxid
+- ganeti-kvmd
+- )
++readonly defaults_file="$SYSCONFDIR/conf.d/ganeti"
+
+ # This is the list of daemons that are loaded on demand; they should only be
+ # stopped, not started.
+ ON_DEMAND_DAEMONS=(
+ ganeti-metad
+ )
++DAEMONS=( ganeti-noded ganeti-confd )
++
++_is_master() {
++ [ -z "${GANETI_MASTER}" ] && GANETI_MASTER="$(gnt-cluster getmaster)"
++ [ -z "${LOCAL_HOSTNAME}" ] && LOCAL_HOSTNAME="$(hostname -f)"
++ [ "${GANETI_MASTER}" = "${LOCAL_HOSTNAME}" ]
++}
++
++if _is_master; then
++ DAEMONS+=( ganeti-wconfd ganeti-rapi ganeti-luxid )
++fi
++
++DAEMONS+=( ganeti-kvmd )
+
+ _mond_enabled() {
+ [[ "@CUSTOM_ENABLE_MOND@" == True ]]
+@@ -246,7 +247,7 @@ check() {
+ return 1
+ fi
+ elif type -p start-stop-daemon >/dev/null; then
+- start-stop-daemon --stop --signal 0 --quiet \
++ start-stop-daemon --signal 0 --quiet \
+ --pidfile $pidfile
+ else
+ _ignore_error status \
diff --git a/app-emulation/ganeti/files/ganeti-2.15-python-mock.patch b/app-emulation/ganeti/files/ganeti-2.15-python-mock.patch
new file mode 100644
index 0000000..e51525b
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti-2.15-python-mock.patch
@@ -0,0 +1,26 @@
+diff --git a/test/py/cmdlib/test_unittest.py b/test/py/cmdlib/test_unittest.py
+index f93f99d..2d0d083 100644
+--- a/test/py/cmdlib/test_unittest.py
++++ b/test/py/cmdlib/test_unittest.py
+@@ -85,7 +85,7 @@ class TestLUTestDelay(CmdlibTestCase):
+
+ self.ExecOpCode(op)
+
+- self.rpc.call_test_delay.assert_called_once()
++ assert self.rpc.call_test_delay.called
+
+ def testFailingRpc(self):
+ op = opcodes.OpTestDelay(duration=DELAY_DURATION,
+diff --git a/test/py/testutils/__init__.py b/test/py/testutils/__init__.py
+index 27ca425..04ea0ee 100644
+--- a/test/py/testutils/__init__.py
++++ b/test/py/testutils/__init__.py
+@@ -242,7 +242,7 @@ def patch_object(*args, **kwargs):
+ This function unifies the different variations.
+
+ """
+- import mock
++ from mock import mock
+ try:
+ # pylint: disable=W0212
+ return mock._patch_object(*args, **kwargs)
diff --git a/app-emulation/ganeti/ganeti-2.15.1.ebuild b/app-emulation/ganeti/ganeti-2.15.1.ebuild
new file mode 100644
index 0000000..b94908e
--- /dev/null
+++ b/app-emulation/ganeti/ganeti-2.15.1.ebuild
@@ -0,0 +1,309 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=(python2_7)
+use test && PYTHON_REQ_USE="ipv6"
+
+inherit eutils user autotools bash-completion-r1 python-single-r1 versionator
+
+MY_PV="${PV/_rc/~rc}"
+MY_PV="${MY_PV/_beta/~beta}"
+MY_P="${PN}-${MY_PV}"
+SERIES="$(get_version_component_range 1-2)"
+
+if [[ ${PV} =~ [9]{4,} ]] ; then
+ EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
+ inherit git-2
+ KEYWORDS=""
+ GIT_DEPEND="dev-python/docutils
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ media-gfx/graphviz
+ media-fonts/urw-fonts"
+else
+ SRC_URI="http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Ganeti is a virtual server management software tool"
+HOMEPAGE="http://www.ganeti.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="drbd haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen"
+REQUIRED_USE="|| ( kvm xen lxc ) ${PYTHON_REQUIRED_USE}"
+
+USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
+GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
+
+DOC_DEPEND="dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/docutils
+ media-fonts/urw-fonts
+ media-gfx/graphviz"
+
+DEPEND="
+ dev-libs/openssl:0
+ dev-python/paramiko[${PYTHON_USEDEP}]
+ dev-python/pyopenssl[${PYTHON_USEDEP}]
+ dev-python/simplejson[${PYTHON_USEDEP}]
+ dev-python/pyparsing[${PYTHON_USEDEP}]
+ dev-python/pyinotify[${PYTHON_USEDEP}]
+ dev-python/pycurl[${PYTHON_USEDEP}]
+ dev-python/ipaddr[${PYTHON_USEDEP}]
+ dev-python/bitarray[${PYTHON_USEDEP}]
+ net-analyzer/arping
+ net-analyzer/fping
+ net-misc/bridge-utils
+ net-misc/curl[ssl]
+ net-misc/openssh
+ net-misc/socat
+ sys-apps/iproute2
+ sys-fs/lvm2
+ >=sys-apps/baselayout-2.0
+ dev-lang/ghc
+ dev-haskell/cabal:0=
+ dev-haskell/cabal-install:0=
+ >=dev-haskell/mtl-2.1.1:0=
+ >=dev-haskell/old-time-1.1.0.0:0=
+ >=dev-haskell/random-1.0.1.1:0=
+ haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= )
+ >=dev-haskell/transformers-0.3.0.0:0=
+
+ >=dev-haskell/attoparsec-0.10.1.1:0=
+ <dev-haskell/attoparsec-0.13:0
+ >=dev-haskell/base64-bytestring-1.0.0.1:0=
+ <dev-haskell/base64-bytestring-1.1:0=
+ >=dev-haskell/crypto-4.2.4:0=
+ <dev-haskell/crypto-4.3:0=
+ >=dev-haskell/curl-1.3.7:0=
+ <dev-haskell/curl-1.4:0=
+ >=dev-haskell/hinotify-0.3.2:0=
+ <dev-haskell/hinotify-0.4:0=
+ >=dev-haskell/hslogger-1.1.4:0=
+ <dev-haskell/hslogger-1.3:0=
+ >=dev-haskell/json-0.5:0=
+ <dev-haskell/json-0.9:0=
+ >=dev-haskell/lens-3.10:0=
+ <dev-haskell/lens-4.8:0=
+ >=dev-haskell/lifted-base-0.2.0.3:0=
+ <dev-haskell/lifted-base-0.3:0=
+ >=dev-haskell/monad-control-0.3.1.3:0=
+ <dev-haskell/monad-control-1.1:0=
+ >=dev-haskell/network-2.3.0.13:0=
+ <dev-haskell/network-2.7:0=
+ >=dev-haskell/parallel-3.2.0.2:3=
+ <dev-haskell/parallel-3.3:3=
+ >=dev-haskell/temporary-1.1.2.3:0=
+ <dev-haskell/temporary-1.3:0=
+ >=dev-haskell/regex-pcre-0.94.2:0=
+ <dev-haskell/regex-pcre-0.95:0=
+ >=dev-haskell/transformers-base-0.4.1:0=
+ <dev-haskell/transformers-base-0.5:0=
+ >=dev-haskell/utf8-string-0.3.7:0=
+ <dev-haskell/utf8-string-0.4:0=
+ >=dev-haskell/zlib-0.5.3.3:0=
+ <dev-haskell/zlib-0.6:0=
+
+ >=dev-haskell/psqueue-1.1:0=
+ <dev-haskell/psqueue-1.2:0=
+ >=dev-haskell/snap-core-0.8.1:0=
+ <dev-haskell/snap-core-0.10:0=
+ >=dev-haskell/snap-server-0.8.1:0=
+ <dev-haskell/snap-server-0.10:0=
+ >=dev-haskell/case-insensitive-0.4.0.1
+
+ dev-haskell/vector:0=
+ <dev-haskell/semigroupoids-4.1:0=
+ <dev-haskell/contravariant-0.6
+ <dev-haskell/transformers-compat-0.4[three]
+ xen? ( >=app-emulation/xen-3.0 )
+ kvm? (
+ dev-python/psutil
+ app-emulation/qemu
+ )
+ lxc? ( app-emulation/lxc )
+ drbd? (
+ || (
+ <sys-cluster/drbd-8.5
+ sys-cluster/drbd-utils
+ )
+ )
+ rbd? ( sys-cluster/ceph )
+ ipv6? ( net-misc/ndisc6 )
+ ${PYTHON_DEPS}
+ ${GIT_DEPEND}"
+RDEPEND="${DEPEND}
+ !app-emulation/ganeti-htools"
+DEPEND+="sys-devel/m4
+ app-text/pandoc
+ >=dev-haskell/test-framework-0.6:0=
+ <dev-haskell/test-framework-0.9:0=
+ >=dev-haskell/test-framework-hunit-0.2.7:0=
+ <dev-haskell/test-framework-hunit-0.4:0=
+ >=dev-haskell/test-framework-quickcheck2-0.2.12.1:0=
+ <dev-haskell/test-framework-quickcheck2-0.4:0=
+ test? (
+ dev-python/mock
+ dev-python/pyyaml
+ dev-haskell/haddock:0=
+ >=dev-haskell/hunit-1.2.4.2:0=
+ <dev-haskell/hunit-1.3:0=
+ >=dev-haskell/quickcheck-2.4.2:2=
+ <dev-haskell/quickcheck-2.8:2=
+ sys-apps/fakeroot
+ net-misc/socat
+ dev-util/shelltestrunner
+ ${DOC_DEPEND}
+ )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.12-start-stop-daemon-args.patch"
+ "${FILESDIR}/${PN}-2.11-add-pgrep.patch"
+ "${FILESDIR}/${PN}-2.15-daemon-util.patch"
+ "${FILESDIR}/${PN}-2.7-fix-tests.patch"
+ "${FILESDIR}/${PN}-2.9-disable-root-tests.patch"
+ "${FILESDIR}/${PN}-2.9-skip-cli-test.patch"
+ "${FILESDIR}/${PN}-2.10-rundir.patch"
+ "${FILESDIR}/${PN}-2.12-qemu-enable-kvm.patch"
+ "${FILESDIR}/${PN}-2.11-tests.patch"
+ "${FILESDIR}/${PN}-lockdir.patch"
+ "${FILESDIR}/${PN}-2.11-dont-nest-libdir.patch"
+ "${FILESDIR}/${PN}-2.11-dont-print-man-help.patch"
+ "${FILESDIR}/${PN}-2.11-daemon-util-tests.patch"
+ "${FILESDIR}/${PN}-2.13-process_unittest.patch"
+ "${FILESDIR}/${PN}-2.15-python-mock.patch"
+)
+
+REQUIRED_USE="kvm? ( || ( amd64 x86 ) )"
+
+S="${WORKDIR}/${MY_P}"
+
+QA_WX_LOAD="
+ usr/lib*/${PN}/${SERIES}/usr/sbin/ganeti-*d
+ usr/lib*/${PN}/${SERIES}/usr/bin/htools
+"
+
+pkg_setup () {
+ local user
+ python-single-r1_pkg_setup
+
+ if use multiple-users; then
+ for user in gnt-{masterd,confd,luxid,rapi,daemons,admin}; do
+ enewgroup ${user}
+ enewuser ${user} -1 -1 -1 ${user}
+ done
+ fi
+}
+
+src_prepare() {
+ local testfile
+ epatch "${PATCHES[@]}"
+
+ # not sure why these tests are failing
+ # should remove this on next version bump if possible
+ for testfile in test/py/import-export_unittest.bash; do
+ printf '#!/bin/bash\ntrue\n' > "${testfile}"
+ done
+
+ # take the sledgehammer approach to bug #526270
+ grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g'
+
+ [[ ${PV} =~ [9]{4,} ]] && ./autogen.sh
+ rm autotools/missing
+ eautoreconf
+}
+
+src_configure () {
+ # this is kind of a hack to work around the removal of the qemu-kvm wrapper
+ local kvm_arch
+
+ if use amd64; then
+ kvm_arch=x86_64
+ elif use x86; then
+ kvm_arch=i386
+ elif use kvm; then
+ die "Could not determine qemu system to use for kvm"
+ fi
+
+ econf --localstatedir=/var \
+ --sharedstatedir=/var \
+ --disable-symlinks \
+ --docdir=/usr/share/doc/${P} \
+ --with-ssh-initscript=/etc/init.d/sshd \
+ --with-export-dir=/var/lib/ganeti-storage/export \
+ --with-os-search-path=/usr/share/${PN}/os \
+ $(use_enable test haskell-tests) \
+ $(usex multiple-users "--with-default-user=" "" "gnt-daemons" "") \
+ $(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" "") \
+ $(usex multiple-users "--with-default-group=" "" "gnt-daemons" "") \
+ $(usex multiple-users "--with-group-prefix=" "" "${GROUP_PREFIX}" "") \
+ $(use_enable syslog) \
+ $(use_enable monitoring) \
+ $(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \
+ $(usex haskell-daemons "--enable-confd=haskell" '' '' '')
+}
+
+src_install () {
+ emake V=1 DESTDIR="${D}" install || die "emake install failed"
+
+ newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN}
+ newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN}
+
+ if use kvm; then
+ newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
+ newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff
+ fi
+
+ # ganeti installs it's own docs in a generic location
+ rm -rf "${D}"/{usr/share/doc/${PN},run}
+
+ sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" doc/examples/bash_completion
+ newbashcomp doc/examples/bash_completion gnt-instance
+ bashcomp_alias gnt-instance burnin ganeti-{cleaner,confd} \
+ h{space,check,scan,info,ail,arep,roller,squeeze,bal} \
+ gnt-{os,job,filter,debug,storage,group,node,network,backup,cluster}
+
+ dodoc INSTALL UPGRADE NEWS README doc/*.rst
+ dohtml -r doc/html/* doc/css/*.css
+
+ docinto examples
+ dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf
+
+ docinto examples/hooks
+ dodoc doc/examples/hooks/{ipsec,ethers}
+
+ insinto /etc/cron.d
+ newins doc/examples/ganeti.cron ${PN}
+
+ insinto /etc/logrotate.d
+ newins doc/examples/ganeti.logrotate ${PN}
+
+ # need to dodir rather than keepdir here (bug #552482)
+ dodir /var/lib/${PN}
+
+ keepdir /var/log/${PN}/
+ keepdir /usr/share/${PN}/${SERIES}/os/
+ keepdir /var/lib/ganeti-storage/{export,file,shared}/
+
+ dosym ${SERIES} "/usr/share/${PN}/default"
+ dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default"
+
+ python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES}
+}
+
+pkg_postinst() {
+ if use multiple-users; then
+ elog "You have enable multiple user support, the users for this must"
+ elog "be created. You can use the provided tool for this, which is"
+ elog "located at:"
+ elog " /usr/$(get_libdir)/${PN}/tools/users-setup"
+ fi
+}
+
+src_test () {
+ PATH="${S}/scripts:${S}/src:${PATH}" \
+ TMPDIR="/tmp" \
+ GANETI_MASTER="$(hostname -f)" \
+ emake check || die "emake check failed"
+}
diff --git a/app-emulation/ganeti/metadata.xml b/app-emulation/ganeti/metadata.xml
index aed23d1..e517e17 100644
--- a/app-emulation/ganeti/metadata.xml
+++ b/app-emulation/ganeti/metadata.xml
@@ -27,7 +27,7 @@
<flag name='htools'>Enable htools support</flag>
<flag name='kvm'>Enable KVM support</flag>
<flag name='lxc'>Enable Linux Countainers support</flag>
- <flag name='multiple-users'>Enable support for running VMs as different users.</flag>
+ <flag name='multiple-users'>Enable support for running VMs as different users</flag>
<flag name='monitoring'>Enable the ganeti monitoring daemon</flag>
<flag name='rbd'>Enable rados block device support via sys-cluster/ceph</flag>
<flag name='xen'>Enable Xen support</flag>
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2020-08-05 1:07 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-05 1:07 [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/files/, app-emulation/ganeti/ Patrick McLean
-- strict thread matches above, loose matches on Subject: below --
2019-02-07 19:51 Patrick McLean
2018-09-08 0:29 Patrick McLean
2017-01-07 0:37 Robin H. Johnson
2017-01-05 19:58 Robin H. Johnson
2016-05-25 4:05 Patrick McLean
2016-04-05 23:18 Patrick McLean
2016-04-05 18:42 Patrick McLean
2016-04-01 23:57 Patrick McLean
2015-11-19 2:33 Patrick McLean
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox