From patchwork Thu Sep 25 17:47:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 420 Return-Path: X-Original-To: u-boot-concept@u-boot.org Delivered-To: u-boot-concept@u-boot.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1758822519; bh=jxj06DMuWHNs3ASghn7Z2GjNMQQu6Pxx5Qxq18SvB4E=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=hXtKklmY58VatwRaSiHdB1eg0yaFj1Y4q/upWXt9q1vfS5ZjXssY+Y2nVVLlUxTdk Hk2TskcDJfwATaErbeAGjIkBOcrRJc5sf0G+Ncxu9rbWSfmNjg4t+ndkptmAoYiqWS Zt+60jo6rAcoHYibJEUuOVuzLUz1HVz5dV+vxixfdoXVH56PQJT+XPcLqpr+H1zQvL zYgh0Zu03IEmzif73nsqAw2l10bXHQxhl+sI/DShBPUO3J9RQTFHGkKKUQpGo2t7gQ DiCO8kyZ8F8tZDG58cPIXjfaVFKFDUbfIArbwwqX6KxX2Uc5rsgQT7X7+qdoSfRrT5 kYgSBVlYw+viQ== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id D703667D9A for ; Thu, 25 Sep 2025 11:48:39 -0600 (MDT) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id tZAkeq-siR8N for ; Thu, 25 Sep 2025 11:48:39 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1758822519; bh=jxj06DMuWHNs3ASghn7Z2GjNMQQu6Pxx5Qxq18SvB4E=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=hXtKklmY58VatwRaSiHdB1eg0yaFj1Y4q/upWXt9q1vfS5ZjXssY+Y2nVVLlUxTdk Hk2TskcDJfwATaErbeAGjIkBOcrRJc5sf0G+Ncxu9rbWSfmNjg4t+ndkptmAoYiqWS Zt+60jo6rAcoHYibJEUuOVuzLUz1HVz5dV+vxixfdoXVH56PQJT+XPcLqpr+H1zQvL zYgh0Zu03IEmzif73nsqAw2l10bXHQxhl+sI/DShBPUO3J9RQTFHGkKKUQpGo2t7gQ DiCO8kyZ8F8tZDG58cPIXjfaVFKFDUbfIArbwwqX6KxX2Uc5rsgQT7X7+qdoSfRrT5 kYgSBVlYw+viQ== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id C647D67D29 for ; Thu, 25 Sep 2025 11:48:39 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1758822517; bh=t3dI9KHGFcdhjftBVs/5aBhD34OYd/yFWQccIpRGX0Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OucmMb1KA5JgX6MlRtoE2yHupWJ2C1mquvD7xhg657ikt3su5Kp30Z1MAm9EeS0a+ xVnL6u4IgdoclPDxwFzCXFSE40mZAQT1NNKHXK5eJY1RhuZRoMsxEdR2anyehKki8M QCcHZYsdzWjQlIoPRVG54C2LtJvxgu++qmQ9HmtXFkbU8xGp+ldEo2eayLDk8Xefu+ YfkiW4RRYVSLeGtAoe7rwMhXqau82FuIAfqvxLdTzIwQrwLbXFiU5y+T8m7S6m/2ya RhN77DRJl8flxQzHeRfQaSEsBqfrg029falfmoRJTVXCQz9DzpTR28HHEVvRjP5ib6 WRqoJAEuBO9hg== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id C9BCA67CA2; Thu, 25 Sep 2025 11:48:37 -0600 (MDT) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10026) with ESMTP id ipPUPhUS4ngF; Thu, 25 Sep 2025 11:48:37 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1758822513; bh=qLLrZY2cAjTqfztdFMhDsdLtNICSb6MSifnisYy8Umg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Gvct6OfNcjquAeqBN2hb/Y47XqSCmPTLVrCYwttM8Ptzo0yMFug6r/NGmOIfy5t5r v//vBNhVu2dlsnL40EL4nBKZOdvO0hA5+sxVpw2cE6whMfsVlyjBv32l0ht/++3CAq H9smAq1Sajxv0u8urPN0YO35LoIoZoQc7585hYGm+ZiUIIJPm3rGejNe/fisyd152x mWxSCMBTfv8jw/mx3n3U0a2q31UIvf1mjOGbffafYBXKnXtCzpuvOsNy0xZf0tDBk/ 68903ER3SOUr6CXO1hovXgarxtvHDUe59gVAkgkeVLfratVg9/f+bgNhAxOgbKIpNW r8BT/6FsFSxsg== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id EEFC467CEF; Thu, 25 Sep 2025 11:48:32 -0600 (MDT) From: Simon Glass To: U-Boot Concept Date: Thu, 25 Sep 2025 11:47:32 -0600 Message-ID: <20250925174753.3429102-9-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250925174753.3429102-1-sjg@u-boot.org> References: <20250925174753.3429102-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: K6VQQSR57AUOTHLWDR4FF4PICACWR6NU X-Message-ID-Hash: K6VQQSR57AUOTHLWDR4FF4PICACWR6NU X-MailFrom: sjg@u-boot.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Heinrich Schuchardt , Simon Glass X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 08/22] test: Allow creating disks with a different Ubuntu version List-Id: Discussion and patches related to U-Boot Concept Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Simon Glass Add a way to specify the (fake) Ubuntu release being used, so that we can (later) add more tests for this case. Signed-off-by: Simon Glass --- test/py/img/ubuntu.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/py/img/ubuntu.py b/test/py/img/ubuntu.py index 06e8251c05b..1247ec134d5 100644 --- a/test/py/img/ubuntu.py +++ b/test/py/img/ubuntu.py @@ -6,7 +6,7 @@ from img.common import setup_extlinux_image -def setup_ubuntu_image(config, log, devnum, basename): +def setup_ubuntu_image(config, log, devnum, basename, version='24.04.1 LTS'): """Create a 20MB Ubuntu disk image with a single FAT partition Args: @@ -32,16 +32,16 @@ timeout 50 label l0 - menu label Ubuntu 24.04.1 LTS 6.8.0-53-generic + menu label Ubuntu %s 6.8.0-53-generic linux /boot/%s initrd /boot/%s append root=/dev/disk/by-uuid/bcfdda4a-8249-4f40-9f0f-7c1a76b6cbe8 ro earlycon label l0r - menu label Ubuntu 24.04.1 LTS 6.8.0-53-generic (rescue target) + menu label Ubuntu %s 6.8.0-53-generic (rescue target) linux /boot/%s initrd /boot/%s -''' % (vmlinux, initrd, vmlinux, initrd) +''' % ((version, vmlinux, initrd) * 2) setup_extlinux_image(config, log, devnum, basename, vmlinux, initrd, dtbdir, script)