[gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti-instance-image/

[Andreas Sturmlechner]

commit: d3abb4c0a4050cfaa2d8d4b6c06b6b0b59255c14
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue May 19 18:36:57 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue May 19 19:00:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3abb4c0

app-emulation/ganeti-instance-image: Drop 0.6 (r0), EAPI4--

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../ganeti-instance-image-0.6.ebuild   | 49 --
 1 file changed, 49 deletions(-)

diff --git 
a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild 
b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild
deleted file mode 100644
index 111a33276b5..000
--- a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-if [[ ${PV} == "" ]]; then
-   EGIT_REPO_URI="git://git.osuosl.org/${PN}.git"
-   EGIT_BRANCH="master"
-   inherit git-2 autotools
-else
-   
SRC_URI="http://ftp.osuosl.org/pub/osl/ganeti-instance-image/${P}.tar.gz;
-fi
-
-DESCRIPTION="Scripts to build out CD or image based VMs using Ganeti"
-HOMEPAGE="http://code.osuosl.org/projects/ganeti-image;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="app-arch/dump
-   >=app-emulation/ganeti-2.0.3
-   app-emulation/qemu
-   sys-apps/util-linux
-   sys-fs/multipath-tools
-   sys-fs/e2fsprogs"
-
-src_prepare() {
-   if [[ ${PV} == "" ]]; then
-   eautoreconf
-   fi
-}
-
-src_configure() {
-   econf --with-default-dir=/etc/ganeti
-}
-
-src_install() {
-   emake DESTDIR="${D}" install
-
-   rm -rf "${D}"/usr/share/doc/${PN}
-   dodoc README.markdown NEWS ChangeLog
-   insinto /etc/ganeti
-   newins defaults ${PN}
-}

[gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti-instance-image/

[Robin H. Johnson]

commit: 40bd864953cd154a2525a07bdca4b83f02d41b77
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Wed Oct 23 21:37:41 2019 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Wed Oct 23 21:39:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40bd8649

app-emulation/ganeti-instance-image: stablize for infra

Stable app-emulation/ganeti-2.15.2-r8 requires a newer version of
app-emulation/ganeti-instance-image to also be stable.

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Robin H. Johnson  gentoo.org>

 app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r2.ebuild 
b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r2.ebuild
index 9e62e96a890..d60896758bb 100644
--- a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r2.ebuild
+++ b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://code.osuosl.org/projects/ganeti-image;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND=""

[gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti-instance-image/

[Patrick McLean]

commit: d2069f8befb036f13a2f366b33615952483973e9
Author: Patrick McLean  sony  com>
AuthorDate: Fri Jun 14 20:12:33 2019 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Fri Jun 14 20:12:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2069f8b

app-emulation/ganeti-instance-image: Revbump to 0.6-r2 (bug #687974)

Drop patch that was added in 0.6-r1.

Closes: https://bugs.gentoo.org/687974
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Patrick McLean  gentoo.org>

 .../ganeti-instance-image-0.6-r2.ebuild| 48 ++
 1 file changed, 48 insertions(+)

diff --git 
a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r2.ebuild 
b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r2.ebuild
new file mode 100644
index 000..9e62e96a890
--- /dev/null
+++ b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == "" ]]; then
+   EGIT_REPO_URI="git://git.osuosl.org/${PN}.git"
+   EGIT_BRANCH="master"
+   inherit git-r3 autotools
+else
+   
SRC_URI="http://ftp.osuosl.org/pub/osl/ganeti-instance-image/${P}.tar.gz;
+fi
+
+DESCRIPTION="Scripts to build out CD or image based VMs using Ganeti"
+HOMEPAGE="http://code.osuosl.org/projects/ganeti-image;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-arch/dump
+   >=app-emulation/ganeti-2.15.2-r7
+   app-emulation/qemu
+   sys-apps/util-linux
+   sys-fs/multipath-tools
+   sys-fs/e2fsprogs"
+
+src_prepare() {
+   default
+   if [[ ${PV} == "" ]]; then
+   eautoreconf
+   fi
+}
+
+src_configure() {
+   econf --with-default-dir=/etc/ganeti
+}
+
+src_install() {
+   emake DESTDIR="${D}" install || die "install failed"
+
+   rm -rf "${D}"/usr/share/doc/${PN}
+   dodoc README.markdown NEWS ChangeLog
+   insinto /etc/ganeti
+   newins defaults ${PN}
+}

[gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti-instance-image/, app-emulation/ganeti-instance-image/files/

[Patrick McLean]

commit: 0d5f74dae35cfefae3c75c5c12878c09d784555c
Author: Patrick McLean  gentoo  org>
AuthorDate: Sat Sep  8 00:26:05 2018 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Sat Sep  8 00:29:04 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d5f74da

app-emulation/ganeti-instance-image: Revision bump, add patch to fix with new 
lvm2

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 .../files/ganeti-2.15.2-os-image-common_sh.patch   | 43 ++
 .../ganeti-instance-image-0.6-r1.ebuild| 52 ++
 2 files changed, 95 insertions(+)

diff --git 
a/app-emulation/ganeti-instance-image/files/ganeti-2.15.2-os-image-common_sh.patch
 
b/app-emulation/ganeti-instance-image/files/ganeti-2.15.2-os-image-common_sh.patch
new file mode 100644
index 000..73e7ab8a923
--- /dev/null
+++ 
b/app-emulation/ganeti-instance-image/files/ganeti-2.15.2-os-image-common_sh.patch
@@ -0,0 +1,43 @@
+--- a/common.sh.in2018-09-05 23:23:07.811528673 +
 b/common.sh.in2018-09-06 00:10:36.993693654 +
+@@ -284,13 +284,13 @@
+ blockdev="$1"
+ filesystem_dev_base=`$KPARTX -l -p- $blockdev | \
+ grep -m 1 -- "-1.*$blockdev" | \
+-$AWK '{print $1}'`
++$AWK '{print $1}' | sed -r -e 
's/-([0-9]{1,2})$/p\1/g'`
+ if [ -z "$filesystem_dev_base" ]; then
+ log_error "Cannot interpret kpartx output and get partition mapping"
+ exit 1
+ fi
+ $KPARTX -a -p- $blockdev > /dev/null
+-filesystem_dev="/dev/mapper/${filesystem_dev_base/%-1/}"
++filesystem_dev="/dev/mapper/${filesystem_dev_base/%p1/}"
+ if [ ! -b "/dev/mapper/$filesystem_dev_base" ]; then
+ log_error "Can't find kpartx mapped partition: 
/dev/mapper/$filesystem_dev_base"
+ exit 1
+@@ -302,17 +302,17 @@
+ filesystem_dev="$1"
+ partition="$2"
+ if [ "${SWAP}" = "yes" -a -z "${KERNEL_PATH}" ] ; then
+-boot_dev="${filesystem_dev}-1"
+-swap_dev="${filesystem_dev}-2"
+-root_dev="${filesystem_dev}-3"
++boot_dev="${filesystem_dev}p1"
++swap_dev="${filesystem_dev}p2"
++root_dev="${filesystem_dev}p3"
+ elif [ "${SWAP}" = "no" -a -z "${KERNEL_PATH}" ] ; then
+-boot_dev="${filesystem_dev}-1"
+-root_dev="${filesystem_dev}-2"
++boot_dev="${filesystem_dev}p1"
++root_dev="${filesystem_dev}p2"
+ elif [ "${SWAP}" = "yes" -a -n "${KERNEL_PATH}" ] ; then
+-swap_dev="${filesystem_dev}-1"
++swap_dev="${filesystem_dev}p1"
+ root_dev="${filesystem_dev}-2"
+ elif [ "${SWAP}" = "no" -a -n "${KERNEL_PATH}" ] ; then
+-root_dev="${filesystem_dev}-1"
++root_dev="${filesystem_dev}p1"
+ fi
+ echo "$(eval "echo \${$(echo ${partition}_dev)"})"
+ }

diff --git 
a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r1.ebuild 
b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r1.ebuild
new file mode 100644
index 000..6d10cc0ad0d
--- /dev/null
+++ b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == "" ]]; then
+   EGIT_REPO_URI="git://git.osuosl.org/${PN}.git"
+   EGIT_BRANCH="master"
+   inherit git-r3 autotools
+else
+   
SRC_URI="http://ftp.osuosl.org/pub/osl/ganeti-instance-image/${P}.tar.gz;
+fi
+
+DESCRIPTION="Scripts to build out CD or image based VMs using Ganeti"
+HOMEPAGE="http://code.osuosl.org/projects/ganeti-image;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-arch/dump
+   >=app-emulation/ganeti-2.15.2-r7
+   app-emulation/qemu
+   sys-apps/util-linux
+   sys-fs/multipath-tools
+   sys-fs/e2fsprogs"
+
+PATCHES=(
+   "${FILESDIR}/ganeti-2.15.2-os-image-common_sh.patch"
+)
+
+src_prepare() {
+   default
+   if [[ ${PV} == "" ]]; then
+   eautoreconf
+   fi
+}
+
+src_configure() {
+   econf --with-default-dir=/etc/ganeti
+}
+
+src_install() {
+   emake DESTDIR="${D}" install || die "install failed"
+
+   rm -rf "${D}"/usr/share/doc/${PN}
+   dodoc README.markdown NEWS ChangeLog
+   insinto /etc/ganeti
+   newins defaults ${PN}
+}

[gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti-instance-image/

[Michał Górny]

commit: 36cf90c76fb621f95481c46135c5eb6d7ba916e5
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Oct  4 07:19:32 2017 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Oct  4 07:47:28 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36cf90c7

app-emulation/ganeti-instance-image: Strip empty metadata.xml elements

 app-emulation/ganeti-instance-image/metadata.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app-emulation/ganeti-instance-image/metadata.xml 
b/app-emulation/ganeti-instance-image/metadata.xml
index 2dc1ff32d41..7a38bb90096 100644
--- a/app-emulation/ganeti-instance-image/metadata.xml
+++ b/app-emulation/ganeti-instance-image/metadata.xml
@@ -2,6 +2,4 @@
 http://www.gentoo.org/dtd/metadata.dtd;>
 

-   
-   
 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti-instance-image/

[Mike Frysinger]

commit: f5414e9e7f2cda1ec45d4de33dc31c9ba1f94e35
Author: Mike Frysinger  gentoo  org>
AuthorDate: Sat Oct 10 18:13:06 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Sat Oct 10 18:22:51 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5414e9e

app-emulation/ganeti-instance-image: drop old coreutils/mktemp dep

Since coreutils has provided mktemp for many years now, we can drop this.

 app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git 
a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild 
b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild
index 589eafa..c6f28fb 100644
--- a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild
+++ b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild
@@ -25,7 +25,6 @@ IUSE=""
 DEPEND=""
 RDEPEND="app-arch/dump
>=app-emulation/ganeti-2.0.3
-   || ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp )
app-emulation/qemu
sys-apps/util-linux
sys-fs/multipath-tools