From patchwork Sat Jul 27 00:19:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 13743521 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 357C8C3DA4A for ; Sat, 27 Jul 2024 00:20:01 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.765789.1176436 (Exim 4.92) (envelope-from ) id 1sXVA9-0000aZ-Rl; Sat, 27 Jul 2024 00:19:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 765789.1176436; Sat, 27 Jul 2024 00:19:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sXVA9-0000aS-P7; Sat, 27 Jul 2024 00:19:53 +0000 Received: by outflank-mailman (input) for mailman id 765789; Sat, 27 Jul 2024 00:19:52 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sXVA8-0000Sf-P3 for xen-devel@lists.xenproject.org; Sat, 27 Jul 2024 00:19:52 +0000 Received: from sin.source.kernel.org (sin.source.kernel.org [2604:1380:40e1:4800::1]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id f03dffaa-4bad-11ef-bc00-fd08da9f4363; Sat, 27 Jul 2024 02:19:51 +0200 (CEST) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 9379FCE0ED1; Sat, 27 Jul 2024 00:19:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0B0E3C32782; Sat, 27 Jul 2024 00:19:43 +0000 (UTC) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: f03dffaa-4bad-11ef-bc00-fd08da9f4363 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722039584; bh=caF8ZEnVQAiNG73dG8gwlbc6P0P+Qerrz+YIN+0RoYY=; h=Date:From:To:cc:Subject:From; b=SZ27PMHYdp2E7lT6S0L+6NG+gmYrcpAEga6X1bWDXZk3Tel2b+3VRAR+nm4wQyKxo YlGBCyzfrS6POgwYWaX9CEYEGBWtvNJvUcevhy9Dn6SMHWwzJPYIQYG04/IIS7vnnM qg0oh/UHBMorJwGEGLflhmQAxGBrpy6clmv6KQfS9uta+mhAvHSTBdLMyjz1coixql zPtASQ9F7xVUulvs55dMJk2IbBEVpO5hPpgbM2+MMZlPddaO2J478X91dFsL2WCjFC DrbX3/f2grgTGXM4lqYkgV3a7uPSQGxfqSo1EWXFilQSKbv78qhkbp73ehKxk7gNb2 p9xOriynMsM9g== Date: Fri, 26 Jul 2024 17:19:42 -0700 (PDT) From: Stefano Stabellini X-X-Sender: sstabellini@ubuntu-linux-20-04-desktop To: xen-devel@lists.xenproject.org cc: sstabellini@kernel.org, marmarek@invisiblethingslab.com, andrew.cooper3@citrix.com, cardoe@cardoe.com Subject: [PATCH v2] automation: upgrade Yocto to scarthgap Message-ID: User-Agent: Alpine 2.22 (DEB 394 2020-01-19) MIME-Version: 1.0 Upgrade Yocto to a newer version. Use ext4 as image format for testing with QEMU on ARM and ARM64 as the default is WIC and it is not available for our xen-image-minimal target. Also update the tar.bz2 filename for the rootfs. Signed-off-by: Stefano Stabellini Reviewed-by: Marek Marczykowski-Górecki --- all yocto tests pass: https://gitlab.com/xen-project/people/sstabellini/xen/-/pipelines/1390081173 Changes in v2: - s/EXT4/IMAGE_FMT/ - set IMAGE_FMT before the call to project_build - also update the filename xen-image-minimal-qemuarm.rootfs.tar.bz2 --- automation/build/yocto/build-yocto.sh | 15 ++++++++++++--- automation/build/yocto/yocto.inc | 4 ++-- automation/gitlab-ci/build.yaml | 2 +- automation/scripts/qemu-smoke-dom0-arm32.sh | 2 +- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/automation/build/yocto/build-yocto.sh b/automation/build/yocto/build-yocto.sh index 93ce81ce82..e1e69f2bb5 100755 --- a/automation/build/yocto/build-yocto.sh +++ b/automation/build/yocto/build-yocto.sh @@ -25,6 +25,7 @@ TARGET_SUPPORTED="qemuarm qemuarm64 qemux86-64" VERBOSE="n" TARGETLIST="" BUILDJOBS="8" +IMAGE_FMT="" # actions to do do_clean="n" @@ -38,8 +39,9 @@ build_result=0 # layers to include in the project build_layerlist="poky/meta poky/meta-poky poky/meta-yocto-bsp \ meta-openembedded/meta-oe meta-openembedded/meta-python \ + meta-openembedded/meta-networking \ meta-openembedded/meta-filesystems \ - meta-openembedded/meta-networking meta-virtualization" + meta-virtualization" # yocto image to build build_image="xen-image-minimal" @@ -175,7 +177,7 @@ function project_build() { mkdir -p $OUTPUTDIR cp $BUILDDIR/tmp/deploy/images/qemuarm/zImage $OUTPUTDIR cp $BUILDDIR/tmp/deploy/images/qemuarm/xen-qemuarm $OUTPUTDIR - cp $BUILDDIR/tmp/deploy/images/qemuarm/xen-image-minimal-qemuarm.tar.bz2 $OUTPUTDIR + cp $BUILDDIR/tmp/deploy/images/qemuarm/xen-image-minimal-qemuarm.rootfs.tar.bz2 $OUTPUTDIR fi fi ) || return 1 @@ -196,7 +198,7 @@ function project_run() { /usr/bin/expect <