From nobody Mon Feb 9 12:15:29 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1565949021; cv=none; d=zoho.com; s=zohoarc; b=Kq0usI4tiRm7snSQAcr5052AxWFGVkcVOevtlr4OFj78P+dqgqwYBjR0Z/PSaIQLTgACs/PKtw40JJWR0z7unVgf/7CDjXXSLsTa1dIalTUUJp90ifjV9G9CaHk0QnXC6XE2a1eu7G2j3FBmtzTUKd1kdEJobtT58BE5bNcjsIY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565949021; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=NyRYci46pOMNeJu/aEaRlHuo0GYakwtbewuQd3PrH8U=; b=jIaRzwZbjQFshxPwZJvXuw32NZMUlIIRUGKcVkle60Yp6/nB1Y9rJu4hPUYQltLkqc8I2brNYTqFf/vchVutOp3bfusczHSXh3a+h+6Y0PvxCEFJtwnZkTpzYW1mICAYxlvebCIrMYyTfcFXS98IkhDQEB9ksjEyHA1d+/Os4RE= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1565949021311616.3193768043102; Fri, 16 Aug 2019 02:50:21 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A00503090FF4; Fri, 16 Aug 2019 09:50:19 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 781F58CFBD; Fri, 16 Aug 2019 09:50:19 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 3502C2551F; Fri, 16 Aug 2019 09:50:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7G9o3Ad019741 for ; Fri, 16 Aug 2019 05:50:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id AC6838261E; Fri, 16 Aug 2019 09:50:03 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.73]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3631983BAA for ; Fri, 16 Aug 2019 09:50:00 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 16 Aug 2019 11:49:47 +0200 Message-Id: <20190816094954.30096-4-abologna@redhat.com> In-Reply-To: <20190816094954.30096-1-abologna@redhat.com> References: <20190816094954.30096-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 03/10] ci: Move everything to a separate directory X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Fri, 16 Aug 2019 09:50:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" We're going to have a few more CI-related files in a second, and it makes sense to have a separate directory for them rather than littering the root directory. $(CI_SCRATCHDIR) can now also be created inside the CI directory, and as a bonus the make rune necessary to start CI builds without running configure first becomes shorter. Signed-off-by: Andrea Bolognani --- .gitignore | 2 +- .travis.yml | 8 ++++---- Makefile.am | 4 ++-- Makefile.ci =3D> ci/Makefile | 17 ++++++++--------- 4 files changed, 15 insertions(+), 16 deletions(-) rename Makefile.ci =3D> ci/Makefile (96%) diff --git a/.gitignore b/.gitignore index dd5d35c762..82495e8692 100644 --- a/.gitignore +++ b/.gitignore @@ -44,7 +44,7 @@ /autom4te.cache /build-aux/* /build/ -/ci-tree/ +/ci/scratch/ /confdefs.h /config.cache /config.guess diff --git a/.travis.yml b/.travis.yml index b510c81083..db573fd496 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,28 +22,28 @@ matrix: - IMAGE=3D"ubuntu-18" - MAKE_ARGS=3D"syntax-check distcheck" script: - - make -f Makefile.ci ci-build@$IMAGE CI_MAKE_ARGS=3D"$MAKE_ARGS" + - make -C ci/ ci-build@$IMAGE CI_MAKE_ARGS=3D"$MAKE_ARGS" - services: - docker env: - IMAGE=3D"centos-7" - MAKE_ARGS=3D"syntax-check distcheck" script: - - make -f Makefile.ci ci-build@$IMAGE CI_MAKE_ARGS=3D"$MAKE_ARGS" + - make -C ci/ ci-build@$IMAGE CI_MAKE_ARGS=3D"$MAKE_ARGS" - services: - docker env: - IMAGE=3D"fedora-rawhide" - MINGW=3D"mingw32" script: - - make -f Makefile.ci ci-build@$IMAGE CI_CONFIGURE=3D"$MINGW-confi= gure" + - make -C ci/ ci-build@$IMAGE CI_CONFIGURE=3D"$MINGW-configure" - services: - docker env: - IMAGE=3D"fedora-rawhide" - MINGW=3D"mingw64" script: - - make -f Makefile.ci ci-build@$IMAGE CI_CONFIGURE=3D"$MINGW-confi= gure" + - make -C ci/ ci-build@$IMAGE CI_CONFIGURE=3D"$MINGW-configure" - compiler: clang language: c os: osx diff --git a/Makefile.am b/Makefile.am index 27c49280c4..b743b4b08b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,7 +35,6 @@ EXTRA_DIST =3D \ libvirt-qemu.pc.in \ libvirt-lxc.pc.in \ libvirt-admin.pc.in \ - Makefile.ci \ Makefile.nonreentrant \ autogen.sh \ cfg.mk \ @@ -51,6 +50,7 @@ EXTRA_DIST =3D \ build-aux/prohibit-duplicate-header.pl \ build-aux/useless-if-before-free \ build-aux/vc-list-files \ + ci/Makefile \ $(NULL) =20 pkgconfigdir =3D $(libdir)/pkgconfig @@ -123,4 +123,4 @@ gen-AUTHORS: fi =20 ci-%: - $(MAKE) -f Makefile.ci $@ + $(MAKE) -C ci/ $@ diff --git a/Makefile.ci b/ci/Makefile similarity index 96% rename from Makefile.ci rename to ci/Makefile index 86e936aef8..350eb636cd 100644 --- a/Makefile.ci +++ b/ci/Makefile @@ -1,16 +1,15 @@ # -*- makefile -*- # vim: filetype=3Dmake =20 -# Figure out name and path to this file. This isn't -# portable but we only care for modern GNU make -CI_MAKEFILE =3D $(abspath $(firstword $(MAKEFILE_LIST))) +# The root directory of the libvirt.git checkout +CI_GIT_ROOT =3D $(shell git rev-parse --show-toplevel) + +# The root directory for all CI-related contents +CI_ROOTDIR =3D $(CI_GIT_ROOT)/ci =20 # The directory holding content on the host that we will # expose to the container. -CI_SCRATCHDIR =3D $(shell pwd)/ci-tree - -# The root directory of the libvirt.git checkout -CI_GIT_ROOT =3D $(shell git rev-parse --show-toplevel) +CI_SCRATCHDIR =3D $(CI_ROOTDIR)/scratch =20 # The directory holding the clone of the git repo that # we will expose to the container @@ -178,7 +177,7 @@ ci-prepare-tree: ci-check-engine cp /etc/group $(CI_SCRATCHDIR); \ echo "Cloning $(CI_GIT_ROOT) to $(CI_HOST_SRCDIR)"; \ git clone $(CI_GIT_ARGS) $(CI_GIT_ROOT) $(CI_HOST_SRCDIR) || exit 1; \ - for mod in $$(git submodule | awk '{ print $$2 }') ; \ + for mod in $$(git submodule | awk '{ print $$2 }' | sed -E 's,^../,,g') = ; \ do \ test -f $(CI_GIT_ROOT)/$$mod/.git || continue ; \ echo "Cloning $(CI_GIT_ROOT)/$$mod to $(CI_HOST_SRCDIR)/$$mod"; \ @@ -221,7 +220,7 @@ ci-build@%: ci-prepare-tree @test "$(CI_CLEAN)" =3D "1" && rm -rf $(CI_SCRATCHDIR) || : =20 ci-check@%: - $(MAKE) -f $(CI_MAKEFILE) ci-build@$* CI_MAKE_ARGS=3D"check" + $(MAKE) -C $(CI_ROOTDIR) ci-build@$* CI_MAKE_ARGS=3D"check" =20 ci-shell@%: ci-prepare-tree $(CI_ENGINE) run $(CI_ENGINE_ARGS) $(CI_IMAGE_PREFIX)$*$(CI_IMAGE_TAG) /b= in/bash --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list