From nobody Sat Apr 27 00:26:23 2024 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=1570610046; cv=none; d=zoho.com; s=zohoarc; b=CAbNf3ZjE4aNLHLvuJOZrjra8k8jCZMnaT9OkWRwMZOWaesRjZcCgMF9/6CVCgfZ6RyU+3qV+XnkXJ7+yb4u/CPgp1q3Ww8PwPV/uxAv578iFEuuhO/A6tIwhNKlsK41k6X9HKvmzHiPXaF/q/Y/VD76cfj2yQADvL0VxC3+UuU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570610046; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=7Pw3YYZm4aXJblQzU6uHA+1Gq/UuQrS1QM1KkdgiGqA=; b=GsvR0enfzUhjnnKouY2HdTJ7+iyFay15fE5YBTeasJbZHdDf4wy44D7wVKQt84aybwdRkOykEDB7qtk1GTOJ3O4QL2GSraqNdQKxvVAxDzygiPfOF7EU/M470tSqYanqzlmM2h2PUncrpai/q7hTIQMMavYIJH3cqj6dKj1oj1c= 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 1570610046296503.11378981339215; Wed, 9 Oct 2019 01:34:06 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1960A3071549; Wed, 9 Oct 2019 08:34:03 +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 9C1D210013A1; Wed, 9 Oct 2019 08:34:01 +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 C96054A486; Wed, 9 Oct 2019 08:33:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x998Xv14020364 for ; Wed, 9 Oct 2019 04:33:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id 28A2B60C05; Wed, 9 Oct 2019 08:33:57 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.73]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A510B60BEC for ; Wed, 9 Oct 2019 08:33:52 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 9 Oct 2019 10:33:51 +0200 Message-Id: <20191009083351.7976-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH] lcitool: Fix pip handling in Dockerfiles 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.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Wed, 09 Oct 2019 08:34:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" We're currently only installing pip packages for cross-build Dockerfiles, which was obviously not the original intention. Signed-off-by: Andrea Bolognani --- Pushed as trivial. guests/lcitool | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/guests/lcitool b/guests/lcitool index 2c08455..a3ef137 100755 --- a/guests/lcitool +++ b/guests/lcitool @@ -705,18 +705,6 @@ class Application: {package_manager} autoremove -y && \\ {package_manager} autoclean -y """).format(**varmap)) - - if pip_pkgs: - sys.stdout.write(textwrap.dedent(""" - RUN pip3 install {pip_pkgs} - """).format(**varmap)) - - sys.stdout.write(textwrap.dedent(""" - ENV ABI "{cross_abi}" - ENV CONFIGURE_OPTS "--host=3D{cross_abi} \\ - --target=3D{cross_abi}" - ENV PKG_CONFIG_LIBDIR "/usr/lib/{cross_lib}/pkgconfig" - """).format(**varmap)) elif package_format =3D=3D "rpm": if os_name =3D=3D "Fedora" and os_version =3D=3D "Rawhide": sys.stdout.write(textwrap.dedent(""" @@ -734,10 +722,18 @@ class Application: {package_manager} clean all -y """).format(**varmap)) =20 - if pip_pkgs: - sys.stdout.write(textwrap.dedent(""" - RUN pip3 install {pip_pkgs} - """).format(**varmap)) + if pip_pkgs: + sys.stdout.write(textwrap.dedent(""" + RUN pip3 install {pip_pkgs} + """).format(**varmap)) + + if args.cross_arch: + sys.stdout.write(textwrap.dedent(""" + ENV ABI "{cross_abi}" + ENV CONFIGURE_OPTS "--host=3D{cross_abi} \\ + --target=3D{cross_abi}" + ENV PKG_CONFIG_LIBDIR "/usr/lib/{cross_lib}/pkgconfig" + """).format(**varmap)) =20 def run(self): args =3D self._parser.parse_args() --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list