From 286cfe362aa67c2bf3810cc80a44a72c81ffe3ae Mon Sep 17 00:00:00 2001 From: Horea Christian Date: Sat, 26 Oct 2019 18:03:16 +0200 Subject: [PATCH] app-misc/gebuilder: included tests and more USE Package-Manager: Portage-2.3.77, Repoman-2.3.17 Signed-off-by: Horea Christian --- app-misc/gebuilder/ChangeLog | 3 ++ app-misc/gebuilder/gebuilder-9999.ebuild | 47 +++++++++++++++++------- app-misc/gebuilder/metadata.xml | 5 ++- 3 files changed, 39 insertions(+), 16 deletions(-) diff --git a/app-misc/gebuilder/ChangeLog b/app-misc/gebuilder/ChangeLog index 2f25baf..53a35db 100644 --- a/app-misc/gebuilder/ChangeLog +++ b/app-misc/gebuilder/ChangeLog @@ -1,3 +1,6 @@ + 26 Oct 2019; gebuilder-9999.ebuild, metadata.xml: + app-misc/gebuilder: included tests and more USE + 28 Feb 2019; Horea Christian +files/gebuilder_global_update: app-misc/gebuilder: added update file diff --git a/app-misc/gebuilder/gebuilder-9999.ebuild b/app-misc/gebuilder/gebuilder-9999.ebuild index 6bd7985..24f7664 100644 --- a/app-misc/gebuilder/gebuilder-9999.ebuild +++ b/app-misc/gebuilder/gebuilder-9999.ebuild @@ -13,11 +13,10 @@ EGIT_REPO_URI="https://github.com/IBT-FMI/gebuilder.git" LICENSE="GPL-3" SLOT="0" KEYWORDS="" -IUSE="autoupdate btrfs docker" +IUSE="autoupdate btrfs -docker -openstack test" -DEPEND=" +COMMON_DEPEND=" >=app-shells/bash-4.2:* - dev-python/python-glanceclient net-misc/rsync sys-apps/portage sys-apps/util-linux @@ -25,25 +24,45 @@ DEPEND=" sys-fs/duperemove sys-kernel/dracut " -RDEPEND="${DEPEND} +DEPEND="${COMMON_DEPEND} + sys-devel/m4 +" +RDEPEND="${COMMON_DEPEND} sys-process/lsof - docker? ( >=app-emulation/docker-18.05.0 ) - btrfs? ( sys-fs/btrfs-progs ) autoupdate? ( virtual/cron ) + btrfs? ( sys-fs/btrfs-progs ) + docker? ( >=app-emulation/docker-18.05.0 ) + openstack? ( dev-python/python-glanceclient ) " -src_install() { - cd gebuilder || die - insinto /usr/share/gebuilder - doins -r utils config - exeinto /usr/bin - doexe gebuild - insopts "-m0755" - doins -r example_hooks exec.sh scripts +src_prepare(){ + if use !docker; then + rm -rf gebuilder/scripts/*docker* || die + rm gebuilder/tests/*docker* || die + fi + if use !openstack; then + rm -rf gebuilder/scripts/*openstack* || die + rm gebuilder/tests/*openstack* || die + fi + default +} +src_compile(){ + emake +} + +src_install() { + default if use autoupdate; then einfo "Installing weekly cron job:" insinto /etc/cron.weekly doins "${FILESDIR}/gebuilder_global_update" fi } + +src_test() { + TMPDIR="${WORKDIR}/test_results" + mkdir ${TMPDIR} + cd gebuilder + ./tests.sh || die +} diff --git a/app-misc/gebuilder/metadata.xml b/app-misc/gebuilder/metadata.xml index 9791f6a..6264ad2 100644 --- a/app-misc/gebuilder/metadata.xml +++ b/app-misc/gebuilder/metadata.xml @@ -12,9 +12,10 @@ Configures the system to auto-update existing images. - Enable support for btrfs filesystem formatting + Enable support for btrfs filesystem formatting (saves space for many images). - Ensure prerequisites for Docker scripts are met. + Docker image generation functionality. + Openstack image generation functionality. IBT-FMI/gebuilder