From nobody Sat May 4 10:15:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.208.42 as permitted sender) client-ip=209.85.208.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.208.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1610974033; cv=none; d=zohomail.com; s=zohoarc; b=kblrAPpBnaw3CxmX3fS3Gn0yG2RVNytx6sG5IMGvzsEJV5xAjxrxDTu5pMa1AkByN/4pMS0LOksrBAGJdPoTCYbCqDqIXJtJTupD2HBYzr76O8H3st8sobIEXUVV/zxGXDeOtQP8+GmmoMnwEdOl2eR8YuP9kYr21tkrVmK6YRM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610974033; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Sender:Subject:To; bh=1BgCUTwfpzE34Pm0T4NFZZPFnLEuyaI7/uRzuYIpCPo=; b=a3yQIRmGzjzGssnYb6uRM/iYRGIple7mjX57m6yM4UP1XxT0DAbmB6EDWGmk+Ny7HL1lSBuiLCWm1mknA7uaZ4cze2qpHuwnNDnpMbtarsK3NaY+El4bOSQoO8JfYpehsNBe8SDGmjjrznVjvEWZdVBzk2WCU0LV/wmksG+OD3g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.208.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-ed1-f42.google.com (mail-ed1-f42.google.com [209.85.208.42]) by mx.zohomail.com with SMTPS id 161097403349761.4424159279896; Mon, 18 Jan 2021 04:47:13 -0800 (PST) Received: by mail-ed1-f42.google.com with SMTP id c6so10299938ede.0 for ; Mon, 18 Jan 2021 04:47:12 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (13.red-83-57-169.dynamicip.rima-tde.net. [83.57.169.13]) by smtp.gmail.com with ESMTPSA id by30sm10702045edb.15.2021.01.18.04.47.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Jan 2021 04:47:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=1BgCUTwfpzE34Pm0T4NFZZPFnLEuyaI7/uRzuYIpCPo=; b=TMNPj7sVoGYk5v1D70oyaGIaxlYr04MLWYSOYm1waquHIUNPAAjzqrCMC7dBVRIN4O r80RNbxn6Ub3Nmk4GckU2sQmRQi7iOyOIedeo1dgKC4kJh89ujBsAqjCf8XASv3qbgsW xbJg4/PN25cZQMFYeCZUP+q4VOPF2n6XtU77KUWmqPPQNR5i+0LzxHi09dV96TEil7cl 4pVgb+BfxKAtDxSYh3myuyMDY4DqEer0TH1GIY2HA/AahPS4N4Nz9GhoQjKdRqpvtf/z bcyZOcPn5udopZqKWD2Pem2Oaq+4s/dpBggfI+UX3c6stgOmH3HRxpTYwYZ4RjaLZ0lg O/Uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=1BgCUTwfpzE34Pm0T4NFZZPFnLEuyaI7/uRzuYIpCPo=; b=hPoQKEp71rhBdZ8tkMVZVMljVv9s15DsB9kAlaCHrkhHIwhGqZ6bjMoTXttOnqZK85 +GpY03uvq29IJ46+bq8e68WHnoEP2ab7R+C26Nc0kNBaxh8Kz50H/tXtj/iyN8OyEp2+ Nl13q59lvZSaxYQyrpnrvHDVE4K8klj9wopXnYLKTxgRnhX3296BoLablh9h15qQf3s2 dh/JFauplp4Gsrpofj218I/6GHHE/ndfXfnCikK7557Ge2aDKgxs1dUQHqfret+3QvYP lIRz3QfWdCP4ADpOwzX9He+QnQLRU5PQ8JJC2Ra9rh3e6IotimC1Ym/QwkzCpOwsGcRs 3dDg== X-Gm-Message-State: AOAM5332fSz/SxN4UNXdK5uiOASYc0lEI4EnOMcVw9e0AQcYGe01LJQH b/C54VAiP7W9+tOM7bRSB+Y= X-Google-Smtp-Source: ABdhPJzA+pDAwehxrNwO9cL4xxylivjbg9t05bUzV355rwn9UGuMNOggLEJghRZagKcucDBd3zUlOw== X-Received: by 2002:a50:cdc8:: with SMTP id h8mr19682527edj.293.1610974031701; Mon, 18 Jan 2021 04:47:11 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Max Filippov , Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH] tests/docker: Update the xtensa container to debian 10 Date: Mon, 18 Jan 2021 13:47:09 +0100 Message-Id: <20210118124709.215800-1-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Align the Xtensa docker image with the other Debian-based ones. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.d/containers.yml | 2 ++ tests/docker/Makefile.include | 1 + tests/docker/dockerfiles/debian-xtensa-cross.docker | 12 +++--------- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index 910754a699f..08bccd96901 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -204,6 +204,8 @@ tricore-debian-cross-container: =20 xtensa-debian-cross-container: <<: *container_job_definition + stage: containers-layer2 + needs: ['amd64-debian10-container'] variables: NAME: debian-xtensa-cross =20 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index c254ac38d0a..464740533e9 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -134,6 +134,7 @@ docker-image-travis: NOUSER=3D1 =20 # Specialist build images, sometimes very limited tools docker-image-debian-tricore-cross: docker-image-debian10 +docker-image-debian-xtensa-cross: docker-image-debian10 docker-image-debian-all-test-cross: docker-image-debian10 docker-image-debian-arm64-test-cross: docker-image-debian11 =20 diff --git a/tests/docker/dockerfiles/debian-xtensa-cross.docker b/tests/do= cker/dockerfiles/debian-xtensa-cross.docker index ba4148299c5..f89f1d9e247 100644 --- a/tests/docker/dockerfiles/debian-xtensa-cross.docker +++ b/tests/docker/dockerfiles/debian-xtensa-cross.docker @@ -1,22 +1,16 @@ # # Docker cross-compiler target # -# This docker target builds on the debian stretch base image, +# This docker target builds on the debian Buster base image, # using a prebuilt toolchains for Xtensa cores from: # https://github.com/foss-xtensa/toolchain/releases # -FROM debian:stretch-slim +FROM qemu/debian10 =20 RUN apt-get update && \ - DEBIAN_FRONTEND=3Dnoninteractive apt install -yy eatmydata && \ DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ apt-get install -y --no-install-recommends \ - build-essential \ - ca-certificates \ - curl \ - gettext \ - git \ - python3-minimal + curl =20 ENV CPU_LIST dc232b dc233c de233_fpu dsp3400 ENV TOOLCHAIN_RELEASE 2020.07 --=20 2.26.2