From patchwork Thu Feb 22 20:58:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 39947 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 78D29C5478C for ; Thu, 22 Feb 2024 20:58:40 +0000 (UTC) Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by mx.groups.io with SMTP id smtpd.web10.24569.1708635510706133263 for ; Thu, 22 Feb 2024 12:58:30 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=cR9O6YEi; spf=pass (domain: gmail.com, ip: 209.85.215.173, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-5e42b4bbfa4so101264a12.1 for ; Thu, 22 Feb 2024 12:58:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708635510; x=1709240310; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Dbo6cZQVD80HGALMspiiivf2x98Bo3GmP6va6ei1eVk=; b=cR9O6YEiTVVwIrLNWmkbvZ+vk7hgglZGDZXRXkVFkMqt5hx8DfgkCmRyHa+WoDrV/8 ap89h8XMudkZ44U/3fuWcAogfDCMDCxAT7amauBCVtV31M0xN6rFDRSHEc0KIgCkwg8D SIt4GF7RmYjlIUV/Gkw0zZlHjhev/uPV5n1q4GQJdBQcR1RAqoU5mTcXBXUjXrXHGEKI e69EUsKvorY9pOOHpkBDLk//Ycsg+wZzTV1ZpFcOAK/PWViWoxYSnn4L+OnzXoa7l2CZ TkRwl/b2DT1kxIZaKyTxfuRJ2bybwvsCnzSn4y1T2bDy8V/oWp227uEDXgPyFyaxaIYT HKFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708635510; x=1709240310; 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=Dbo6cZQVD80HGALMspiiivf2x98Bo3GmP6va6ei1eVk=; b=NC45M712adwN3aqtUP38JbgDZyZPUUMgh/jWGg3NTMMmHnnnL2en1Y7rHjpyWPS2Gz Hv3QeYEpAUv3XFCCbbA689ZJIBKGJ+fF74/XKDxgukQRjdlQZBIUMsLS7R+2xtjBYODG st9Ov+wwME3QN0qmU80R/AvdFEfiDkMdzgZHrvJtRxpeXhqN8QkewV18YvAAayllCGUF S3xv9ymRH2P/HxZ3+0J5k0UepuNuMPJISdZ2jxmsfO+FuASg2OzD2zEPvBHR7TrkIQ6u 17+jmUO2WIW79ft8/qnq4XO1qovF7kWtQ0peRYzZ5a4iU30Sl+dTgbpQYJm2GgaFLUnn 2qpQ== X-Gm-Message-State: AOJu0YwT24ft1zvulJznLdA0a3IKlPxYH2hPzF98nwEgGG3PQ0Jv9rJH s/XWBWyhKph9pXscMGQ3h97q37B/kAxosEJwyk5/ahW9ySp9PZendpVXU4TYpEU= X-Google-Smtp-Source: AGHT+IFQHV3yHHF0i6RgNA872tUwXtx22vYnCLJnMWgHH9Jtdh4OOZ8anIZaCvBxowbOUO8IRIVhnQ== X-Received: by 2002:a05:6a21:e85:b0:19e:9bcb:9344 with SMTP id ma5-20020a056a210e8500b0019e9bcb9344mr23400128pzb.53.1708635509615; Thu, 22 Feb 2024 12:58:29 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::7619]) by smtp.gmail.com with ESMTPSA id y5-20020a62ce05000000b006e2dde36edesm11444010pfg.120.2024.02.22.12.58.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 12:58:29 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-filesystems][PATCH 1/4] fuse3: Add missing runtime deps for ptests Date: Thu, 22 Feb 2024 12:58:24 -0800 Message-ID: <20240222205827.2813212-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.43.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 ; Thu, 22 Feb 2024 20:58:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/108994 Signed-off-by: Khem Raj --- meta-filesystems/recipes-support/fuse/fuse3_3.16.2.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta-filesystems/recipes-support/fuse/fuse3_3.16.2.bb b/meta-filesystems/recipes-support/fuse/fuse3_3.16.2.bb index 5e532ba7ed..321851da5c 100644 --- a/meta-filesystems/recipes-support/fuse/fuse3_3.16.2.bb +++ b/meta-filesystems/recipes-support/fuse/fuse3_3.16.2.bb @@ -29,8 +29,10 @@ SRC_URI += " \ " RDEPENDS:${PN}-ptest += " \ - python3-pytest \ - bash \ + python3-pytest \ + python3-looseversion \ + kernel-module-cuse \ + bash \ " do_install_ptest() { From patchwork Thu Feb 22 20:58:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 39949 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 972D4C54E49 for ; Thu, 22 Feb 2024 20:58:40 +0000 (UTC) Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by mx.groups.io with SMTP id smtpd.web10.24570.1708635511234565967 for ; Thu, 22 Feb 2024 12:58:31 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=clkWKe+e; spf=pass (domain: gmail.com, ip: 209.85.210.170, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-6e471f5f1a5so63788b3a.1 for ; Thu, 22 Feb 2024 12:58:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708635510; x=1709240310; darn=lists.openembedded.org; 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=JKJAgSvMWxMRD/1MRvm5f+RKh0ZMD9WzNxgYMesv9j8=; b=clkWKe+elibh9uXVQCIU/VJBLzKoaQXdptDkcmFbwYODh2wFkhi6ztsPvFNOO/upsp kaSdTjyjakRqRo1WpV6Qj6k1ONP4xiCRoXW+qUfaQM+tcAR5ermPv/Q+cF/M1FaSyWG+ adTeTnAKnsmVxawnxs+zgWwWhF4C5Xvgc8s7SqHM4+SCqYSKRRUeHd22SFsxKmn+OaqU y1DUZl7PB6Nt4H2NDuIgXrJkxkX9+jaaHj4+WNtZ2e07R6MP7o5fUFaaUTvRIE1bD+k7 0KVBjvhuLUjp8vSBaNGGu8zRRzYsMJWW6QamH0zD7KUTL5BynOAadL2smh1X4vwcKFU1 QtdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708635510; x=1709240310; 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=JKJAgSvMWxMRD/1MRvm5f+RKh0ZMD9WzNxgYMesv9j8=; b=tn2GXAqLJT3492NLIFuw3EXpMJvzxIliJyMNTH2qWyMPsDumrt0gv4ntkzTa0AvMOs SThPYR+usk5K/f1rRS2u7KBiIf0Q7eGDEInulgVBezDu0k9FUtdZAtF2jk/pYUZQD1jc 7V44gC1KkFZsWEowufleDTehdWwUFyFNne5wPmVG9vnHbzCzxiWnXKnqNz3IdqdjZz5C xZ1vODpsBZGzfmeD7jhd9V+9aEH3blqUVbDnrlvrLiyyeGRayI8N476C9Qv9kPBr6tf0 XLeRtf/hk60qLSos1J+rzTFLjexSeqCMciD0bkqZPzPAXARU0NV+f15204l03oyxl38Z oGKw== X-Gm-Message-State: AOJu0YxDJmL2xnVMzKZdTwuU6Lnh/+5L3rwxj8A9kI44csaU6CvndJ/B yIf5DwmxAP86TODKF89DYmmRR1JgNaRNsWr5ogMqVnWnW4FaY06f1wa6Lu999cw= X-Google-Smtp-Source: AGHT+IG8bdtmDIjJoewsUDOzXhYe9O8LxU3KHsSD/oDH0pLrXdw2OZ6XdnS/HFUDQCY5WOf2XLwJog== X-Received: by 2002:a05:6a00:4f8f:b0:6e4:ce30:ae1 with SMTP id ld15-20020a056a004f8f00b006e4ce300ae1mr43684pfb.20.1708635510328; Thu, 22 Feb 2024 12:58:30 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::7619]) by smtp.gmail.com with ESMTPSA id y5-20020a62ce05000000b006e2dde36edesm11444010pfg.120.2024.02.22.12.58.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 12:58:30 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-filesystems][PATCH 2/4] python3-looseversion: Add recipe Date: Thu, 22 Feb 2024 12:58:25 -0800 Message-ID: <20240222205827.2813212-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240222205827.2813212-1-raj.khem@gmail.com> References: <20240222205827.2813212-1-raj.khem@gmail.com> 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 ; Thu, 22 Feb 2024 20:58:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/108995 Needed by fuse3 ptests Signed-off-by: Khem Raj --- .../python3-looseversion_1.3.0.bb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 meta-filesystems/recipes-support/python3-looseversion/python3-looseversion_1.3.0.bb diff --git a/meta-filesystems/recipes-support/python3-looseversion/python3-looseversion_1.3.0.bb b/meta-filesystems/recipes-support/python3-looseversion/python3-looseversion_1.3.0.bb new file mode 100644 index 0000000000..323ddb4157 --- /dev/null +++ b/meta-filesystems/recipes-support/python3-looseversion/python3-looseversion_1.3.0.bb @@ -0,0 +1,14 @@ +# Copyright (C) 2024 Khem Raj +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "Version numbering for anarchists and software realists" +HOMEPAGE = "https://github.com/effigies/looseversion" +LICENSE = "PSF-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d5605fc335ce1bab614032468d0a1e00" + +DEPENDS = "python3-hatchling-native" +SRC_URI[sha256sum] = "ebde65f3f6bb9531a81016c6fef3eb95a61181adc47b7f949e9c0ea47911669e" + +inherit pypi python_hatchling + +PYPI_PACKAGE = "looseversion" From patchwork Thu Feb 22 20:58:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 39950 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 8B015C48BF8 for ; Thu, 22 Feb 2024 20:58:40 +0000 (UTC) Received: from mail-oo1-f48.google.com (mail-oo1-f48.google.com [209.85.161.48]) by mx.groups.io with SMTP id smtpd.web10.24572.1708635513221809421 for ; Thu, 22 Feb 2024 12:58:33 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Cg2SQKHK; spf=pass (domain: gmail.com, ip: 209.85.161.48, mailfrom: raj.khem@gmail.com) Received: by mail-oo1-f48.google.com with SMTP id 006d021491bc7-59fdcf8ebbcso132670eaf.3 for ; Thu, 22 Feb 2024 12:58:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708635512; x=1709240312; darn=lists.openembedded.org; 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=ukkXGd89MVFjiDQWPh6zEE9IRwT+Yv9QhY+EwmjizLc=; b=Cg2SQKHKqrRa66AX/FB8d4u9yTV+IQANfnenlLcuy0ybv6JfmYlr9frFi9qC5ylsEc 1pgqQolAw71fDbgC05HddfITY/QN6W3VXuNUGn6CZbVvp+6AcF0F8dzND/mnM5o8hkuc Ooz9VZOmic8V2RjofPbac+omhaaL6FiDHJiY5HvIxgIfM73jrHzakcZKWj4AOn3EU5GY VKBB2CeVC8M4aBUAHjvanUXPFtZjawhEGXNCPwTdOpW4ng+vGQmggpe1YzBbdaAEbOoi 74ZZ7xG9JPN8e7cZ1uxP8Vxh4+Gb/3SCDliGetNOzTps8QH2W5JfPaHJ3fJOrPxXDrBR 1HbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708635512; x=1709240312; 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=ukkXGd89MVFjiDQWPh6zEE9IRwT+Yv9QhY+EwmjizLc=; b=SvogwBt7SrgXJZ2IxNGQSDzyahG+78Jj1CELYwqKjtQzZ/53eHEIMc6k/zF6WJe6PS ayZ4/gcuE50D7gimXRbpFPJMOxUwOlgaJDy+dJ/uSCY9nifRpaiACX9a/LPp1E4JOENi g67fCOS68CGcX7h+eWfHYYdWlpjOxS8m7YdnaKQN7KQAtr6weJRA8PaRx8NSUcm9kwcs xAMSfmxJdlufwO7iYck7v5IULrd+Gt4M3l1SmBW5EIPHj+fHJ0+EduZkSkcEi2+dibUC KU4nwElPz38KG1dGy1U86joIemsgsM0rW3/L7lFe7S6CDvtPIXmFwmVUFyFd37VFxeW+ ZS9Q== X-Gm-Message-State: AOJu0YyFa63sfmrsGevrkSzr9cACAV12nWh0e2by5FPXdHMue6HPe3EP b4rHyadzre1zVHK8p8N6ngWcq+Mw9rkMCyfQHfeVPZCuFP1h77+eLVw2bqQZbP4= X-Google-Smtp-Source: AGHT+IEj9UxTvhk+Wol9BCr2iAKBUXC9ZNL2aMeOoJi/fjS51aX3mvRE9hrV+8xOSruJ68jKHVMBlg== X-Received: by 2002:a05:6358:2787:b0:17b:602f:24c6 with SMTP id l7-20020a056358278700b0017b602f24c6mr6545901rwb.24.1708635511919; Thu, 22 Feb 2024 12:58:31 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::7619]) by smtp.gmail.com with ESMTPSA id y5-20020a62ce05000000b006e2dde36edesm11444010pfg.120.2024.02.22.12.58.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 12:58:30 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-filesystems][PATCH 3/4] sshfs-fuse: Fix ptest builds with python 3.12 Date: Thu, 22 Feb 2024 12:58:26 -0800 Message-ID: <20240222205827.2813212-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240222205827.2813212-1-raj.khem@gmail.com> References: <20240222205827.2813212-1-raj.khem@gmail.com> 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 ; Thu, 22 Feb 2024 20:58:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/108996 Signed-off-by: Khem Raj --- ...1f8aa0899268ec02b2f54849352df92a3a1d.patch | 34 +++++++++++++++++++ ...8ae1be99571a88b8439b027abe6349b74658.patch | 31 +++++++++++++++++ .../sshfs-fuse/sshfs-fuse_3.7.3.bb | 6 +++- 3 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/03ee1f8aa0899268ec02b2f54849352df92a3a1d.patch create mode 100644 meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/a1d58ae1be99571a88b8439b027abe6349b74658.patch diff --git a/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/03ee1f8aa0899268ec02b2f54849352df92a3a1d.patch b/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/03ee1f8aa0899268ec02b2f54849352df92a3a1d.patch new file mode 100644 index 0000000000..63cdc57b44 --- /dev/null +++ b/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/03ee1f8aa0899268ec02b2f54849352df92a3a1d.patch @@ -0,0 +1,34 @@ +From 03ee1f8aa0899268ec02b2f54849352df92a3a1d Mon Sep 17 00:00:00 2001 +From: Gabriel Staples +Date: Tue, 22 Dec 2020 23:33:55 -0800 +Subject: [PATCH] pytest.ini: fix test warning + +Warning: + +``` +test/util.py:99 + sshfs/build/test/util.py:99: PytestUnknownMarkWarning: Unknown pytest.mark.uses_fuse - is this a typo? + You can register custom marks to avoid this warning - for details, see https://docs.pytest.org/en/stable/mark.html + return pytest.mark.uses_fuse() +``` + +References for the fix: + +1. https://stackoverflow.com/questions/60806473/pytestunknownmarkwarning-unknown-pytest-mark-xxx-is-this-a-typo/60813297#60813297 +1. https://docs.pytest.org/en/stable/mark.html + +Upstream-Status: Submitted [https://github.com/libfuse/sshfs/pull/238] +Signed-off-by: Khem Raj +--- + test/pytest.ini | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/test/pytest.ini b/test/pytest.ini +index 95161546..7a7efed4 100644 +--- a/test/pytest.ini ++++ b/test/pytest.ini +@@ -1,2 +1,4 @@ + [pytest] + addopts = --verbose --assert=rewrite --tb=native -x -r a ++markers = ++ uses_fuse diff --git a/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/a1d58ae1be99571a88b8439b027abe6349b74658.patch b/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/a1d58ae1be99571a88b8439b027abe6349b74658.patch new file mode 100644 index 0000000000..e76dbd5059 --- /dev/null +++ b/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/a1d58ae1be99571a88b8439b027abe6349b74658.patch @@ -0,0 +1,31 @@ +From a1d58ae1be99571a88b8439b027abe6349b74658 Mon Sep 17 00:00:00 2001 +From: Gabriel Staples +Date: Tue, 22 Dec 2020 23:26:40 -0800 +Subject: [PATCH] Fix deprecated warning in conftest.py + +``` +test/conftest.py:66 + sshfs/build/test/conftest.py:66: PytestDeprecationWarning: @pytest.yield_fixture is deprecated. + Use @pytest.fixture instead; they are the same. + @pytest.yield_fixture(autouse=True) +``` + +Upstream-Status: Submitted [https://github.com/libfuse/sshfs/pull/238] +Signed-off-by: Khem Raj +--- + test/conftest.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/conftest.py b/test/conftest.py +index 70cd0c62..d58d45b2 100644 +--- a/test/conftest.py ++++ b/test/conftest.py +@@ -63,7 +63,7 @@ def register_output(self, pattern, count=1, flags=re.MULTILINE): + # relies on tests running sequential (i.e., don't dare to use e.g. the xdist + # plugin) + current_capfd = None +-@pytest.yield_fixture(autouse=True) ++@pytest.fixture(autouse=True) + def save_cap_fixtures(request, capfd): + global current_capfd + capfd.false_positives = [] diff --git a/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.3.bb b/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.3.bb index c85483759e..5a926dac0c 100644 --- a/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.3.bb +++ b/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.3.bb @@ -5,7 +5,10 @@ LICENSE = "GPL-2.0-only" DEPENDS = "glib-2.0 fuse3" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "git://github.com/libfuse/sshfs;branch=master;protocol=https" +SRC_URI = "git://github.com/libfuse/sshfs;branch=master;protocol=https \ + file://03ee1f8aa0899268ec02b2f54849352df92a3a1d.patch \ + file://a1d58ae1be99571a88b8439b027abe6349b74658.patch \ +" SRCREV = "c91eb9a9a992f1a36c49a8e6f1146e45b5e1c8e7" S = "${WORKDIR}/git" @@ -18,6 +21,7 @@ SRC_URI += " \ RDEPENDS:${PN}-ptest += " \ python3-pytest \ bash \ + fuse \ " do_install_ptest() { From patchwork Thu Feb 22 20:58:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 39948 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 7ABD8C54791 for ; Thu, 22 Feb 2024 20:58:40 +0000 (UTC) Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by mx.groups.io with SMTP id smtpd.web10.24573.1708635514468891006 for ; Thu, 22 Feb 2024 12:58:34 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Y0ZuSrMw; spf=pass (domain: gmail.com, ip: 209.85.210.174, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-6e471caaa71so62323b3a.2 for ; Thu, 22 Feb 2024 12:58:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708635513; x=1709240313; darn=lists.openembedded.org; 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=LYsWYWAUihSIf0HOlh3sHZVJCJxWST2EY324zNy6seg=; b=Y0ZuSrMwN6kXnaERPqs2aHRrMXmlqMgZKHdlE3IFeMWBodEdOHZwGb1Tp198UTxX8D wRod4yQc0fI5YPXMdQIIB+tmQLN6t++BfKwwqaMAqH645VOMQwSO46UArUBx7axIcosQ baU/bLkvy/GGwZSBBqQCHzl6owi8oI/7c4DUYc7KHrcNZ7iI7TgFepSQtIg3MBtEDzG3 pqh8f0u+4jR9nv1+VuXzYJVKJZNoimTm8gy38TbwDnVtZDvZrj5xqoUMCB3qLwA0Psz8 SoFtxUU5+7MEA6A1Kdxf1iuv65i8UIXjim6VmcViVeWa9+PWVXz4poxfAJlsAl0ehZqQ 299w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708635514; x=1709240314; 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=LYsWYWAUihSIf0HOlh3sHZVJCJxWST2EY324zNy6seg=; b=HxHtbaYz8VF6M/TRyhFGMfj/EoDQfnWFF5tifDfUNiyheVFfGMSC4VT5CfEhrfbFrt MpkEuO0+a7WBgA2ZkbL/R+GCL6vi8ghT8XfKIQUVyX4B84JNupiUqVjpFn24uWgKT5RI hnqpLC6xDPdidgWE9Fwkjvs3m/fg32WWL1NpTdlunEWLYxJ+mJSqlwdjdwYKEGdR1ppj pTamVsi6O6K4m52wCwauwXuUpRpSq4ZKZ2ZHlxGRqGRepO8jwglP1pqkLwG2A0rL8n6k UWMCG2kwIKpD42JYfvuIz6Ux6Jl/59pD0gZ3ZF2PK7jsrNqecwwP81jdSn5Sr4heCyaY 7E8w== X-Gm-Message-State: AOJu0YyVjFh5+3yxddSqtDpuY9ROEjHKc28xN/7kGOa7i79IJHA43M0i qdJ9ns6ZmNmynEJ5HOxYgaKZUyoRW5aEvL/ogy4fd2jvpc2QycuTa+gFWAXFbIE= X-Google-Smtp-Source: AGHT+IEXbiAXezGKVXr0Szy9OaKowTRCjUX3UZQFzYWbRDmtHjyh75yItQerlUnFc/80xrT5FpvdLg== X-Received: by 2002:a05:6a20:8927:b0:19e:487e:3994 with SMTP id i39-20020a056a20892700b0019e487e3994mr17781876pzg.57.1708635513485; Thu, 22 Feb 2024 12:58:33 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::7619]) by smtp.gmail.com with ESMTPSA id y5-20020a62ce05000000b006e2dde36edesm11444010pfg.120.2024.02.22.12.58.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 12:58:32 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-filesystems][PATCH 4/4] meta-filesystems: Add meta-filesystems-image-ptest Date: Thu, 22 Feb 2024 12:58:27 -0800 Message-ID: <20240222205827.2813212-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240222205827.2813212-1-raj.khem@gmail.com> References: <20240222205827.2813212-1-raj.khem@gmail.com> 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 ; Thu, 22 Feb 2024 20:58:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/108997 This will help in running ptests like core layer, right now there are just 3 but I hope to get more contributions now that infra is in place to run all ptests bitbake meta-filesystems-image-ptest-all to run a single recipe ptests bitbake meta-filesystems-image-ptest-fuse3 Signed-off-by: Khem Raj --- .../ptest-packagelists-meta-filesystems.inc | 18 +++++++++ .../meta-filesystems-image-ptest-all.bb | 25 ++++++++++++ .../meta-filesystems-image-ptest-fast.bb | 5 +++ .../images/meta-filesystems-image-ptest.bb | 40 +++++++++++++++++++ 4 files changed, 88 insertions(+) create mode 100644 meta-filesystems/conf/include/ptest-packagelists-meta-filesystems.inc create mode 100644 meta-filesystems/recipes-filesystems/images/meta-filesystems-image-ptest-all.bb create mode 100644 meta-filesystems/recipes-filesystems/images/meta-filesystems-image-ptest-fast.bb create mode 100644 meta-filesystems/recipes-filesystems/images/meta-filesystems-image-ptest.bb diff --git a/meta-filesystems/conf/include/ptest-packagelists-meta-filesystems.inc b/meta-filesystems/conf/include/ptest-packagelists-meta-filesystems.inc new file mode 100644 index 0000000000..f57bbab930 --- /dev/null +++ b/meta-filesystems/conf/include/ptest-packagelists-meta-filesystems.inc @@ -0,0 +1,18 @@ +# +# Lists of the ptest in meta-filesystems, sorted into two sets by the time they take +# Please keep these sorted in alphabetical order +# +# A first pass at getting all meta-filesystems recipes which inherit ptest +# meta_filesystems_ptest_recipes=$(bitbake-layers show-recipes --recipes-only --layer meta-filesystems --inherits ptest --bare | sed -e '1,/=== Matching recipes: ===/d') +# ptests which take less than ~30s each + +PTESTS_FAST_META_FILESYSTEMS = "\ + e2tools \ + fuse3 \ +" + +PTESTS_SLOW_META_FILESYSTEMS = "\ +" +PTESTS_PROBLEMS_META_FILESYSTEMS = "\ + sshfs-fuse \ +" diff --git a/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-ptest-all.bb b/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-ptest-all.bb new file mode 100644 index 0000000000..ffbfa1a3f6 --- /dev/null +++ b/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-ptest-all.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Recipe to trigger execution of all meta-filesystems ptest images." +HOMEPAGE = "https://www.openembedded.org/" + +LICENSE = "MIT" + +inherit features_check nopackages +REQUIRED_DISTRO_FEATURES = "ptest" + +require conf/include/ptest-packagelists-meta-filesystems.inc + +# Include the full set of ptests +PTESTS_META_FILESYSTEMS = "${PTESTS_FAST_META_FILESYSTEMS} ${PTESTS_SLOW_META_FILESYSTEMS} ${PTESTS_PROBLEMS_META_FILESYSTEMS}" + +do_testimage[noexec] = "1" +do_testimage[depends] = "${@' '.join(['meta-filesystems-image-ptest-'+x+':do_testimage' for x in d.getVar('PTESTS_META_FILESYSTEMS').split()])}" + +do_build[depends] = "${@' '.join(['meta-filesystems-image-ptest-'+x+':do_build' for x in d.getVar('PTESTS_META_FILESYSTEMS').split()])}" + +# normally image.bbclass would do this +EXCLUDE_FROM_WORLD = "1" + +python () { + if bb.utils.contains('IMAGE_CLASSES', 'testimage', True, False, d): + bb.build.addtask("do_testimage", "", "", d) +} diff --git a/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-ptest-fast.bb b/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-ptest-fast.bb new file mode 100644 index 0000000000..0eb5344d9e --- /dev/null +++ b/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-ptest-fast.bb @@ -0,0 +1,5 @@ +require meta-filesystems-image-ptest-all.bb + +DESCRIPTION = "Recipe to trigger execution of all fast meta-filesystems ptest images." + +PTESTS_META_OE = "${PTESTS_FAST_META_FILESYSTEMS}" diff --git a/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-ptest.bb b/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-ptest.bb new file mode 100644 index 0000000000..90d6a92c1b --- /dev/null +++ b/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-ptest.bb @@ -0,0 +1,40 @@ +inherit features_check +REQUIRED_DISTRO_FEATURES = "ptest" + +require recipes-core/images/core-image-minimal.bb +require conf/include/ptest-packagelists-meta-filesystems.inc + +SUMMARY = "meta-filesystems ptest test image" + +DESCRIPTION += "Also including the ${MCNAME} ptest package." +HOMEPAGE = "https://www.openembedded.org/" + +PTESTS_META_FILESYSTEMS = "${PTESTS_SLOW_META_FILESYSTEMS} ${PTESTS_FAST_META_FILESYSTEMS} ${PTESTS_PROBLEMS_META_FILESYSTEMS}" + +IMAGE_INSTALL:append = " ${MCNAME}-ptest openssh" + +BBCLASSEXTEND = "${@' '.join(['mcextend:'+x for x in d.getVar('PTESTS_META_FILESYSTEMS').split()])}" + +# The image can be sufficiently large (~1.8GB) that we need to be careful that it fits in a live +# image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the +# box) and explicitly add up to 1500MB. +IMAGE_OVERHEAD_FACTOR = "1.0" +IMAGE_ROOTFS_EXTRA_SPACE = "324288" +# If a particular ptest needs more space, it can be customized: +#IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend- = "1024288" + +# ptests need more memory than standard to avoid the OOM killer +QB_MEM = "-m 1024" +# If a particular ptest needs more memroy, it can be customized: +#QB_MEM:virtclass-mcextend- = "-m 4096" + +TEST_SUITES = "ping ssh parselogs ptest" + +# Sadly at the moment the full set of ptests is not robust enough and sporadically fails in random places +PTEST_EXPECT_FAILURE = "1" + +python () { + if not d.getVar("MCNAME"): + raise bb.parse.SkipRecipe("No class extension set") +} +