diff options
author | Michał Górny <mgorny@gentoo.org> | 2019-09-11 13:23:11 +0200 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2019-09-11 18:18:21 +0200 |
commit | c8f97227ae930bbf1076764a8ca994ab6aca3a7b (patch) | |
tree | ee89062ffd3aa6e1d73c0895c9c0322637bca02d /app-emulation/ganeti-instance-image | |
parent | app-dicts/myspell-nl: Drop old (diff) | |
download | gentoo-c8f97227ae930bbf1076764a8ca994ab6aca3a7b.tar.gz gentoo-c8f97227ae930bbf1076764a8ca994ab6aca3a7b.tar.bz2 gentoo-c8f97227ae930bbf1076764a8ca994ab6aca3a7b.zip |
app-emulation/ganeti-instance-image: Drop old
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'app-emulation/ganeti-instance-image')
-rw-r--r-- | app-emulation/ganeti-instance-image/files/ganeti-2.15.2-os-image-common_sh.patch | 43 | ||||
-rw-r--r-- | app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r1.ebuild | 52 |
2 files changed, 0 insertions, 95 deletions
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 deleted file mode 100644 index 73e7ab8a923d..000000000000 --- a/app-emulation/ganeti-instance-image/files/ganeti-2.15.2-os-image-common_sh.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- a/common.sh.in 2018-09-05 23:23:07.811528673 +0000 -+++ b/common.sh.in 2018-09-06 00:10:36.993693654 +0000 -@@ -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 deleted file mode 100644 index 6d10cc0ad0dd..000000000000 --- a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} == "9999" ]]; 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} == "9999" ]]; 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} -} |