From nobody Tue Feb 10 01:59:34 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=1564579819; cv=none; d=zoho.com; s=zohoarc; b=UppbSzGaiiNH08siMaFHn9ABmY/E4c6kS0Bh81BA9ZyTjap0MArTBb5R15hYF6fau5FSvIMMUt0GODCFO5vipT9Qj9Apqk6xKDoUKq22gcFbOAEZG9NdsyvBHbJNXw9SBYC2eMIQfN6ygKRJ6H/ebijyorQdWEld7FzJ9f2/3Qw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564579819; h=Content-Type:Content-Transfer-Encoding:Cc: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=h9j6gDkDtUEg3BtTMe6RY65o5Te6A8dTk0uA3K98gVc=; b=V6sltZYpfpc/7VPvx+k0vIAkfTeUFtjhNX05HtJixh0Ca0POCTrKXlxXIfqvbObpH5kvbPGwXW/VwQEZ2UcV5IBIaLWdssHUZS9NuPIOFaxbfbUirBHLhe10POLz9wTEF4oGV1GKHPvqSnuXxaoTWOOF27pVLvzdAWEKUJl++kI= 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 1564579819602388.4677619060444; Wed, 31 Jul 2019 06:30:19 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CEAD13091D55; Wed, 31 Jul 2019 13:30:17 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8924719D7E; Wed, 31 Jul 2019 13:30:17 +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 306EC180BA9A; Wed, 31 Jul 2019 13:30:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x6VDU6p4020359 for ; Wed, 31 Jul 2019 09:30:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id A7F3960605; Wed, 31 Jul 2019 13:30:06 +0000 (UTC) Received: from laerte.brq.redhat.com (unknown [10.43.2.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id D10A460852; Wed, 31 Jul 2019 13:30:05 +0000 (UTC) From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= To: libvir-list@redhat.com Date: Wed, 31 Jul 2019 15:29:55 +0200 Message-Id: <20190731132957.3169-3-fidencio@redhat.com> In-Reply-To: <20190731132957.3169-1-fidencio@redhat.com> References: <20190731132957.3169-1-fidencio@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Subject: [libvirt] [dockerfiles PATCH v2 2/4] refresh: Learn how to deal with the project's name 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Wed, 31 Jul 2019 13:30:18 +0000 (UTC) Let's change the refresh script in order to take into consideration Dockerfiles containing the project's name. This is needed in order to add different projects to libvirt-dockerfiles. An important change that deservers a mention here is that the PROJECTS variable, part of Dockerfile class, has been added as a dictionary of dictionaries as it has to store subprojects tied to a project, and each of those subprojects may or may not be subject of a mingw build (although this is not the case yet for libvirt, it may be for a other projects, osinfo-db being one of them. Together with this change, let's rename all the existent Dockerfiles to mention their projects. So, 'buildenv-centos-7.Dockerfile' has been renamed to 'buildenv-libvirt-centos-7.Dockerfile', for instance. Signed-off-by: Fabiano Fid=C3=AAncio --- ...le =3D> buildenv-libvirt-centos-7.Dockerfile | 0 ...libvirt-debian-10-cross-aarch64.Dockerfile | 0 ...-libvirt-debian-10-cross-armv6l.Dockerfile | 0 ...-libvirt-debian-10-cross-armv7l.Dockerfile | 0 ...nv-libvirt-debian-10-cross-i686.Dockerfile | 0 ...nv-libvirt-debian-10-cross-mips.Dockerfile | 0 ...ibvirt-debian-10-cross-mips64el.Dockerfile | 0 ...-libvirt-debian-10-cross-mipsel.Dockerfile | 0 ...libvirt-debian-10-cross-ppc64le.Dockerfile | 0 ...v-libvirt-debian-10-cross-s390x.Dockerfile | 0 ...e =3D> buildenv-libvirt-debian-10.Dockerfile | 0 ...-libvirt-debian-9-cross-aarch64.Dockerfile | 0 ...v-libvirt-debian-9-cross-armv6l.Dockerfile | 0 ...v-libvirt-debian-9-cross-armv7l.Dockerfile | 0 ...env-libvirt-debian-9-cross-mips.Dockerfile | 0 ...libvirt-debian-9-cross-mips64el.Dockerfile | 0 ...v-libvirt-debian-9-cross-mipsel.Dockerfile | 0 ...-libvirt-debian-9-cross-ppc64le.Dockerfile | 0 ...nv-libvirt-debian-9-cross-s390x.Dockerfile | 0 ...le =3D> buildenv-libvirt-debian-9.Dockerfile | 0 ...ibvirt-debian-sid-cross-aarch64.Dockerfile | 0 ...libvirt-debian-sid-cross-armv6l.Dockerfile | 0 ...libvirt-debian-sid-cross-armv7l.Dockerfile | 0 ...v-libvirt-debian-sid-cross-i686.Dockerfile | 0 ...v-libvirt-debian-sid-cross-mips.Dockerfile | 0 ...bvirt-debian-sid-cross-mips64el.Dockerfile | 0 ...libvirt-debian-sid-cross-mipsel.Dockerfile | 0 ...ibvirt-debian-sid-cross-ppc64le.Dockerfile | 0 ...-libvirt-debian-sid-cross-s390x.Dockerfile | 0 ... =3D> buildenv-libvirt-debian-sid.Dockerfile | 0 ...e =3D> buildenv-libvirt-fedora-29.Dockerfile | 0 ...e =3D> buildenv-libvirt-fedora-30.Dockerfile | 0 ...buildenv-libvirt-fedora-rawhide.Dockerfile | 0 ...e =3D> buildenv-libvirt-ubuntu-16.Dockerfile | 0 ...e =3D> buildenv-libvirt-ubuntu-18.Dockerfile | 0 refresh | 53 +++++++++++++++---- 36 files changed, 42 insertions(+), 11 deletions(-) rename buildenv-centos-7.Dockerfile =3D> buildenv-libvirt-centos-7.Dockerf= ile (100%) rename buildenv-debian-10-cross-aarch64.Dockerfile =3D> buildenv-libvirt-d= ebian-10-cross-aarch64.Dockerfile (100%) rename buildenv-debian-10-cross-armv6l.Dockerfile =3D> buildenv-libvirt-de= bian-10-cross-armv6l.Dockerfile (100%) rename buildenv-debian-10-cross-armv7l.Dockerfile =3D> buildenv-libvirt-de= bian-10-cross-armv7l.Dockerfile (100%) rename buildenv-debian-10-cross-i686.Dockerfile =3D> buildenv-libvirt-debi= an-10-cross-i686.Dockerfile (100%) rename buildenv-debian-10-cross-mips.Dockerfile =3D> buildenv-libvirt-debi= an-10-cross-mips.Dockerfile (100%) rename buildenv-debian-10-cross-mips64el.Dockerfile =3D> buildenv-libvirt-= debian-10-cross-mips64el.Dockerfile (100%) rename buildenv-debian-10-cross-mipsel.Dockerfile =3D> buildenv-libvirt-de= bian-10-cross-mipsel.Dockerfile (100%) rename buildenv-debian-10-cross-ppc64le.Dockerfile =3D> buildenv-libvirt-d= ebian-10-cross-ppc64le.Dockerfile (100%) rename buildenv-debian-10-cross-s390x.Dockerfile =3D> buildenv-libvirt-deb= ian-10-cross-s390x.Dockerfile (100%) rename buildenv-debian-10.Dockerfile =3D> buildenv-libvirt-debian-10.Docke= rfile (100%) rename buildenv-debian-9-cross-aarch64.Dockerfile =3D> buildenv-libvirt-de= bian-9-cross-aarch64.Dockerfile (100%) rename buildenv-debian-9-cross-armv6l.Dockerfile =3D> buildenv-libvirt-deb= ian-9-cross-armv6l.Dockerfile (100%) rename buildenv-debian-9-cross-armv7l.Dockerfile =3D> buildenv-libvirt-deb= ian-9-cross-armv7l.Dockerfile (100%) rename buildenv-debian-9-cross-mips.Dockerfile =3D> buildenv-libvirt-debia= n-9-cross-mips.Dockerfile (100%) rename buildenv-debian-9-cross-mips64el.Dockerfile =3D> buildenv-libvirt-d= ebian-9-cross-mips64el.Dockerfile (100%) rename buildenv-debian-9-cross-mipsel.Dockerfile =3D> buildenv-libvirt-deb= ian-9-cross-mipsel.Dockerfile (100%) rename buildenv-debian-9-cross-ppc64le.Dockerfile =3D> buildenv-libvirt-de= bian-9-cross-ppc64le.Dockerfile (100%) rename buildenv-debian-9-cross-s390x.Dockerfile =3D> buildenv-libvirt-debi= an-9-cross-s390x.Dockerfile (100%) rename buildenv-debian-9.Dockerfile =3D> buildenv-libvirt-debian-9.Dockerf= ile (100%) rename buildenv-debian-sid-cross-aarch64.Dockerfile =3D> buildenv-libvirt-= debian-sid-cross-aarch64.Dockerfile (100%) rename buildenv-debian-sid-cross-armv6l.Dockerfile =3D> buildenv-libvirt-d= ebian-sid-cross-armv6l.Dockerfile (100%) rename buildenv-debian-sid-cross-armv7l.Dockerfile =3D> buildenv-libvirt-d= ebian-sid-cross-armv7l.Dockerfile (100%) rename buildenv-debian-sid-cross-i686.Dockerfile =3D> buildenv-libvirt-deb= ian-sid-cross-i686.Dockerfile (100%) rename buildenv-debian-sid-cross-mips.Dockerfile =3D> buildenv-libvirt-deb= ian-sid-cross-mips.Dockerfile (100%) rename buildenv-debian-sid-cross-mips64el.Dockerfile =3D> buildenv-libvirt= -debian-sid-cross-mips64el.Dockerfile (100%) rename buildenv-debian-sid-cross-mipsel.Dockerfile =3D> buildenv-libvirt-d= ebian-sid-cross-mipsel.Dockerfile (100%) rename buildenv-debian-sid-cross-ppc64le.Dockerfile =3D> buildenv-libvirt-= debian-sid-cross-ppc64le.Dockerfile (100%) rename buildenv-debian-sid-cross-s390x.Dockerfile =3D> buildenv-libvirt-de= bian-sid-cross-s390x.Dockerfile (100%) rename buildenv-debian-sid.Dockerfile =3D> buildenv-libvirt-debian-sid.Doc= kerfile (100%) rename buildenv-fedora-29.Dockerfile =3D> buildenv-libvirt-fedora-29.Docke= rfile (100%) rename buildenv-fedora-30.Dockerfile =3D> buildenv-libvirt-fedora-30.Docke= rfile (100%) rename buildenv-fedora-rawhide.Dockerfile =3D> buildenv-libvirt-fedora-raw= hide.Dockerfile (100%) rename buildenv-ubuntu-16.Dockerfile =3D> buildenv-libvirt-ubuntu-16.Docke= rfile (100%) rename buildenv-ubuntu-18.Dockerfile =3D> buildenv-libvirt-ubuntu-18.Docke= rfile (100%) diff --git a/buildenv-centos-7.Dockerfile b/buildenv-libvirt-centos-7.Docke= rfile similarity index 100% rename from buildenv-centos-7.Dockerfile rename to buildenv-libvirt-centos-7.Dockerfile diff --git a/buildenv-debian-10-cross-aarch64.Dockerfile b/buildenv-libvirt= -debian-10-cross-aarch64.Dockerfile similarity index 100% rename from buildenv-debian-10-cross-aarch64.Dockerfile rename to buildenv-libvirt-debian-10-cross-aarch64.Dockerfile diff --git a/buildenv-debian-10-cross-armv6l.Dockerfile b/buildenv-libvirt-= debian-10-cross-armv6l.Dockerfile similarity index 100% rename from buildenv-debian-10-cross-armv6l.Dockerfile rename to buildenv-libvirt-debian-10-cross-armv6l.Dockerfile diff --git a/buildenv-debian-10-cross-armv7l.Dockerfile b/buildenv-libvirt-= debian-10-cross-armv7l.Dockerfile similarity index 100% rename from buildenv-debian-10-cross-armv7l.Dockerfile rename to buildenv-libvirt-debian-10-cross-armv7l.Dockerfile diff --git a/buildenv-debian-10-cross-i686.Dockerfile b/buildenv-libvirt-de= bian-10-cross-i686.Dockerfile similarity index 100% rename from buildenv-debian-10-cross-i686.Dockerfile rename to buildenv-libvirt-debian-10-cross-i686.Dockerfile diff --git a/buildenv-debian-10-cross-mips.Dockerfile b/buildenv-libvirt-de= bian-10-cross-mips.Dockerfile similarity index 100% rename from buildenv-debian-10-cross-mips.Dockerfile rename to buildenv-libvirt-debian-10-cross-mips.Dockerfile diff --git a/buildenv-debian-10-cross-mips64el.Dockerfile b/buildenv-libvir= t-debian-10-cross-mips64el.Dockerfile similarity index 100% rename from buildenv-debian-10-cross-mips64el.Dockerfile rename to buildenv-libvirt-debian-10-cross-mips64el.Dockerfile diff --git a/buildenv-debian-10-cross-mipsel.Dockerfile b/buildenv-libvirt-= debian-10-cross-mipsel.Dockerfile similarity index 100% rename from buildenv-debian-10-cross-mipsel.Dockerfile rename to buildenv-libvirt-debian-10-cross-mipsel.Dockerfile diff --git a/buildenv-debian-10-cross-ppc64le.Dockerfile b/buildenv-libvirt= -debian-10-cross-ppc64le.Dockerfile similarity index 100% rename from buildenv-debian-10-cross-ppc64le.Dockerfile rename to buildenv-libvirt-debian-10-cross-ppc64le.Dockerfile diff --git a/buildenv-debian-10-cross-s390x.Dockerfile b/buildenv-libvirt-d= ebian-10-cross-s390x.Dockerfile similarity index 100% rename from buildenv-debian-10-cross-s390x.Dockerfile rename to buildenv-libvirt-debian-10-cross-s390x.Dockerfile diff --git a/buildenv-debian-10.Dockerfile b/buildenv-libvirt-debian-10.Doc= kerfile similarity index 100% rename from buildenv-debian-10.Dockerfile rename to buildenv-libvirt-debian-10.Dockerfile diff --git a/buildenv-debian-9-cross-aarch64.Dockerfile b/buildenv-libvirt-= debian-9-cross-aarch64.Dockerfile similarity index 100% rename from buildenv-debian-9-cross-aarch64.Dockerfile rename to buildenv-libvirt-debian-9-cross-aarch64.Dockerfile diff --git a/buildenv-debian-9-cross-armv6l.Dockerfile b/buildenv-libvirt-d= ebian-9-cross-armv6l.Dockerfile similarity index 100% rename from buildenv-debian-9-cross-armv6l.Dockerfile rename to buildenv-libvirt-debian-9-cross-armv6l.Dockerfile diff --git a/buildenv-debian-9-cross-armv7l.Dockerfile b/buildenv-libvirt-d= ebian-9-cross-armv7l.Dockerfile similarity index 100% rename from buildenv-debian-9-cross-armv7l.Dockerfile rename to buildenv-libvirt-debian-9-cross-armv7l.Dockerfile diff --git a/buildenv-debian-9-cross-mips.Dockerfile b/buildenv-libvirt-deb= ian-9-cross-mips.Dockerfile similarity index 100% rename from buildenv-debian-9-cross-mips.Dockerfile rename to buildenv-libvirt-debian-9-cross-mips.Dockerfile diff --git a/buildenv-debian-9-cross-mips64el.Dockerfile b/buildenv-libvirt= -debian-9-cross-mips64el.Dockerfile similarity index 100% rename from buildenv-debian-9-cross-mips64el.Dockerfile rename to buildenv-libvirt-debian-9-cross-mips64el.Dockerfile diff --git a/buildenv-debian-9-cross-mipsel.Dockerfile b/buildenv-libvirt-d= ebian-9-cross-mipsel.Dockerfile similarity index 100% rename from buildenv-debian-9-cross-mipsel.Dockerfile rename to buildenv-libvirt-debian-9-cross-mipsel.Dockerfile diff --git a/buildenv-debian-9-cross-ppc64le.Dockerfile b/buildenv-libvirt-= debian-9-cross-ppc64le.Dockerfile similarity index 100% rename from buildenv-debian-9-cross-ppc64le.Dockerfile rename to buildenv-libvirt-debian-9-cross-ppc64le.Dockerfile diff --git a/buildenv-debian-9-cross-s390x.Dockerfile b/buildenv-libvirt-de= bian-9-cross-s390x.Dockerfile similarity index 100% rename from buildenv-debian-9-cross-s390x.Dockerfile rename to buildenv-libvirt-debian-9-cross-s390x.Dockerfile diff --git a/buildenv-debian-9.Dockerfile b/buildenv-libvirt-debian-9.Docke= rfile similarity index 100% rename from buildenv-debian-9.Dockerfile rename to buildenv-libvirt-debian-9.Dockerfile diff --git a/buildenv-debian-sid-cross-aarch64.Dockerfile b/buildenv-libvir= t-debian-sid-cross-aarch64.Dockerfile similarity index 100% rename from buildenv-debian-sid-cross-aarch64.Dockerfile rename to buildenv-libvirt-debian-sid-cross-aarch64.Dockerfile diff --git a/buildenv-debian-sid-cross-armv6l.Dockerfile b/buildenv-libvirt= -debian-sid-cross-armv6l.Dockerfile similarity index 100% rename from buildenv-debian-sid-cross-armv6l.Dockerfile rename to buildenv-libvirt-debian-sid-cross-armv6l.Dockerfile diff --git a/buildenv-debian-sid-cross-armv7l.Dockerfile b/buildenv-libvirt= -debian-sid-cross-armv7l.Dockerfile similarity index 100% rename from buildenv-debian-sid-cross-armv7l.Dockerfile rename to buildenv-libvirt-debian-sid-cross-armv7l.Dockerfile diff --git a/buildenv-debian-sid-cross-i686.Dockerfile b/buildenv-libvirt-d= ebian-sid-cross-i686.Dockerfile similarity index 100% rename from buildenv-debian-sid-cross-i686.Dockerfile rename to buildenv-libvirt-debian-sid-cross-i686.Dockerfile diff --git a/buildenv-debian-sid-cross-mips.Dockerfile b/buildenv-libvirt-d= ebian-sid-cross-mips.Dockerfile similarity index 100% rename from buildenv-debian-sid-cross-mips.Dockerfile rename to buildenv-libvirt-debian-sid-cross-mips.Dockerfile diff --git a/buildenv-debian-sid-cross-mips64el.Dockerfile b/buildenv-libvi= rt-debian-sid-cross-mips64el.Dockerfile similarity index 100% rename from buildenv-debian-sid-cross-mips64el.Dockerfile rename to buildenv-libvirt-debian-sid-cross-mips64el.Dockerfile diff --git a/buildenv-debian-sid-cross-mipsel.Dockerfile b/buildenv-libvirt= -debian-sid-cross-mipsel.Dockerfile similarity index 100% rename from buildenv-debian-sid-cross-mipsel.Dockerfile rename to buildenv-libvirt-debian-sid-cross-mipsel.Dockerfile diff --git a/buildenv-debian-sid-cross-ppc64le.Dockerfile b/buildenv-libvir= t-debian-sid-cross-ppc64le.Dockerfile similarity index 100% rename from buildenv-debian-sid-cross-ppc64le.Dockerfile rename to buildenv-libvirt-debian-sid-cross-ppc64le.Dockerfile diff --git a/buildenv-debian-sid-cross-s390x.Dockerfile b/buildenv-libvirt-= debian-sid-cross-s390x.Dockerfile similarity index 100% rename from buildenv-debian-sid-cross-s390x.Dockerfile rename to buildenv-libvirt-debian-sid-cross-s390x.Dockerfile diff --git a/buildenv-debian-sid.Dockerfile b/buildenv-libvirt-debian-sid.D= ockerfile similarity index 100% rename from buildenv-debian-sid.Dockerfile rename to buildenv-libvirt-debian-sid.Dockerfile diff --git a/buildenv-fedora-29.Dockerfile b/buildenv-libvirt-fedora-29.Doc= kerfile similarity index 100% rename from buildenv-fedora-29.Dockerfile rename to buildenv-libvirt-fedora-29.Dockerfile diff --git a/buildenv-fedora-30.Dockerfile b/buildenv-libvirt-fedora-30.Doc= kerfile similarity index 100% rename from buildenv-fedora-30.Dockerfile rename to buildenv-libvirt-fedora-30.Dockerfile diff --git a/buildenv-fedora-rawhide.Dockerfile b/buildenv-libvirt-fedora-r= awhide.Dockerfile similarity index 100% rename from buildenv-fedora-rawhide.Dockerfile rename to buildenv-libvirt-fedora-rawhide.Dockerfile diff --git a/buildenv-ubuntu-16.Dockerfile b/buildenv-libvirt-ubuntu-16.Doc= kerfile similarity index 100% rename from buildenv-ubuntu-16.Dockerfile rename to buildenv-libvirt-ubuntu-16.Dockerfile diff --git a/buildenv-ubuntu-18.Dockerfile b/buildenv-libvirt-ubuntu-18.Doc= kerfile similarity index 100% rename from buildenv-ubuntu-18.Dockerfile rename to buildenv-libvirt-ubuntu-18.Dockerfile diff --git a/refresh b/refresh index aa056af..4dd4382 100755 --- a/refresh +++ b/refresh @@ -31,6 +31,19 @@ class Dockerfile: CROSS =3D "-cross-" SUFFIX =3D ".Dockerfile" =20 + # PROJECTS is a dictionary of dictionaries. + # The key is the project name, as present in the Dockerfile name and + # the value is a dictionary containing the subprojects which the + # dependencies should be installed together as the key and their value + # being whether they support mingw builds or not. + # This hack is needed till the moment libvirt-jenkins-ci treats mingw + # builds in the very same way as cross-builds are treated. + PROJECTS =3D { + "libvirt" : { + "libvirt" : True + }, + } + def __init__(self, path): =20 # Files that don't end with the expected suffix can be safely @@ -44,26 +57,44 @@ class Dockerfile: =20 self.path =3D path stem =3D path.stem[len(Dockerfile.PREFIX):] + + self.projects =3D [] + + for project in Dockerfile.PROJECTS: + if stem.rfind(project) >=3D 0: + self.project_name =3D project + for subproject in Dockerfile.PROJECTS[project]: + self.projects +=3D [subproject] + break + cross =3D stem.rfind(Dockerfile.CROSS) =20 if cross >=3D 0: - # If we found CROSS, then everything before it is the name of - # the OS and everything after it the name of the architecture - # we're targeting for cross-compilation - self.os =3D stem[:cross] + # If we found CROSS, then everything in between the project's + # name and the cross is the name of the OS and everything after + # it the name of the architecture we're targeting for + # cross-compilation + # Mind the project name has an extra '-', which is taken into + # consideration when getting the OS + self.os =3D stem[len(self.project_name) + 1:cross] self.cross_arch =3D stem[cross + len(Dockerfile.CROSS):] else: - # Otherwise the entire stem is the name of the OS and there - # is no cross-compilation architecture - self.os =3D stem + # Otherwise the name of the OS starts just after the project's + # name and there is no cross-compilation architecture + # Mind the project name has an extra '-', which is taken into + # consideration when getting the OS + self.os =3D stem[len(self.project_name) + 1:] self.cross_arch =3D None =20 # Fedora Rawhide is special in that we use it to perform MinGW # builds, so we need to add the corresponding projects if self.os =3D=3D "fedora-rawhide": - self.projects =3D "libvirt,libvirt+mingw*" - else: - self.projects =3D "libvirt" + mingw_projects =3D [] + for subproject in self.projects: + if Dockerfile.PROJECTS[self.project_name][subproject]: + mingw_projects +=3D [subproject + "+mingw*"] + + self.projects +=3D mingw_projects =20 def refresh(self, lcitool): =20 @@ -81,7 +112,7 @@ class Dockerfile: =20 args +=3D [ "libvirt-" + self.os, - self.projects, + ",".join(self.projects), ] =20 rc =3D subprocess.run(args, capture_output=3DTrue) --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list