From nobody Mon May 6 14:14:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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=1582633029; cv=none; d=zohomail.com; s=zohoarc; b=XVcRxFr4E6t2R7gm8L3eMJLUjhBZ7nC99ulFU4enQaJlnHykj88oc7FhmALT224sgEw2LBCLYXkvwmfrbDc7de4h4SqTSLgXOCpIcVzQnNUYxcQ8U7D1n/pBicieBIvbrJCSA1eDGDpba+F8D+pdlPCHKOXysDOvbQjP30OzOSE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582633029; 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; bh=qCDSfRpeNriHwkDhhjU2QQpV12A0omOANqZmpj8nFio=; b=Ey0HtDycVpaec8+zSR2utEAIyJ8zqYoAFkt6cG7sb7g+HI/1jQXtk/AJf5sMWavfETGfZ8BVeWeAXdYH7wgKTOFNKOKWrYZlsN5+J9U9NCU1bqd3sGgOjeItTI6VeE+MdvlgR4bjRMvz0b+rXedFT9h9fq4vzm8RmBsTV2Q9ocg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1582633029225599.2514706494827; Tue, 25 Feb 2020 04:17:09 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-231-jsZBEETmMfaqky7Xi2-v9A-1; Tue, 25 Feb 2020 07:17:05 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9EB9B1005516; Tue, 25 Feb 2020 12:16:56 +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 4CCD68C073; Tue, 25 Feb 2020 12:16:56 +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 97A0518089CF; Tue, 25 Feb 2020 12:16:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 01PCG0UF002970 for ; Tue, 25 Feb 2020 07:16:00 -0500 Received: by smtp.corp.redhat.com (Postfix) id AC4545C21B; Tue, 25 Feb 2020 12:16:00 +0000 (UTC) Received: from kinshicho.usersys.redhat.com (ovpn-204-138.brq.redhat.com [10.40.204.138]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 718E55C3FA for ; Tue, 25 Feb 2020 12:15:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582633028; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=qCDSfRpeNriHwkDhhjU2QQpV12A0omOANqZmpj8nFio=; b=SOdC86xo43F6WPapRrLfzGGCFFxKd6EoHnQbsjOUXKxeuwoNKFYd5gnQFr/LDbxHybbT0Y Ahcs2KShCeqxioR7zj9+s3LKHeU4kTNjO8DX8KI9DUj/VyJptpqbnqN1ASF/7DGpBlM4h6 tPYcbMR6s8uyu61CrLfyrXIiK2MokL4= X-MC-Unique: jsZBEETmMfaqky7Xi2-v9A-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt-jenkins-ci PATCH 1/4] lcitool: Install dpkg-dev when doing cross-builds on Debian Date: Tue, 25 Feb 2020 13:15:46 +0100 Message-Id: <20200225121549.209513-2-abologna@redhat.com> In-Reply-To: <20200225121549.209513-1-abologna@redhat.com> References: <20200225121549.209513-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" When invoked as $triplet-pkg-config, pkg-config is smart enough to search the paths corresponding to the target architecture; on Debian, however, this currently only works when dpkg-dev is installed, which by default it is not. Work around the issue on our side by installing dpkg-dev explicitly in our cross-building container images. https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=3D952526 Signed-off-by: Andrea Bolognani Reviewed-by: Fabiano Fid=C3=AAncio --- guests/lcitool | 1 + 1 file changed, 1 insertion(+) diff --git a/guests/lcitool b/guests/lcitool index 771402e..86416c4 100755 --- a/guests/lcitool +++ b/guests/lcitool @@ -811,6 +811,7 @@ class Application: dpkg --add-architecture {cross_arch} && \\ {package_manager} update && \\ {package_manager} dist-upgrade -y && \\ + {package_manager} install --no-install-recommends = -y dpkg-dev && \\ {package_manager} install --no-install-recommends = -y {cross_pkgs} && \\ {package_manager} autoremove -y && \\ {package_manager} autoclean -y --=20 2.24.1 From nobody Mon May 6 14:14:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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=1582633032; cv=none; d=zohomail.com; s=zohoarc; b=fOubiliTiYNOAzdt9t1qthmiHqHmBTOLOfwJzKEi0pG7QE+wmgqjC6bOgXLATp8DNflfMkg6N++2jPLRkHSgOj6mfRSwhR3ut3rx79GQml+VAijZm1Y3+biHcnSLvHo60bKePz+VlnphxVpaG9211yFhg9BqlUpTnCLbFdDwzaI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582633032; 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; bh=8YgW3Fy6GqcsWzp1RIEdLblmcshvJuxQJ9mGibWuSJs=; b=gLuX/HaBuAOitT/pe/Na4funGq/JmnrMobhxYapxWZermhZsODMNihxBQgcFf5237R6VjCm1cImQ9+XooHRAeV9tHQObelhQ1skgCr1jvwRxfLSurdVDC8wdSMC9cMY/W4W5PLlSNgT7bb8NH14bWQWsnfAqSmDDmB0NPcGG000= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1582633032834955.3671434384429; Tue, 25 Feb 2020 04:17:12 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-285-zg27yBWkPbisfAFxqPViZA-1; Tue, 25 Feb 2020 07:17:08 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 74925800D5E; Tue, 25 Feb 2020 12:17:00 +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 4313A91840; Tue, 25 Feb 2020 12:17:00 +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 D4372860C9; Tue, 25 Feb 2020 12:16:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 01PCG28A002992 for ; Tue, 25 Feb 2020 07:16:02 -0500 Received: by smtp.corp.redhat.com (Postfix) id 54BC55C241; Tue, 25 Feb 2020 12:16:02 +0000 (UTC) Received: from kinshicho.usersys.redhat.com (ovpn-204-138.brq.redhat.com [10.40.204.138]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 640825C21B for ; Tue, 25 Feb 2020 12:16:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582633031; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=8YgW3Fy6GqcsWzp1RIEdLblmcshvJuxQJ9mGibWuSJs=; b=H9eYoicDvGseksfd8OYPLSgjQaNkJAJaYK2hioUZx9XybgW6tWyHcKy4mdXtXh+dPaygXl uo9O4Dv9twTAWe0VCQXELH9GsHUNDakKV7joKl4U6Y5jAYAcplU3zzylY24mzwO5a4+Z+w HV8ZBWrdd8249GnMidLTZdXausS2fRw= X-MC-Unique: zg27yBWkPbisfAFxqPViZA-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt-jenkins-ci PATCH 2/4] Don't set $PKG_CONFIG_LIBDIR anywhere Date: Tue, 25 Feb 2020 13:15:47 +0100 Message-Id: <20200225121549.209513-3-abologna@redhat.com> In-Reply-To: <20200225121549.209513-1-abologna@redhat.com> References: <20200225121549.209513-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" When invoked as $triplet-pkg-config, pkg-config is smart enough to search the paths corresponding to the target architecture, so we don't need to point it to them directly. This works for both MinGW builds and non-x86_64 Linux builds, and avoids the problems that come from setting $PKG_CONFIG_LIBDIR in containers, mainly that you can't use the same container image to perform both native builds and cross builds - something that libosinfo is alreayd doing today in their CI. Signed-off-by: Andrea Bolognani Reviewed-by: Fabiano Fid=C3=AAncio --- guests/lcitool | 2 -- guests/playbooks/build/jobs/defaults.yml | 2 -- jenkins/jobs/defaults.yaml | 2 -- 3 files changed, 6 deletions(-) diff --git a/guests/lcitool b/guests/lcitool index 86416c4..053e46a 100755 --- a/guests/lcitool +++ b/guests/lcitool @@ -899,7 +899,6 @@ class Application: 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 if cross_arch and package_format =3D=3D "rpm": @@ -907,7 +906,6 @@ class Application: ENV ABI "{cross_abi}" ENV CONFIGURE_OPTS "--host=3D{cross_abi} \\ --target=3D{cross_abi}" - ENV PKG_CONFIG_LIBDIR "/usr/{cross_abi}/sys-root/mingw/lib= /pkgconfig:/usr/{cross_abi}/sys-root/mingw/share/pkgconfig" """).format(**varmap)) =20 def _action_dockerfile(self, args): diff --git a/guests/playbooks/build/jobs/defaults.yml b/guests/playbooks/bu= ild/jobs/defaults.yml index 65dee78..3d5eaa0 100644 --- a/guests/playbooks/build/jobs/defaults.yml +++ b/guests/playbooks/build/jobs/defaults.yml @@ -37,13 +37,11 @@ strip_buildrequires: | mingw32_local_env: | export VIRT_PREFIX=3D"$VIRT_PREFIX/i686-w64-mingw32/sys-root/mingw" export PKG_CONFIG_PATH=3D"$VIRT_PREFIX/lib/pkgconfig" - export PKG_CONFIG_LIBDIR=3D"/usr/i686-w64-mingw32/sys-root/mingw/lib/pkg= config:/usr/i686-w64-mingw32/sys-root/mingw/share/pkgconfig" mingw32_autogen_args: --host=3Di686-w64-mingw32 mingw32_meson_args: --cross-file=3D/usr/share/mingw/toolchain-mingw32.meson mingw64_local_env: | export VIRT_PREFIX=3D"$VIRT_PREFIX/x86_64-w64-mingw32/sys-root/mingw" export PKG_CONFIG_PATH=3D"$VIRT_PREFIX/lib/pkgconfig" - export PKG_CONFIG_LIBDIR=3D"/usr/x86_64-w64-mingw32/sys-root/mingw/lib/p= kgconfig:/usr/x86_64-w64-mingw32/sys-root/mingw/share/pkgconfig" mingw64_autogen_args: --host=3Dx86_64-w64-mingw32 mingw64_meson_args: --cross-file=3D/usr/share/mingw/toolchain-mingw64.meson git_urls: diff --git a/jenkins/jobs/defaults.yaml b/jenkins/jobs/defaults.yaml index ec429ed..8e9486d 100644 --- a/jenkins/jobs/defaults.yaml +++ b/jenkins/jobs/defaults.yaml @@ -33,13 +33,11 @@ mingw32_local_env: | export VIRT_PREFIX=3D"$VIRT_PREFIX/i686-w64-mingw32/sys-root/mingw" export PKG_CONFIG_PATH=3D"$VIRT_PREFIX/lib/pkgconfig" - export PKG_CONFIG_LIBDIR=3D"/usr/i686-w64-mingw32/sys-root/mingw/lib= /pkgconfig:/usr/i686-w64-mingw32/sys-root/mingw/share/pkgconfig" mingw32_autogen_args: --host=3Di686-w64-mingw32 mingw32_meson_args: --cross-file=3D/usr/share/mingw/toolchain-mingw32.= meson mingw64_local_env: | export VIRT_PREFIX=3D"$VIRT_PREFIX/x86_64-w64-mingw32/sys-root/mingw" export PKG_CONFIG_PATH=3D"$VIRT_PREFIX/lib/pkgconfig" - export PKG_CONFIG_LIBDIR=3D"/usr/x86_64-w64-mingw32/sys-root/mingw/l= ib/pkgconfig:/usr/x86_64-w64-mingw32/sys-root/mingw/share/pkgconfig" mingw64_autogen_args: --host=3Dx86_64-w64-mingw32 mingw64_meson_args: --cross-file=3D/usr/share/mingw/toolchain-mingw64.= meson git_urls: --=20 2.24.1 From nobody Mon May 6 14:14:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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=1582632988; cv=none; d=zohomail.com; s=zohoarc; b=dmoY58usYLb/iLJmtd2PAwS2L8sdgGwmvHhTw40Mgo/dXEioxu5b56JXiZ1KEiL8M+CX6BenYDZ3HTVYF9SIntJCBbtDpGXNJyty4k4pJBf1nGE8L1UrsNe4Op0tOCoIu/Z7TZWb+2ujWQf6fpRYAaTSIu7rdQJ7A/wriBm91WQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582632988; 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; bh=zXE3NDWiHthGT8fIRf7zzVktXSwn02Wx1u4r2dymCw8=; b=aaInlAN62YdXAtqDWh25oxP/fsx7I3r6uUUhsm8d+JKPVJzaGqwq1Mc2PYQt+HGP2J24CO77qK9THlUJrNWfdieDChZonqjyJging9vhBZcASpcqQG//kSygqH/G3/r3TvwIqaBy8Btu6m99o/IFOQBpy1K6kJcI+bumdq8BRz0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1582632988625319.4863228793133; Tue, 25 Feb 2020 04:16:28 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-268-N991OQwDPG2HxyBZ-8v_FQ-1; Tue, 25 Feb 2020 07:16:25 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AFD27107ACC9; Tue, 25 Feb 2020 12:16: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 6803A88859; Tue, 25 Feb 2020 12:16: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 12BC98B2DB; Tue, 25 Feb 2020 12:16:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 01PCG68K003020 for ; Tue, 25 Feb 2020 07:16:06 -0500 Received: by smtp.corp.redhat.com (Postfix) id 392295C21B; Tue, 25 Feb 2020 12:16:06 +0000 (UTC) Received: from kinshicho.usersys.redhat.com (ovpn-204-138.brq.redhat.com [10.40.204.138]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F1F3A5C553 for ; Tue, 25 Feb 2020 12:16:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582632987; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=zXE3NDWiHthGT8fIRf7zzVktXSwn02Wx1u4r2dymCw8=; b=DWB/ojn1xqZEGcexfWvUerzdA5sVr6/9LGXLielhzXQUf2xpnEa3XFa59j03w1DeLldU6C PxPHUvEyBevi0bUmGdUy2yoNj5yHDTGgVFo+mBhzi9pJQDfsMUr6FySBqytduTmfp1oS8Q YOkeCxlZjMbshx044rVqTEX2YpJitFw= X-MC-Unique: N991OQwDPG2HxyBZ-8v_FQ-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt-jenkins-ci PATCH 3/4] lcitool: Drop duplicated code Date: Tue, 25 Feb 2020 13:15:48 +0100 Message-Id: <20200225121549.209513-4-abologna@redhat.com> In-Reply-To: <20200225121549.209513-1-abologna@redhat.com> References: <20200225121549.209513-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Now that we no longer set $PKG_CONFIG_LIBDIR, there is no need to have separate code paths for Debian and Fedora. Signed-off-by: Andrea Bolognani Reviewed-by: Fabiano Fid=C3=AAncio --- guests/lcitool | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/guests/lcitool b/guests/lcitool index 053e46a..80e725c 100755 --- a/guests/lcitool +++ b/guests/lcitool @@ -894,14 +894,7 @@ class Application: ENV LANG "en_US.UTF-8" """).format(**varmap)) =20 - if cross_arch and package_format =3D=3D "deb": - sys.stdout.write(textwrap.dedent(""" - ENV ABI "{cross_abi}" - ENV CONFIGURE_OPTS "--host=3D{cross_abi} \\ - --target=3D{cross_abi}" - """).format(**varmap)) - - if cross_arch and package_format =3D=3D "rpm": + if cross_arch: sys.stdout.write(textwrap.dedent(""" ENV ABI "{cross_abi}" ENV CONFIGURE_OPTS "--host=3D{cross_abi} \\ --=20 2.24.1 From nobody Mon May 6 14:14:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1582633024; cv=none; d=zohomail.com; s=zohoarc; b=iOL62zJbV7o3pAz/WfHgReqfLnPzR7un+nRqjRjRURIn+Fjphs//ruT7vkJBI1WC4tRwLVE58BDEJbMKZuOgziz2K73JiQ0c037FiPIK4Mh7DX5rihSd5Gr5rayavAcamp+CdoZZtwuCqaBvcNWOrqNijZcz77k5J6jf+axO7ts= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582633024; 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; bh=JNQnAYvNwRtkoHBwu9cNGB8cOU7isaRsQii08ZIPTnU=; b=cyuKuRCsbdLUulzCAh5O4Pu/O6/OgoGC6TACeuN3U9rpeh5b1maYL32ppSqKuyz4ePns/b8G8+Zp+ydugRJxwb1NohVfsCi+MRgHTIG8fLZU8PccxiVaf05SfaivWRVf6WzGESOWTV5KSkdeR0nlBWYAPjcSe3+5FCwUitLwNaQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1582633024891737.5056241400048; Tue, 25 Feb 2020 04:17:04 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-29-GLKoLSC2OPeckP0eZuWlVQ-1; Tue, 25 Feb 2020 07:16:34 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 59467801A0C; Tue, 25 Feb 2020 12:16:28 +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 297935C548; Tue, 25 Feb 2020 12:16:28 +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 B6158860C9; Tue, 25 Feb 2020 12:16:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 01PCG9kN003073 for ; Tue, 25 Feb 2020 07:16:09 -0500 Received: by smtp.corp.redhat.com (Postfix) id 635C15C553; Tue, 25 Feb 2020 12:16:09 +0000 (UTC) Received: from kinshicho.usersys.redhat.com (ovpn-204-138.brq.redhat.com [10.40.204.138]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 76D0F5C21B for ; Tue, 25 Feb 2020 12:16:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582633023; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=JNQnAYvNwRtkoHBwu9cNGB8cOU7isaRsQii08ZIPTnU=; b=W0WbAg7CaOr3h0ybTgp+TF06CP/ypy1zz4Wim5PLwzFN0pGWkjvM6s3TEDlmfPQAAq4Md/ cWHCTmxqsmzRoXOHyjzh2GfSVm/tqRdlgRUdQsBoQ5uIJ2mROOtbHXbuhDgd5wpWJ1iZ0D laycuW1v6NJVT0LoXH44qERanfgUuIo= X-MC-Unique: GLKoLSC2OPeckP0eZuWlVQ-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt-jenkins-ci PATCH 4/4] lcitool: Don't specify --target in $CONFIGURE_OPTS Date: Tue, 25 Feb 2020 13:15:49 +0100 Message-Id: <20200225121549.209513-5-abologna@redhat.com> In-Reply-To: <20200225121549.209513-1-abologna@redhat.com> References: <20200225121549.209513-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" If --target is not specified, the value of --host will be used, so having both is unnecessary; --target is mostly intended for building toolchains, which we're not doing. In fact, we're already not using --target in either the Jenkins and Ansible build scripts, thus proving that we don't need it. Signed-off-by: Andrea Bolognani Reviewed-by: Fabiano Fid=C3=AAncio --- guests/lcitool | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/guests/lcitool b/guests/lcitool index 80e725c..209380a 100755 --- a/guests/lcitool +++ b/guests/lcitool @@ -897,8 +897,7 @@ class Application: if cross_arch: sys.stdout.write(textwrap.dedent(""" ENV ABI "{cross_abi}" - ENV CONFIGURE_OPTS "--host=3D{cross_abi} \\ - --target=3D{cross_abi}" + ENV CONFIGURE_OPTS "--host=3D{cross_abi}" """).format(**varmap)) =20 def _action_dockerfile(self, args): --=20 2.24.1