From patchwork Fri Nov 25 21:15:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 15940 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 aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93C1FC4332F for ; Fri, 25 Nov 2022 21:16:10 +0000 (UTC) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.groups.io with SMTP id smtpd.web11.57033.1669410964440934201 for ; Fri, 25 Nov 2022 13:16:04 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Vk7dk5dZ; spf=pass (domain: gmail.com, ip: 209.85.221.44, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f44.google.com with SMTP id z4so8481400wrr.3 for ; Fri, 25 Nov 2022 13:16:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=sYq2Ss2O7Oi2ZC8KDPh/83udLqF4BP7TfgqFjgsTy0c=; b=Vk7dk5dZkSBASCpGvB109Kcaab6ybkOXcDgWNhBSrlQ41p89Ui1iz1cxR8fL8UA2k/ e8gesNyDFW9CIh+7TCBxuu2VWX5enUn6bWxnHrg+bK0Gtu73njZf5BlwU8S//knGvXko hQE9EI4Eb/KMPak3ZVR4g9nFfigWILiu1C68uTNhClhdsY/1Z4pGEDWfyRmWa+D6Rhhz lAVVKU2HNxjUwkJrwJIszWYyRpFpO9pzINcGZ2gDOdxc9JckxVFVtEEFM5ZZpo+K1fff SYYKJs66SAgWt76IFX1cj8oiSC+b+Gei6U3FFEo06vjgWmeS7bMjR1kFBK00i+AOONBH nrlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=sYq2Ss2O7Oi2ZC8KDPh/83udLqF4BP7TfgqFjgsTy0c=; b=WfMIkvrnJvSRuDGl/gvt3HUaggFPKJCMPvVdLduJB84BwIBsI7PiMeekly9Rn8r88X c+eofoBVit5ZQxBLqxfCgv10j1W9phv2tZog3EkJfIVptEJUi3KqGj+MYr+VQD10qayP ni2qwnZlQSGhf75H+/K96NDX9/OhMDySNZ/OGtc5Z0/+1DXB5h/JP6OF/gDfK/f5rEao xIeyB0nNuDXohbbMgmZ2Ak9JtJC+V2LfppPZDDPKtgV17LPcCQzL16PTrLTsAGUqa4RF eOoNzhbdjDdSU15mjJQeZQe6tyw+CdYewiy8w8vXJWhDwdkZ2Ei2g2F8xSEuVKdzX+7G J5qw== X-Gm-Message-State: ANoB5pkOgCQqt8QueGvBzoD8kzLWQBq9evE0MOSWuT4EaI+KMo/PfQO8 7GQXr01pS8jLcLXRk2qzGeEef/s43V0= X-Google-Smtp-Source: AA0mqf7lMb32QWCcULBE8XY2j0UmFN++0JfkoJQULjtWSWVz3NtVcn7RKj05WAAvjN2/y96Foa6N6g== X-Received: by 2002:adf:ee48:0:b0:242:65d:c3f7 with SMTP id w8-20020adfee48000000b00242065dc3f7mr3432475wro.571.1669410962892; Fri, 25 Nov 2022 13:16:02 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id p1-20020a1c5441000000b003b4cba4ef71sm10068863wmi.41.2022.11.25.13.16.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Nov 2022 13:16:02 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 1/3] qemu-helper: depend on unfs3 and pseudo directly Date: Fri, 25 Nov 2022 22:15:56 +0100 Message-Id: <20221125211558.20985-1-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 25 Nov 2022 21:16:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173785 Dependencies of runqemu belong in qemu-helper; in particular there is no reason to scatter unfs3 all over the place, and then require separate steps to make it available (e.g. 'meta-ide-support'). With this, startng runqemu with a nfs mount starts to 'just work' after building an image. Signed-off-by: Alexander Kanavin --- meta/recipes-core/meta/meta-extsdk-toolchain.bb | 2 +- meta/recipes-core/meta/meta-ide-support.bb | 2 +- .../packagegroups/nativesdk-packagegroup-sdk-host.bb | 1 - meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb | 2 +- meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb | 2 +- scripts/runqemu-export-rootfs | 8 ++------ scripts/runqemu-extract-sdk | 2 +- 7 files changed, 7 insertions(+), 12 deletions(-) diff --git a/meta/recipes-core/meta/meta-extsdk-toolchain.bb b/meta/recipes-core/meta/meta-extsdk-toolchain.bb index 0df681ac73..618b596e4d 100644 --- a/meta/recipes-core/meta/meta-extsdk-toolchain.bb +++ b/meta/recipes-core/meta/meta-extsdk-toolchain.bb @@ -2,7 +2,7 @@ SUMMARY = "Extensible SDK toolchain meta-recipe" DESCRIPTION = "Meta-recipe for ensuring the build directory contains all appropriate toolchain packages for using an IDE" LICENSE = "MIT" -DEPENDS = "virtual/libc gdb-cross-${TARGET_ARCH} qemu-native qemu-helper-native unfs3-native" +DEPENDS = "virtual/libc gdb-cross-${TARGET_ARCH} qemu-native qemu-helper-native" do_populate_sysroot[deptask] = "do_populate_sysroot" diff --git a/meta/recipes-core/meta/meta-ide-support.bb b/meta/recipes-core/meta/meta-ide-support.bb index 7f349f673d..dd11b5673c 100644 --- a/meta/recipes-core/meta/meta-ide-support.bb +++ b/meta/recipes-core/meta/meta-ide-support.bb @@ -2,7 +2,7 @@ SUMMARY = "Integrated Development Environment support" DESCRIPTION = "Meta package for ensuring the build directory contains all appropriate toolchain packages for using an IDE" LICENSE = "MIT" -DEPENDS = "virtual/libc gdb-cross-${TARGET_ARCH} qemu-native qemu-helper-native unfs3-native cmake-native autoconf-native automake-native meson-native intltool-native pkgconfig-native" +DEPENDS = "virtual/libc gdb-cross-${TARGET_ARCH} qemu-native qemu-helper-native cmake-native autoconf-native automake-native meson-native intltool-native pkgconfig-native" PR = "r3" RM_WORK_EXCLUDE += "${PN}" diff --git a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb index 9166a0851f..84ee1e3fa1 100644 --- a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb +++ b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb @@ -16,7 +16,6 @@ RDEPENDS:${PN} = "\ nativesdk-qemu \ nativesdk-qemu-helper \ nativesdk-pseudo \ - nativesdk-unfs3 \ nativesdk-opkg \ nativesdk-libtool \ nativesdk-autoconf \ diff --git a/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb b/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb index abba7fe159..2a5bcfb909 100644 --- a/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb +++ b/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb @@ -1,6 +1,6 @@ SUMMARY = "Qemu helper scripts" LICENSE = "GPL-2.0-only" -RDEPENDS:${PN} = "nativesdk-qemu \ +RDEPENDS:${PN} = "nativesdk-qemu nativesdk-unfs3 nativesdk-pseudo \ nativesdk-python3-shell nativesdk-python3-fcntl nativesdk-python3-logging \ " diff --git a/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb b/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb index e297586bbb..6053b71717 100644 --- a/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb +++ b/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb @@ -25,5 +25,5 @@ do_install() { install qemu-oe-bridge-helper ${D}${bindir}/ } -DEPENDS += "qemu-system-native" +DEPENDS += "qemu-system-native unfs3-native pseudo-native" addtask addto_recipe_sysroot after do_populate_sysroot before do_build diff --git a/scripts/runqemu-export-rootfs b/scripts/runqemu-export-rootfs index c1fff7fcb3..6a8acd0d5a 100755 --- a/scripts/runqemu-export-rootfs +++ b/scripts/runqemu-export-rootfs @@ -34,16 +34,12 @@ if [ -z "$SYSROOT_SETUP_SCRIPT" ]; then echo "Did you forget to source your build environment setup script?" exit 1 fi -. $SYSROOT_SETUP_SCRIPT meta-ide-support +. $SYSROOT_SETUP_SCRIPT qemu-helper-native if [ ! -e "$OECORE_NATIVE_SYSROOT/usr/bin/unfsd" ]; then echo "Error: Unable to find unfsd binary in $OECORE_NATIVE_SYSROOT/usr/bin/" - if [ "x$OECORE_DISTRO_VERSION" = "x" ]; then - echo "Have you run 'bitbake meta-ide-support'?" - else - echo "This shouldn't happen - something is missing from your toolchain installation" - fi + echo "This shouldn't happen - something is missing from your toolchain installation" exit 1 fi diff --git a/scripts/runqemu-extract-sdk b/scripts/runqemu-extract-sdk index 9bc0c07fb8..db05da25f2 100755 --- a/scripts/runqemu-extract-sdk +++ b/scripts/runqemu-extract-sdk @@ -25,7 +25,7 @@ if [ -z "$SYSROOT_SETUP_SCRIPT" ]; then echo "Did you forget to source your build system environment setup script?" exit 1 fi -. $SYSROOT_SETUP_SCRIPT meta-ide-support +. $SYSROOT_SETUP_SCRIPT qemu-helper-native PSEUDO_OPTS="-P $OECORE_NATIVE_SYSROOT/usr" ROOTFS_TARBALL=$1 From patchwork Fri Nov 25 21:15:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 15941 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 aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE2D6C46467 for ; Fri, 25 Nov 2022 21:16:10 +0000 (UTC) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.groups.io with SMTP id smtpd.web11.57035.1669410965357560370 for ; Fri, 25 Nov 2022 13:16:05 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=jNH6Ii/Z; spf=pass (domain: gmail.com, ip: 209.85.221.45, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f45.google.com with SMTP id h11so1178308wrw.13 for ; Fri, 25 Nov 2022 13:16:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=iP5rtKL9MTfoUY6ICGzRHu1UK8N7V2rEVsy9SYy4btU=; b=jNH6Ii/ZafcQLml8NsnXnqWOP2PIdgafBfYq9flcrfhXTuMUdYIbgnsn5jo2nffs4l 5Af9fVkLdELLb8XCN/vumeB2BVYiJ6I+TD55u735YWqAE7DQsOHe1AMkSz3OCC8jUSVE qjl1QjlqTSmDNrsr7ydb9xAhlqyUg7EPN1XoHJ6FLFmFipPEv4m88Ts3Hd+cqaVPUT1H bIAN1Di6jjGl2RNe+Vtxi6vZKyLh1w/HWuc61h48NiV882oHV6h+o7jeJryjVDWTL0PR WIYF8P+EJqB/2QIYKTUTIi1ELrdOOEmLR3rx61wmqmLAPT5UHLU4sVlRiNFt6upYlCj/ UY6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iP5rtKL9MTfoUY6ICGzRHu1UK8N7V2rEVsy9SYy4btU=; b=iDe+nngX0ZwQlNPRFoU3h1fjlrUJQmqWIoU/9kPKn/QqyydXNJ9t/2Dtvlp5j5LdGE d+FywTtGNMLZ6wy9LUxuREWe5brXz8eaSl5NW1enPpKvxBmaYQRmF7HbVTYYD93rxzxR 2Cx8W+tN4CnbymWVXZspRy3z1tVwQMWDeh8CW61jErccQvxOLYeIj79UedqO9IMBInO4 Pmbri0w7Pu+8iEiKCwwewPtnXSHOskZ3rw26NoeE2Fven/+794r+ha0Iqk05e8zWPZ2P BzhHOdYbZ8SAMkA/YnPl1DPRHGn+aBUqaOJGFtnZud0iAetkI0yH0nzr58gS/Ta/uGVM VMMQ== X-Gm-Message-State: ANoB5pmeY+9TneVzKMW61CafqUb7XJymtI5V9TVQcvQYnBMfJYpGyaSa NHsmpjukTZWFyrshkPhD+Frs0Dql0gY= X-Google-Smtp-Source: AA0mqf4Q/g3+LxhtSuORMzO442TtjHp4NII5j61al3QiVgQ05GwENx+UO+u0ivohrv/BKj1hDhTbcw== X-Received: by 2002:a5d:6349:0:b0:242:c01:71ed with SMTP id b9-20020a5d6349000000b002420c0171edmr583565wrw.54.1669410963620; Fri, 25 Nov 2022 13:16:03 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id p1-20020a1c5441000000b003b4cba4ef71sm10068863wmi.41.2022.11.25.13.16.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Nov 2022 13:16:03 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 2/3] runqemu: do not hardcode the ip address of the nfs server when using tap Date: Fri, 25 Nov 2022 22:15:57 +0100 Message-Id: <20221125211558.20985-2-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221125211558.20985-1-alex@linutronix.de> References: <20221125211558.20985-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 25 Nov 2022 21:16:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173786 Rather, set it similarly to the overall network config. Signed-off-by: Alexander Kanavin --- scripts/runqemu | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/runqemu b/scripts/runqemu index 7bd9465593..04728673de 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -999,7 +999,7 @@ class BaseConfig(object): if self.slirp_enabled: self.nfs_server = '10.0.2.2' else: - self.nfs_server = '192.168.7.1' + self.nfs_server = '192.168.7.@GATEWAY@' # Figure out a new nfs_instance to allow multiple qemus running. ps = subprocess.check_output(("ps", "auxww")).decode('utf-8') @@ -1187,6 +1187,7 @@ class BaseConfig(object): netconf = " " + self.cmdline_ip_tap netconf = netconf.replace('@CLIENT@', str(client)) netconf = netconf.replace('@GATEWAY@', str(gateway)) + self.nfs_server = self.nfs_server.replace('@GATEWAY@', str(gateway)) logger.info("Network configuration:%s", netconf) self.kernel_cmdline_script += netconf mac = "%s%02x" % (self.mac_tap, client) From patchwork Fri Nov 25 21:15:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 15939 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 aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 955E2C4167B for ; Fri, 25 Nov 2022 21:16:10 +0000 (UTC) Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.groups.io with SMTP id smtpd.web11.57036.1669410965786160499 for ; Fri, 25 Nov 2022 13:16:06 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=RBS254P6; spf=pass (domain: gmail.com, ip: 209.85.221.43, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f43.google.com with SMTP id x5so8482029wrt.7 for ; Fri, 25 Nov 2022 13:16:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Dgsz/+TUXhKcuxQNx3pO9I+WbTWnUaoJ/n7+Lnbxm44=; b=RBS254P69bdjB7TJa7dxYFv/8jGPUNJ3HGWqmWG86DUhIPk+VaxUHo4bNQ/3BrQeGy 3PdCaEEnyJ44jVt9cPGrxiYpIFeuXVCMSek4HAd306ptsAIiP3zgvV0rcqNMlwkj30g/ tJkSHprwjNLUn0B7CKfkX6KbvFbSNahOmhjTk1zQgveTnfu7iIrOPOt+7DATC/EQB5Ao OZ4iBO/HTXKxV84t9eUkbBUliVNnMr56aJvsBCaPSmqYoVNjYa825BnKKZAFAFWAADXR OUtAGdvT3kZ4Atvj+6UK9AXUhMiFhqlPeqrtN88zbxFLEZ4UvDcNUzfTSuHb92WsrYaj eSHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Dgsz/+TUXhKcuxQNx3pO9I+WbTWnUaoJ/n7+Lnbxm44=; b=FWj739pqT+WFLn0b2bkWdSlPT5IIuYN8Ei8r5ac3UQOBuScHJQK6hdR2pcJu+bWZ3e 0C9UfuhQ5/wwRPYDChwOmN4SK3Zo0CxzbrROh08NKm+UtfrvnuHuVePQLGh2LXMRsCJr m6cSfrB3wg9GeirDiDMiVi8IGQZlfwPfzXJvMT1I/y+Jy2UGQ0mIpUAcJuP3oYxoLtaA go2njbzzAALCW+6u/DQi1MJpalIQBMz3p15NxiONXnB1vXdj8TMgimgSA/MGO1dVsb0s D/9brRqp8OEdNFkT9oWgr6GLsjFsdBSK1A0szlEDQsqc7F3D4thOgDCCSihJgF/Ms07d 51wg== X-Gm-Message-State: ANoB5pmMS5opLCH50NBVB3Ato/ZJVZM+Pxup9uD2s3yk8W0+Of7gR0W2 oCFjm1X9ANSYgMrHbPPoQfLtF/Sx+QU= X-Google-Smtp-Source: AA0mqf6HuaDWlfHv+yI4kkRE1jwUxX0uN5Ge9aS9SNJ0ie24fFpZWOQMaReTUEpJgOPGk/t2NtbE4w== X-Received: by 2002:a5d:4a43:0:b0:241:e16c:180 with SMTP id v3-20020a5d4a43000000b00241e16c0180mr13391437wrs.379.1669410964264; Fri, 25 Nov 2022 13:16:04 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id p1-20020a1c5441000000b003b4cba4ef71sm10068863wmi.41.2022.11.25.13.16.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Nov 2022 13:16:03 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 3/3] selftest/runqemu: reenable the nfs rootfs test Date: Fri, 25 Nov 2022 22:15:58 +0100 Message-Id: <20221125211558.20985-3-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221125211558.20985-1-alex@linutronix.de> References: <20221125211558.20985-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 25 Nov 2022 21:16:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173787 With the previous fixes the test can be run again, and it doesn't need all those extra steps. Runqemu takes care of everything automatically now. Signed-off-by: Alexander Kanavin --- meta/lib/oeqa/selftest/cases/runqemu.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/runqemu.py b/meta/lib/oeqa/selftest/cases/runqemu.py index 58a4526df6..c2c3fbc924 100644 --- a/meta/lib/oeqa/selftest/cases/runqemu.py +++ b/meta/lib/oeqa/selftest/cases/runqemu.py @@ -199,22 +199,12 @@ class QemuTest(OESelftestTestCase): qemu_shutdown_succeeded = self._start_qemu_shutdown_check_if_shutdown_succeeded(qemu, shutdown_timeout) self.assertTrue(qemu_shutdown_succeeded, 'Failed: %s does not shutdown within timeout(%s)' % (self.machine, shutdown_timeout)) - # Need to have portmap/rpcbind running to allow this test to work and - # current autobuilder setup does not have this. - def disabled_test_qemu_can_boot_nfs_and_shutdown(self): - self.assertExists(self.qemuboot_conf) - bitbake('meta-ide-support') + def test_qemu_can_boot_nfs_and_shutdown(self): rootfs_tar = "%s-%s.tar.bz2" % (self.recipe, self.machine) rootfs_tar = os.path.join(self.deploy_dir_image, rootfs_tar) self.assertExists(rootfs_tar) - tmpdir = tempfile.mkdtemp(prefix='qemu_nfs') - tmpdir_nfs = os.path.join(tmpdir, 'nfs') - cmd_extract_nfs = 'runqemu-extract-sdk %s %s' % (rootfs_tar, tmpdir_nfs) - result = runCmd(cmd_extract_nfs) - self.assertEqual(0, result.status, "runqemu-extract-sdk didn't run as expected. %s" % result.output) - cmd = "%s nfs %s %s" % (self.cmd_common, self.qemuboot_conf, tmpdir_nfs) + cmd = "%s %s" % (self.cmd_common, rootfs_tar) shutdown_timeout = 120 with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: qemu_shutdown_succeeded = self._start_qemu_shutdown_check_if_shutdown_succeeded(qemu, shutdown_timeout) self.assertTrue(qemu_shutdown_succeeded, 'Failed: %s does not shutdown within timeout(%s)' % (self.machine, shutdown_timeout)) - runCmd('rm -rf %s' % tmpdir)