From patchwork Thu Jan 23 15:17:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 4034 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 23 Jan 2025 16:18:21 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wr1-f58.google.com (mail-wr1-f58.google.com [209.85.221.58]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 50NFIKq0008394 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 23 Jan 2025 16:18:21 +0100 Received: by mail-wr1-f58.google.com with SMTP id ffacd0b85a97d-38634103b0dsf591218f8f.2 for ; Thu, 23 Jan 2025 07:18:21 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1737645495; cv=pass; d=google.com; s=arc-20240605; b=SNedhjkNZUepFez7IeghateGMNNjjNm1S7nP/bVcFIkxr6Uc+cW/zL0JezzalGY/Wi h2RGDQRNZ0FzVteFgeeKVIOkHp8JnuGMFmqBubxeoD+0XsOIuh+a5T0viNVARAfNOwxz ii4UPoSpoDgz/5XGoFLFyHtZzqB5qGMr0UK009K7rsGEFixSCC0UX1F5Us/m1Ut7Qmpz 9US+iY4UJV+JM41R95LnutFrhkiTfdbqjfLq/T2Xzfj7wB78nH5+YJaC2JBtkJjIqI86 6mvalc4P8SUeiHDrSQKBx1TGMetTrtQmXCjqQpiR7ha3Q8N/pOyDuBLgTIsvqt85t6G+ bx7Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:to:from:sender:dkim-signature; bh=/28IOHSCuiefKNNZFNUPJ0NXn1P7gzD/bm09nkDIOY8=; fh=dFp4IGteLpNBS3rKEfEwNqE6PCQQdy/iRIBK2e7LKzo=; b=Bfal6rEQHSEYZ2WaJX6cZ3Lu58I9z8YrySeEimf8TvXxsnEInMIkP4jtAnbpRS7lAa lakwmceNgubiAZXW/BX/s6qKnrqAnMXiKM1UfOkihZWvKaLRhV6LOhFyc5pcGlVbkw0k q3em2DeHcdSWtoTuT6L+k66OffmDgFOTCQh6cy8f9FbDk7WbvjhGzCZmu2k7qoHZFGRe NBQHl4FYn2NmAWIy8JV68qlQwj21UgEG/vKa0VeQgw3Ig0Iogaa+fUQhO+iJhWs9kxSx B+u5gc9DaYN1AOBqjSKxgsIDXxMs8VJZczg+MQYhwXJm446tbExn+2C7LChvjlhDUXEJ SEDQ==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1737645495; x=1738250295; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:to:from :sender:from:to:cc:subject:date:message-id:reply-to; bh=/28IOHSCuiefKNNZFNUPJ0NXn1P7gzD/bm09nkDIOY8=; b=iXQ/8FZQZ9JewumeWd2/b7rEfWRjow6RfA6Fxxc/L2OJ5uTeRXnm1qg+xrDmTUC4xX 4DMoanJta44TDRjai1y2dlwWExfvfuZ5dmx9UIzI9s5Q8lwmn8iwofrwX2Ep6MaP+/D5 SDiQjcaj/Ev5TMbyBvzOKofQ6W9iGKHIBVb10j9RZyuPAaEv1XkCvUb31JuZ9I92lVre ptk6nWsp6ZR51xzP5aS6PDxqgWZvrguej5ojlF023/KA0tYvEvDo8e9Ao9rmx5Eld/l5 2f5G65gszRck9WIdEcADrMKs5SCwYfdIi3s1i4VPWKGtlYz/FQdufkVUKPD6/ob0xsfh soyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737645495; x=1738250295; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:to:from:x-beenthere:x-gm-message-state :sender:from:to:cc:subject:date:message-id:reply-to; bh=/28IOHSCuiefKNNZFNUPJ0NXn1P7gzD/bm09nkDIOY8=; b=gIQSjbeVdOA04QwSkGMw7UyaNyRICZ83bbZ8VcXHiF1MPDDGqXa5q8YAM65Wyk9aAH JBeUxc8izSdzfOWwgh7UyO/BQV+PQf/UcFcnb1S0aqPweQtK3opZ7BHMWTIDqeHdQaqg 7Uyyasun2DSjTaQkRFssrRuFYfkm+27CxF2r08t6mjxkvA++JEAzjT/pbiNrCRl/Hnya sMCf2kV7yPJEAqlZUlWNnniTYXmUmZH4XIzJgzpEvkM0XuPDeRu9u3mg/fZeLriF7ega Z6ohRT3liDAMExfkV4Jguv0giSA9FZ4DPAioCdYfQ7T/7XWIdT4aD49GoiNX+EUP9fUW L8ng== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCUFvTCzZJSsvf2KTsFl5cW35n11CO6DIzHDKRgdRz4Bx2w5G/IXmsflHuZsqFAboTQEZzfmSWE=@isar-build.org X-Gm-Message-State: AOJu0YxAb3rx5+a3CUq8QXlRQxIhyHQ3qWpg8HRkdiR/aZ513ROfM+wc Acmk+WAZKJYmgdxwSJQgKhqjW5+aAorN4Uy+crZuuipUZDKK8Xlq X-Google-Smtp-Source: AGHT+IGygNSnrZV9kDFYuunINlO5lehnwJv/r4uhCY/BxWnfvAdx7yJOvl/IIak4+Duql0MWbdxH6g== X-Received: by 2002:adf:ffca:0:b0:38a:88e2:e6aa with SMTP id ffacd0b85a97d-38bf56745bcmr20397223f8f.29.1737645494078; Thu, 23 Jan 2025 07:18:14 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:ea90:0:b0:386:3213:dc23 with SMTP id ffacd0b85a97d-38c223c5b66ls156970f8f.1.-pod-prod-09-eu; Thu, 23 Jan 2025 07:18:12 -0800 (PST) X-Received: by 2002:a05:6000:1561:b0:38c:1270:f965 with SMTP id ffacd0b85a97d-38c1270fb77mr11901424f8f.42.1737645491861; Thu, 23 Jan 2025 07:18:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1737645491; cv=none; d=google.com; s=arc-20240605; b=Om39DXF49R7ierYfa/aI/BtoOylPlDKiAqFYF6PWyIgYaZogRvBGE3uKgWCDsjlGeC fwC2rIhygIY1I8gM17RiOSkomg408pnzu78+z1+MbPAkSCEm32c2fk0RhKplW4vLWm2W JNHJpj3qC7EV/qUH0C2edCcLAxpAD0wy1DVzL5ycdbkUJ4BVtik6qj+Lh859p5zh3n9H /gU98D0QOcaDW2YTlv8M69z8rgxDwzyn9OiZVXg63TptMmyxnzqgB28Mt636pxzAQLp+ CO3Xp+e4j6p6gh8onKyb8fReHINmyF6SnDd6CjRJWmtLHrD23a9uKRrPHSSZFkIRrFTW OVFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from; bh=ddX8Z01AdNu3XWdgvmg29jDI1mArrjSwCbj9zXWEMO8=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=UDlKBHVa2ZXiav34IP0RSo+RIZJ34f6nlpoYqgGJFiiMaZJHxTqszBEvbW1rVTucub vxh4TerGmNPhg/Wx5FtfvPjZitASssRKN2/5DuZNKQNFESoYMydMloZBE7SBetUWXX6H SL6wYvZPTNGk8Vf/i+aN8vtZ+9n3iwxHlNwVPssT8nlZNG4tnTVAHc+q6+796v/dQpOT 2ujGnxs7nD2tezMrn2JjxFXVIoG2Au1YFlCyuIzuEm5V784B3dvoKOrqMj1QN2wIwQRj 1RFYAMSxTGYuv855nV/hPYdRXydStf5B9P7aB/UbKfc8tCFYweX3YwMtbmOYEZF/+85t i+Nw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id ffacd0b85a97d-38bf325898bsi505669f8f.4.2025.01.23.07.18.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 23 Jan 2025 07:18:11 -0800 (PST) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from home.promwad.com (44-208-124-178-static.mgts.by [178.124.208.44] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 50NFI6KO008380 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 23 Jan 2025 16:18:07 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH] start_vm.py: support running images built with kas on host Date: Thu, 23 Jan 2025 18:17:51 +0300 Message-ID: <20250123151758.18098-1-ubely@ilbers.de> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_RP_CERTIFIED,RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: ubely@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= Script start_vm.py internally calls bitbake (bb.tinfoil) to set some qemu parameters from the build environment. If the image was build in kas, build/conf/bblayers.conf includes path that don't fit host machine. Also, current implementation relies on appropriate BBMULTICONFIG value set in local.conf. The patch adds workarounds that cover both cases mentioned above. Configuring and building the image: ``` ./kas/kas-container menu ./kas/kas-container build ``` Running the image with start_vm.py: ``` . isar-init-build-env ../testsuite/start_vm.py -a amd64 -d bookworm -i isar-image-base ``` Signed-off-by: Uladzimir Bely --- kas/isar.yaml | 4 ++++ testsuite/start_vm.py | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/kas/isar.yaml b/kas/isar.yaml index 16ce8b42..d15bdbe1 100644 --- a/kas/isar.yaml +++ b/kas/isar.yaml @@ -17,3 +17,7 @@ bblayers_conf_header: standard: | BBPATH = "${TOPDIR}" BBFILES ?= "" + +local_conf_header: + bbmulticonfig: | + BBMULTICONFIG += "${MACHINE}-${BASE_DISTRO_CODENAME}" diff --git a/testsuite/start_vm.py b/testsuite/start_vm.py index 0b9a52d6..f39e53a1 100755 --- a/testsuite/start_vm.py +++ b/testsuite/start_vm.py @@ -135,7 +135,17 @@ def sb_cleanup(): os.remove(os.path.basename(OVMF_VARS_PATH)) +def kas_paths_workaround(): + # "repo" simlink pointing to the isar dir makes kas-generated + # ${TOPDIR}/../repo/ paths in local.conf work outside of kas container + isar_dir = os.path.realpath(f'{os.path.dirname(__file__)}/..') + if not os.path.exists(f'{isar_dir}/repo'): + os.symlink('.', f'{isar_dir}/repo') + + def start_qemu(arch, build, distro, image, out, pid, enforce_pcbios): + kas_paths_workaround() + cmdline, vm_ctx = format_qemu_cmdline( arch, build, distro, image, out, pid, enforce_pcbios )