[v1] Misc patches for 2023-01-10

[PULL 08/29] gitlab: remove redundant setting of PKG_CONFIG_PATH

Paolo Bonzini posted 29 patches 3 years, 1 month ago

Diff against v2
Download mbox

Maintainers: "Alex Bennée" <alex.bennee@linaro.org>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Thomas Huth <thuth@redhat.com>, Wainer dos Santos Moschetta <wainersm@redhat.com>, Beraldo Leal <bleal@redhat.com>, Richard Henderson <richard.henderson@linaro.org>, Paolo Bonzini <pbonzini@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, Stefano Stabellini <sstabellini@kernel.org>, Anthony Perard <anthony.perard@citrix.com>, Paul Durrant <paul@xen.org>, Eduardo Habkost <eduardo@habkost.net>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Yanan Wang <wangyanan55@huawei.com>, Xie Yongji <xieyongji@bytedance.com>, "Michael S. Tsirkin" <mst@redhat.com>, John Snow <jsnow@redhat.com>, Laurent Vivier <lvivier@redhat.com>, Peter Maydell <peter.maydell@linaro.org>, Daniel Henrique Barboza <danielhb413@gmail.com>, "Cédric Le Goater" <clg@kaod.org>, David Gibson <david@gibson.dropbear.id.au>, Greg Kurz <groug@kaod.org>, Christian Schoenebeck <qemu_oss@crudebyte.com>, Gerd Hoffmann <kraxel@redhat.com>, Markus Armbruster <armbru@redhat.com>, Michael Roth <michael.roth@amd.com>, "Dr. David Alan Gilbert" <dgilbert@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>

There is a newer version of this series

Expand all Fold all

[PULL 08/29] gitlab: remove redundant setting of PKG_CONFIG_PATH

Posted by Paolo Bonzini 3 years, 1 month ago

From: Daniel P. Berrangé <berrange@redhat.com>

The PKG_CONFIG_PATH variable is not defined in GitLab CI
envs and even if it was, we don't need to set it to its
existing value.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20221103173044.3969425-2-berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 .gitlab-ci.d/crossbuild-template.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.d/crossbuild-template.yml b/.gitlab-ci.d/crossbuild-template.yml
index 5e8892fd4998..6d709628f127 100644
--- a/.gitlab-ci.d/crossbuild-template.yml
+++ b/.gitlab-ci.d/crossbuild-template.yml
@@ -6,8 +6,7 @@
   script:
     - mkdir build
     - cd build
-    - PKG_CONFIG_PATH=$PKG_CONFIG_PATH
-      ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS
+    - ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS
         --disable-user --target-list-exclude="arm-softmmu cris-softmmu
           i386-softmmu microblaze-softmmu mips-softmmu mipsel-softmmu
           mips64-softmmu ppc-softmmu riscv32-softmmu sh4-softmmu
@@ -32,8 +31,7 @@
   script:
     - mkdir build
     - cd build
-    - PKG_CONFIG_PATH=$PKG_CONFIG_PATH
-      ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS
+    - ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS
         --disable-tools --enable-${ACCEL:-kvm} $EXTRA_CONFIGURE_OPTS
     - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS
 
@@ -44,8 +42,7 @@
   script:
     - mkdir build
     - cd build
-    - PKG_CONFIG_PATH=$PKG_CONFIG_PATH
-      ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS
+    - ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS
         --disable-system --target-list-exclude="aarch64_be-linux-user
           alpha-linux-user cris-linux-user m68k-linux-user microblazeel-linux-user
           nios2-linux-user or1k-linux-user ppc-linux-user sparc-linux-user
-- 
2.38.1

Re: [PULL 08/29] gitlab: remove redundant setting of PKG_CONFIG_PATH

Posted by Daniel P. Berrangé 3 years, 1 month ago

On Tue, Jan 10, 2023 at 05:02:12PM +0100, Paolo Bonzini wrote:
> From: Daniel P. Berrang?? <berrange@redhat.com>
> 
> The PKG_CONFIG_PATH variable is not defined in GitLab CI
> envs and even if it was, we don't need to set it to its
> existing value.
> 
> Signed-off-by: Daniel P. Berrang?? <berrange@redhat.com>

This has mangled my name - think your client sending mail
needs to specify utf8 charset in the mail headers perhaps ?

> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
> Message-Id: <20221103173044.3969425-2-berrange@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [PULL 08/29] gitlab: remove redundant setting of PKG_CONFIG_PATH

Posted by Paolo Bonzini 3 years ago

On 1/10/23 17:40, Daniel P. Berrangé wrote:
>> Signed-off-by: Daniel P. Berrang??<berrange@redhat.com>
>
> This has mangled my name - think your client sending mail
> needs to specify utf8 charset in the mail headers perhaps ?

I have a "Content-type: text/plain" header added from the mimecast 
issues of last year, and git has started putting it *after* its own 
Content-type header with utf-8 charset instead of before.  I'll just 
remove the additional header.

Paolo

Re: [PULL 08/29] gitlab: remove redundant setting of PKG_CONFIG_PATH

Posted by Philippe Mathieu-Daudé 3 years ago

On 11/1/23 10:20, Paolo Bonzini wrote:
> On 1/10/23 17:40, Daniel P. Berrangé wrote:
>>> Signed-off-by: Daniel P. Berrang??<berrange@redhat.com>
>>
>> This has mangled my name - think your client sending mail
>> needs to specify utf8 charset in the mail headers perhaps ?
> 
> I have a "Content-type: text/plain" header added from the mimecast 
> issues of last year, and git has started putting it *after* its own 
> Content-type header with utf-8 charset instead of before.  I'll just 
> remove the additional header.

Ah, now I see this post. So that confirms the commits are correct
in your staged branch, and it is just a git-send-email issue.