From nobody Fri May 17 08:39:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614775349; cv=none; d=zohomail.com; s=zohoarc; b=XJwOcu8s6DPpqbn1ev6+wAdJuv8RSKx3/ZRLdJS1/cEwMYdyhNX2oiXy0GfY+H8GgRnhG4se8XTHfw0B5fFgvtjpB3YNyh6Qdu2UAF/uKlvr4MYtw6c2ugCMf8tsQyxD0ENV1W4OD4sxHPF5oqA3CLfc6h/Sfm0iN+IVjqy81n8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614775349; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=20U0L7sZSyiRkqIT2+9P3efvWI7ED9JdihB6qw0d1pQ=; b=f9DBhEpul0SMidgaR72sp+AD3O/JG5jxhj92yxvkEY8/91DhA+Cv946xY8bUNyF7unm8jCcxEXQAFUONAppIKeKrW/UAjwPEctoumhjptGp9jxy/u7E3dGYqBRPAv8gHkT+8uk/4qxdcA9AALsexflbK9RckwJJd8mxtu7c8BG8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1614775349168162.45838690819426; Wed, 3 Mar 2021 04:42:29 -0800 (PST) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-563-QalpbNIqPt2XZQnAknn-rw-1; Wed, 03 Mar 2021 07:42:25 -0500 Received: by mail-wm1-f72.google.com with SMTP id c9so1756769wme.5 for ; Wed, 03 Mar 2021 04:42:25 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id z21sm5949439wma.29.2021.03.03.04.42.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Mar 2021 04:42:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614775347; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=20U0L7sZSyiRkqIT2+9P3efvWI7ED9JdihB6qw0d1pQ=; b=fOFMbOt74/EtwEDJSAyXY6RP66obFeA7f7zmDq/N5JQV1jDF6rw2ORSjH804n/KqFWodIF ycEVvclYGvUYnLkG2kB7EEKw6G7L2pTWS5EPJQ7/SvKifVuCEcluT7sQqNzx9whVDv1gg1 /1jYJgf4z2nXwn3hnX7kPOGfAqmu1tE= X-MC-Unique: QalpbNIqPt2XZQnAknn-rw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=20U0L7sZSyiRkqIT2+9P3efvWI7ED9JdihB6qw0d1pQ=; b=WRCvOXoMjJvUWLGaJXaHPHLBYI71DdPqMEXeqPzrP0vEIb0lt6qtAXM6FtAnJj/iu+ rTVXZ9obJLCofV9sSJHbG+9wS/TVf5f7G1EbEluEeywtGODmGOzDfLVgeYdEmGCWek1c 680qqoijhRxnGPz74zv+cEYenGYgQgIAis58VHrqF3lV4paFFQsKFig9gjX6nG8Fx68P fPL/IVO4pjAcI6gZhy8kLqbyjxXwqIeNLz7wV/dTnYd9FtXIEzl66fjAqRzrGJjAG7Jf 8WB3zPkobgnyLt5NmbQ7bwGgmBJl0PpRYfyoUNSQx3dd91hppCqdUkROy8WP4H/ubN/q MvwQ== X-Gm-Message-State: AOAM5330Fx5851q22N1enk+bCvtpixyDy6mowTFwjAY3WONIDI056VY1 fsJotMrfQUk+y+J7G67Ge2+WhZ5zr2ZdEsLa8ixaLb2YdAZPM8nTqp/VrRLFbYj8DJ9zQnzbkNl iqyutCXWCnuLk4g== X-Received: by 2002:a5d:6181:: with SMTP id j1mr26802024wru.11.1614775344273; Wed, 03 Mar 2021 04:42:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJyN7zBfxpmCOcIHQiHfcclvDK2des+2KjF1RvYKEq5RmozAhzZijrlJhliFem3x4dGeAS/enA== X-Received: by 2002:a5d:6181:: with SMTP id j1mr26802010wru.11.1614775344099; Wed, 03 Mar 2021 04:42:24 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: "Daniel P . Berrange" , qemu-devel@nongnu.org Cc: Thomas Huth , "Richard W . M . Jones" , Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH] docker: Base Fedora MinGW cross containers on the base Fedora image Date: Wed, 3 Mar 2021 13:42:22 +0100 Message-Id: <20210303124222.1485332-1-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) The only difference between fedora-winXX-cross.docker and fedora.docker is the specific QEMU_CONFIGURE_OPTS environment variable. All the rest can be inherited from the generic Fedora image. Basing the cross containers on the generic Fedora allows us to - save registry/local storage - use more tools in the cross container (ccache for example). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.d/containers.yml | 4 ++ tests/docker/Makefile.include | 2 + .../dockerfiles/fedora-win32-cross.docker | 41 +------------------ .../dockerfiles/fedora-win64-cross.docker | 37 +---------------- 4 files changed, 10 insertions(+), 74 deletions(-) diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index 33e4046e233..1f7f82ece65 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -222,11 +222,15 @@ i386-fedora-cross-container: =20 win32-fedora-cross-container: <<: *container_job_definition + stage: containers-layer2 + needs: ['amd64-fedora-container'] variables: NAME: fedora-win32-cross =20 win64-fedora-cross-container: <<: *container_job_definition + stage: containers-layer2 + needs: ['amd64-fedora-container'] variables: NAME: fedora-win64-cross =20 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 7cab761bf5b..5aa99df32ad 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -144,6 +144,8 @@ docker-image-debian-riscv64-cross: docker-image-debian10 docker-image-debian-s390x-cross: docker-image-debian10 docker-image-debian-sh4-cross: docker-image-debian10 docker-image-debian-sparc64-cross: docker-image-debian10 +docker-image-fedora-win32-cross: docker-image-fedora +docker-image-fedora-win64-cross: docker-image-fedora =20 # Specialist build images, sometimes very limited tools docker-image-debian-tricore-cross: docker-image-debian10 diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/doc= ker/dockerfiles/fedora-win32-cross.docker index 81b5659e9c5..425f05c3e98 100644 --- a/tests/docker/dockerfiles/fedora-win32-cross.docker +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker @@ -1,41 +1,4 @@ -FROM fedora:33 - -# Please keep this list sorted alphabetically -ENV PACKAGES \ - bc \ - bzip2 \ - diffutils \ - findutils \ - gcc \ - gettext \ - git \ - hostname \ - make \ - meson \ - mingw32-bzip2 \ - mingw32-curl \ - mingw32-glib2 \ - mingw32-gmp \ - mingw32-gnutls \ - mingw32-gtk3 \ - mingw32-libjpeg-turbo \ - mingw32-libpng \ - mingw32-libtasn1 \ - mingw32-nettle \ - mingw32-nsis \ - mingw32-pixman \ - mingw32-pkg-config \ - mingw32-SDL2 \ - perl \ - perl-Test-Harness \ - python3 \ - python3-PyYAML \ - tar \ - which - -RUN dnf install -y $PACKAGES -RUN rpm -q $PACKAGES | sort > /packages.txt -ENV FEATURES mingw +FROM qemu/fedora =20 # Specify the cross prefix for this image (see tests/docker/common.rc) -ENV QEMU_CONFIGURE_OPTS --cross-prefix=3Di686-w64-mingw32- +ENV QEMU_CONFIGURE_OPTS $QEMU_CONFIGURE_OPTS --cross-prefix=3Di686-w64-min= gw32- diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/doc= ker/dockerfiles/fedora-win64-cross.docker index bcb428e7242..abdbce2a145 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -1,37 +1,4 @@ -FROM fedora:33 - -# Please keep this list sorted alphabetically -ENV PACKAGES \ - bc \ - bzip2 \ - diffutils \ - findutils \ - gcc \ - gettext \ - git \ - hostname \ - make \ - meson \ - mingw64-bzip2 \ - mingw64-curl \ - mingw64-glib2 \ - mingw64-gmp \ - mingw64-gtk3 \ - mingw64-libjpeg-turbo \ - mingw64-libpng \ - mingw64-libtasn1 \ - mingw64-pixman \ - mingw64-pkg-config \ - perl \ - perl-Test-Harness \ - python3 \ - python3-PyYAML \ - tar \ - which - -RUN dnf install -y $PACKAGES -RUN rpm -q $PACKAGES | sort > /packages.txt -ENV FEATURES mingw +FROM qemu/fedora =20 # Specify the cross prefix for this image (see tests/docker/common.rc) -ENV QEMU_CONFIGURE_OPTS --cross-prefix=3Dx86_64-w64-mingw32- --disable-cap= stone +ENV QEMU_CONFIGURE_OPTS $QEMU_CONFIGURE_OPTS --cross-prefix=3Dx86_64-w64-m= ingw32- --disable-capstone --=20 2.26.2