From patchwork Sun Apr 5 14:43:08 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 85274 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 B5922E9D804 for ; Sun, 5 Apr 2026 14:43:18 +0000 (UTC) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.36093.1775400195185361668 for ; Sun, 05 Apr 2026 07:43:15 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=UMGnIZDb; spf=pass (domain: linuxfoundation.org, ip: 209.85.221.47, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-43d04fc3bf2so1795240f8f.3 for ; Sun, 05 Apr 2026 07:43:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1775400193; x=1776004993; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=JJsRcodIaO4xSBXO2hCfcxvKiDL6AIIBCRbvg0ZAVIU=; b=UMGnIZDbH5ICDWH6JiXykMKAtsJE1d4Ut6bZtYwAOf1TuOydUOGlvWFeFg+fiKx3PB bLB6sOrXL9e3uD+AIw/UxUq+uITfB2udr+Y2cin2gDukfhK+06Ee5ZKLzi4WL0ijlm3H MB02i42lDjcmxf8W2KuQk6fAsr4CJj+24vLqg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775400193; x=1776004993; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=JJsRcodIaO4xSBXO2hCfcxvKiDL6AIIBCRbvg0ZAVIU=; b=Xnid3GNL+h4Kyyn4YEIzijqanObHNnONbBiR8RnlbEhP2BY6skhDGq//TSEmhh/JWG 8hFouyNBRewYj8C5ZRQdVIquI0CNC6P/Xz5M/hgOkYPagSHPEXKVoTq0YEguTD3aJAIi vT1mJkC6S8iPJjMR7dh63GyPx2Jz9z0UUbI/dKl/ubZeeLR3o7xMfVoaIHvCHI3CTdNA aR4cRS6OylOg65wZckzPUcuszr7VuPTEzE6cdXFvF2j3xo8FLSfavOeYIr2tUpMcMv1g d60hisAweZUOABY0x5L5SWiMJue0vGO1AZA3r+PYEjj/FlWBtN+aix2MDGLsK8/ZSULF 5MYQ== X-Gm-Message-State: AOJu0YygMsm7n19VNlip11bCxun9RgUUu4IUo1svdED+Tn5Kr6RdZ1nP n5RWDsrRsVMQ724642miyhF+jCHFpJxXUYuMQZY6RI+281Bdinfgg2c3WX8ZAcCxnd2FAJHCKcw sJWb+ X-Gm-Gg: AeBDieue+lVSELlBIyn8TqvJ1RB77a8rk4a+cHxKc9vDILv+3csSlS1NT0vKr1Ktz6I fZ3Ah2xybVVwu3YyquzA3XZC1IUhACBssvBc+ea2dm4MoewqQJNrVfFHLdv0TzLzJ13/gdJFQ/W X1QtygsG+kIEuz0QRxjsp4xXjwYOLSBlZR5f9EYVKAr8iAkoo/bZdRlTreVNeknigxS//bWu/zE 6aDq9n04Ie32xaIggp4gUL9lZqLL4qbNDMUffkUrKjVwE2aieFbTKYeNlHNqS3ba8MJ3X6cNuZD LhMmCUqa7zV9a5McoNLmw3mW4JCOX8Uo4SivbnvNzYNjv76mCSYBfgkn7a4OejPCQz5tVqX9Q/8 ui4Oesl2QJylhpTUYozyS3N3dtc0P9LO55KD76X7JYutMbn4YvmomQd8NmUCxk7+6OJsl0VAXiM hBbm0FQQOQjV8BSl5YHKNpIHnthBNNxttjOAXKrSh+pFe1DExvEGmG X-Received: by 2002:a05:6000:2dc1:b0:439:c279:32df with SMTP id ffacd0b85a97d-43d292e1f30mr14586104f8f.35.1775400192862; Sun, 05 Apr 2026 07:43:12 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:5e42:a555:17a8:9bbc]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43d1e2c5468sm32474083f8f.13.2026.04.05.07.43.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Apr 2026 07:43:12 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/4] image_types_wic: Add files/wic to the search path for wks files Date: Sun, 5 Apr 2026 15:43:08 +0100 Message-ID: <20260405144311.3734472-1-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 05 Apr 2026 14:43:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/234631 With the move of wic to a standalone tool, "files/wic" makes the most logical place to look for files in the standard layer structure. Add this to the search path. Signed-off-by: Richard Purdie --- meta/classes-recipe/image_types_wic.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes-recipe/image_types_wic.bbclass b/meta/classes-recipe/image_types_wic.bbclass index f613c59b2cb..cd1131a7ccc 100644 --- a/meta/classes-recipe/image_types_wic.bbclass +++ b/meta/classes-recipe/image_types_wic.bbclass @@ -45,7 +45,7 @@ inherit_defer ${@bb.utils.contains('INITRAMFS_IMAGE_BUNDLE', '1', 'kernel-artifa WKS_FILE ??= "${IMAGE_BASENAME}.${MACHINE}.wks" WKS_FILES ?= "${WKS_FILE} ${IMAGE_BASENAME}.wks" -WKS_SEARCH_PATH ?= "${THISDIR}:${@':'.join('%s/wic' % p for p in '${BBPATH}'.split(':'))}:${@':'.join('%s/scripts/lib/wic/canned-wks' % l for l in '${BBPATH}:${COREBASE}'.split(':'))}" +WKS_SEARCH_PATH ?= "${THISDIR}:${@':'.join('%s/files/wic' % p for p in '${BBPATH}'.split(':'))}:${@':'.join('%s/wic' % p for p in '${BBPATH}'.split(':'))}:${@':'.join('%s/scripts/lib/wic/canned-wks' % l for l in '${BBPATH}:${COREBASE}'.split(':'))}" WKS_FULL_PATH = "${@wks_search(d.getVar('WKS_FILES').split(), d.getVar('WKS_SEARCH_PATH')) or ''}" def wks_search(files, search_path): From patchwork Sun Apr 5 14:43:09 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 85276 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 E30A5E9D80B for ; Sun, 5 Apr 2026 14:43:18 +0000 (UTC) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.36094.1775400195757730260 for ; Sun, 05 Apr 2026 07:43:16 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=FtIUM3E1; spf=pass (domain: linuxfoundation.org, ip: 209.85.221.54, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-43b9d3ebed5so3089251f8f.1 for ; Sun, 05 Apr 2026 07:43:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1775400194; x=1776004994; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=zJoDX8zhKtMN47gXeP7I0PVIeO9RzWivP23rEYqwt5w=; b=FtIUM3E13gU+zZP+4IIj5KTrB64Se6nrdA+Uqlm+ovxkHFGy+F5ADKOYm2xlPsPmkg JOnAQmRAZs8B/BExGVyJPfJqYi7obMsttZm1R6fWNbtGlMZZlC5TAKRamZpkFPxJNaKO kOglLQUbObPqzjX7WSVbnX+JhhjZCAA6vqurE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775400194; x=1776004994; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=zJoDX8zhKtMN47gXeP7I0PVIeO9RzWivP23rEYqwt5w=; b=cRenN11ImwXj1RjE2V5jooQMq6RTsFBFU61JrMItLQdH1wHLz1j9/Wb2frxEAOhGO6 A8iuzTrAGEMTrU48aAF8gWNSC0nnLOFKOu3eBaf27xxgIkkg5BEi9lo4EoRaVZKZ7iAw Zwh9W88baMeCGDxGNPRjBmxL5mPw3OYNT3NA64DnL+BM/0fF4LD2Z7aX6K8PkuGU8bzG m+TLE9O4m+lQc5emLvWFQfg3BwlCujbLplfoo2rR/87ftBjJKGTyaLeW3qMRUEWMa1rb D/U3uugfdcMIRwaHa0nuHwEwGEje9lG7gGN529RgK2JUmujHPS3uuER8wTuGAtBxyz6F VqZg== X-Gm-Message-State: AOJu0Yy626ffguf9KfpIxHl5+XTeVnqyXpwf6TXwGUyMjX8mVf8u55HT sSrk66uRV9xmDBbmrBD3RXt7eLu/yRyrwZcsa2WaZfxNwZEEC9421W9B7nWfWmZqMhUltd9eb/6 wbihp X-Gm-Gg: AeBDieuXSB98BR2bJqmdTVBNWUfeKv6bpxo84pACZpaR1gJWXiXcnhvflHNzxRdFyvi mKae7GC8On9y1khnq2uEc3W9MDp8wHgtgU3EZ8BSRi9v+9OZNTTcDEIcYODZBX0hBkz9OFczxwB MuZXacOnQFr2rwxzTY239jsreq+KzP+GNl8vioSMpYyyam83DlGT5OUzc4iYo4JMEfRAQ69Yyq3 PYHxAUJRzrnN+V2PrGKNhF+XrODrkd11YoBOgp9j/4mIKdemRhSUo89g9Alm8cglXcLkIMYdgEA s5X5CNjFm6I9605YFbEHXnP3/FcbZMnt8geW/ZGXuolDuKqMNuCzTTKQXSBxA+sNdQFYw4lM674 XjD2rA1m7aCRZnle63JGpfxCDiD4VPN3AWR0QGoD6FNJi09JNO7/vw6CCVOUtU7QBRU426aCd1g qSpn3Vy0sybEfwSf0MntVY3yU2y2iIHXaq5WQIrMrKqVzUndpt5SMv X-Received: by 2002:a05:6000:1acf:b0:43b:498f:b039 with SMTP id ffacd0b85a97d-43d2926ae4fmr13385093f8f.9.1775400193723; Sun, 05 Apr 2026 07:43:13 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:5e42:a555:17a8:9bbc]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43d1e2c5468sm32474083f8f.13.2026.04.05.07.43.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Apr 2026 07:43:13 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/4] sanity: Add check for old wks/wic paths Date: Sun, 5 Apr 2026 15:43:09 +0100 Message-ID: <20260405144311.3734472-2-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260405144311.3734472-1-richard.purdie@linuxfoundation.org> References: <20260405144311.3734472-1-richard.purdie@linuxfoundation.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 05 Apr 2026 14:43:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/234632 To allow us to clean up the old wic/wks search paths and standardise, detect the old locations and show the user a sanity check error if they exist. Signed-off-by: Richard Purdie --- meta/classes-global/sanity.bbclass | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/meta/classes-global/sanity.bbclass b/meta/classes-global/sanity.bbclass index 2e486966a93..1a490f8d618 100644 --- a/meta/classes-global/sanity.bbclass +++ b/meta/classes-global/sanity.bbclass @@ -839,6 +839,13 @@ def check_sanity_version_change(status, d): "An error occurred during checking the C++ toolchain for '--std=gnu++20' support. " "Please use a g++ compiler that supports C++20 (e.g. g++ version 10 onwards).")) + # Check there aren't obsolete wic/wks directories + for component in d.getVar("BBPATH").split(":") + d.getVar("BBLAYERS").split(): + for subcomponent in ['wic', 'scripts/lib/wic/canned-wks']: + testpath = os.path.join(component, subcomponent) + if os.path.exists(testpath): + status.addresult("wic/wks files at %s need to be moved to files/wic within the layer to be found/used\n" % testpath) + def sanity_check_locale(d): """ Currently bitbake switches locale to en_US.UTF-8 so check that this locale actually exists. From patchwork Sun Apr 5 14:43:10 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 85277 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 C7289E9D809 for ; Sun, 5 Apr 2026 14:43:18 +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.msgproc02-g2.36228.1775400197049165347 for ; Sun, 05 Apr 2026 07:43:17 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=dddHeFLw; spf=pass (domain: linuxfoundation.org, ip: 209.85.221.45, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-43b949bf4easo2878369f8f.0 for ; Sun, 05 Apr 2026 07:43:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1775400195; x=1776004995; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=EkZx3u5NLQMBPcySLOewFKpwJ0JCsGSm4huSicDbFSs=; b=dddHeFLwpFHTWkpRlC6DcWW16c5m9hYi1UnEDx3BXLe+v4xzE4qZrp/644KxnvksFf MYPtQKyAx1LsHWyXOsoBVaNhiqoZvmH/Qb4PWvGtUEzTRfx5wB9mUZAdoI7YipyTAh4a +824Z4KfI31VHE7wPDc2TPUiV7xw0qgtVaLs8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775400195; x=1776004995; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=EkZx3u5NLQMBPcySLOewFKpwJ0JCsGSm4huSicDbFSs=; b=fQ0DmeZkDaWYmAWnWEpQF9FZlQfckeBzugd3twgI585Bd/y6T/tyn8Ahl9Ku6n+TQF ug0QlwZf92a9+s4n9niaS0o1LNXZrIHx8x9fmO3uDJWkjP2AsJYfyE/I+PRvlmAS7sFx 2fh2iaXI5KGaIzXoCn0Y8Fpz5MvdumPQOAVfrTfaPOGcF/LZZrDrnfxmdDVCZsyl0HPK BKASCtwRSIcTdTR0jQuz7wkp0asPGwmBYKJKJwr28gX2Qt0xyTE/DzweSyJnTcq8/rBp X685nUfvxVhrXRTkPYZbZaOcf0o1AQUEaTM+bwJH2Fm2zqf/mWIpWlhdAk2wdvP6XT8J uGZg== X-Gm-Message-State: AOJu0YyXrmca0yx7XYe+TMPjSvcOeqTYmUyniWL+M5P0R1f+wsmwuO90 fOVrn93GYBp6i5OsMDBR82q7UW2GNJldrWnS4EaOt1x8O6HUJ27Hi/o7brySr3PQ/rP6OfIMWWy vzUJ3 X-Gm-Gg: AeBDievgY+0HgsR7BzHH+ssckhS7X1fBsfkteDvO5+YjLQLlpqIE6CbjQbNQNo4V6l2 v4kZtbA4xv5G7SdBnSDwyiM/UKOnm4z3nBUCm7IdBzbd9fiWkCB01AANeECvsAEp+LX42Z7q4FD lpYrOV0R7Tu+9gNS/iaGIwlb6V+JR6NUWC70K4/qipjNae0xhzN5SaSNeYYHe7dirqJ5g/ElUAu 0g8YHSufNL+WuiIwmZOmuJ72rgP3aGIsGJ/hFhGADJXBR+bwlEimnvrLdet4afbApEpNMiRD2n4 BVl2SAAO9s6E72yJDvpvIHNXj79v14ID/wAO8r5GPvAaZK3VTKj7APRHUn6a3hEqkS1Wu8mJC25 kJMh8i1r8+i5c1YosRLk2RXL71j6OeH+p1CgZ9bsnNv4jhM5W1UqNRh22O9+feUiAL/pz1eveRm iYJkHPbkOhKtEYz2hGEPRwk3mfHrHnn9yxaG6YfhMBvNlVGDxDzUge X-Received: by 2002:a05:6000:25c1:b0:43c:ffd8:e25a with SMTP id ffacd0b85a97d-43d2115ae92mr21829521f8f.5.1775400195008; Sun, 05 Apr 2026 07:43:15 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:5e42:a555:17a8:9bbc]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43d1e2c5468sm32474083f8f.13.2026.04.05.07.43.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Apr 2026 07:43:14 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 3/4] meta-selftest/wic: Move to files/wic Date: Sun, 5 Apr 2026 15:43:10 +0100 Message-ID: <20260405144311.3734472-3-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260405144311.3734472-1-richard.purdie@linuxfoundation.org> References: <20260405144311.3734472-1-richard.purdie@linuxfoundation.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 05 Apr 2026 14:43:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/234633 To align with the new search paths, move the files to the new location. Signed-off-by: Richard Purdie --- meta-selftest/{ => files}/wic/overlayfs_etc.wks.in | 0 meta-selftest/{ => files}/wic/test_biosplusefi_plugin.wks | 0 meta-selftest/{ => files}/wic/test_efi_plugin.wks | 0 .../{ => files}/wic/test_efi_plugin_plain_systemd-boot.wks | 0 meta-selftest/{ => files}/wic/test_empty_plugin.wks | 0 meta-selftest/{ => files}/wic/test_gpt_partition_name.wks | 0 meta-selftest/{ => files}/wic/test_rawcopy_plugin.wks.in | 0 meta-selftest/{ => files}/wic/test_uefikernel.wks | 0 meta-selftest/{ => files}/wic/wictestdisk.wks | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename meta-selftest/{ => files}/wic/overlayfs_etc.wks.in (100%) rename meta-selftest/{ => files}/wic/test_biosplusefi_plugin.wks (100%) rename meta-selftest/{ => files}/wic/test_efi_plugin.wks (100%) rename meta-selftest/{ => files}/wic/test_efi_plugin_plain_systemd-boot.wks (100%) rename meta-selftest/{ => files}/wic/test_empty_plugin.wks (100%) rename meta-selftest/{ => files}/wic/test_gpt_partition_name.wks (100%) rename meta-selftest/{ => files}/wic/test_rawcopy_plugin.wks.in (100%) rename meta-selftest/{ => files}/wic/test_uefikernel.wks (100%) rename meta-selftest/{ => files}/wic/wictestdisk.wks (100%) diff --git a/meta-selftest/wic/overlayfs_etc.wks.in b/meta-selftest/files/wic/overlayfs_etc.wks.in similarity index 100% rename from meta-selftest/wic/overlayfs_etc.wks.in rename to meta-selftest/files/wic/overlayfs_etc.wks.in diff --git a/meta-selftest/wic/test_biosplusefi_plugin.wks b/meta-selftest/files/wic/test_biosplusefi_plugin.wks similarity index 100% rename from meta-selftest/wic/test_biosplusefi_plugin.wks rename to meta-selftest/files/wic/test_biosplusefi_plugin.wks diff --git a/meta-selftest/wic/test_efi_plugin.wks b/meta-selftest/files/wic/test_efi_plugin.wks similarity index 100% rename from meta-selftest/wic/test_efi_plugin.wks rename to meta-selftest/files/wic/test_efi_plugin.wks diff --git a/meta-selftest/wic/test_efi_plugin_plain_systemd-boot.wks b/meta-selftest/files/wic/test_efi_plugin_plain_systemd-boot.wks similarity index 100% rename from meta-selftest/wic/test_efi_plugin_plain_systemd-boot.wks rename to meta-selftest/files/wic/test_efi_plugin_plain_systemd-boot.wks diff --git a/meta-selftest/wic/test_empty_plugin.wks b/meta-selftest/files/wic/test_empty_plugin.wks similarity index 100% rename from meta-selftest/wic/test_empty_plugin.wks rename to meta-selftest/files/wic/test_empty_plugin.wks diff --git a/meta-selftest/wic/test_gpt_partition_name.wks b/meta-selftest/files/wic/test_gpt_partition_name.wks similarity index 100% rename from meta-selftest/wic/test_gpt_partition_name.wks rename to meta-selftest/files/wic/test_gpt_partition_name.wks diff --git a/meta-selftest/wic/test_rawcopy_plugin.wks.in b/meta-selftest/files/wic/test_rawcopy_plugin.wks.in similarity index 100% rename from meta-selftest/wic/test_rawcopy_plugin.wks.in rename to meta-selftest/files/wic/test_rawcopy_plugin.wks.in diff --git a/meta-selftest/wic/test_uefikernel.wks b/meta-selftest/files/wic/test_uefikernel.wks similarity index 100% rename from meta-selftest/wic/test_uefikernel.wks rename to meta-selftest/files/wic/test_uefikernel.wks diff --git a/meta-selftest/wic/wictestdisk.wks b/meta-selftest/files/wic/wictestdisk.wks similarity index 100% rename from meta-selftest/wic/wictestdisk.wks rename to meta-selftest/files/wic/wictestdisk.wks From patchwork Sun Apr 5 14:43:11 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 85275 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 A8269E9D805 for ; Sun, 5 Apr 2026 14:43:18 +0000 (UTC) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.36096.1775400198158771079 for ; Sun, 05 Apr 2026 07:43:18 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=Asd8A52t; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.44, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-488879b2e6aso27778225e9.1 for ; Sun, 05 Apr 2026 07:43:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1775400196; x=1776004996; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=l1QsPQzDa+AeS3dnuKMPE4W3yuqCR6I3V7c7ipGU+FY=; b=Asd8A52tJW1JXp06o3QP4qJ0hs/am0ehCUXQnjzhPJQL8mlY2x2YkHM52NpFLgAGsL xN1dr+PAbUJublhnAXtXR2k+grrNmHcubGh8cqXefoOt20aLWAlYygp6pqLNksjoo+F9 ByxoTBVddpzYbnnz5S7W8mVuB8dQjb0vJW/RE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775400196; x=1776004996; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=l1QsPQzDa+AeS3dnuKMPE4W3yuqCR6I3V7c7ipGU+FY=; b=rFSxvmMOhLjWfH3OCU5pUkV7Oci7uBR39uoZLPCp6D+Ezp11ZrgufRLJ7+x2Z4Niww qhrlbD8kK0vubKiSo+hvD6RJHP4ECtNX9PhylVel11ZMFnMfsJdHameLUtxaBpzaNIRB a3jbwLLH9kTjTQyGzfdCHLrhz4Lr1NxW6vXpL7PgqKAn3eenbr1Ny4FLXdPPqgKO5vlI dM0wB31ab/zAWLVzVa8xGkDsITZGTM4SB4WVQBJsqQJkx6CgJBOgBP12mp6m6dXvY2+7 qCOR9bVdZ87BEjt6yMdtTmE65KMzmg46dYYz+ER4uWc4G5qTWc1EyCPNBUn+w3AJJa7y s0aw== X-Gm-Message-State: AOJu0YzRvNalT+TuRum3Frta6BZ9cA/oQzcy9oZzA1qoUYwhJXxvL4yk yRSiJsP0LDxJirPgeZgN2hWwzF3F8kynpfDtq9cT0NaXBJg+o9acinERU7DGKOx+UBkvFik5wJL acvq0 X-Gm-Gg: AeBDiesn8HOVJ1jVphf1GeXvQJzaDrklpGchZrjCbO0NkxADzcKdTLv5QVpWsHkAHXO UWH42mo5YVa4Ornu3TN2yYFLA4V+IawjCpgpRsIzsVOnmnrwQCmq+PdClZ3eLGeCOSeUCrsLkaj SDKIzlVqGMgtzJQe6TwnE//o6hCvtKwwaHYpiHInKqoAlVXo3Wv5sP9hJkOSyhjoXU3RFfMLC3m y/suhCBN5+uDLR/yLgKfLv1zA1o5s7RlYcvWbRADBgHUQ+7Ym5K+OD1M/Yj/5KH7NTEWRzNZuv9 FfgZ/ivGeP7hkfO1iJRSP/BEybIDgt+YWChPj9OuELBCoDJ0E4xuee6BROErAkc5k287IILA94O LHSbuFigwwh8p9Cvy1E9E1vnGdBzZCAhFTdTw5swljACkxaaPl+9iy9/jcn7iXiEW97+7azkJZj Nm1OcVgzyNKHQynTgQlho2hon7RAprRiS0fxwoUleAK+BMXRRe8q3w X-Received: by 2002:a05:600c:8216:b0:488:ac01:72b6 with SMTP id 5b1f17b1804b1-488ac017468mr31447175e9.21.1775400196117; Sun, 05 Apr 2026 07:43:16 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:5e42:a555:17a8:9bbc]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43d1e2c5468sm32474083f8f.13.2026.04.05.07.43.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Apr 2026 07:43:15 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 4/4] image_types_wic: Simplify search path Date: Sun, 5 Apr 2026 15:43:11 +0100 Message-ID: <20260405144311.3734472-4-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260405144311.3734472-1-richard.purdie@linuxfoundation.org> References: <20260405144311.3734472-1-richard.purdie@linuxfoundation.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 05 Apr 2026 14:43:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/234634 Standardise on one location by default for wic/wks files and simplify the search path accordingly. wic is now using BBPATH instead of BBLAYERS so this needs to be added to WICVARS too. Signed-off-by: Richard Purdie --- meta/classes-recipe/image_types_wic.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/classes-recipe/image_types_wic.bbclass b/meta/classes-recipe/image_types_wic.bbclass index cd1131a7ccc..aa0680561b9 100644 --- a/meta/classes-recipe/image_types_wic.bbclass +++ b/meta/classes-recipe/image_types_wic.bbclass @@ -10,6 +10,7 @@ WICVARS ?= "\ APPEND \ ASSUME_PROVIDED \ BBLAYERS \ + BBPATH \ DEPLOY_DIR_IMAGE \ FAKEROOTCMD \ HOSTTOOLS_DIR \ @@ -45,7 +46,7 @@ inherit_defer ${@bb.utils.contains('INITRAMFS_IMAGE_BUNDLE', '1', 'kernel-artifa WKS_FILE ??= "${IMAGE_BASENAME}.${MACHINE}.wks" WKS_FILES ?= "${WKS_FILE} ${IMAGE_BASENAME}.wks" -WKS_SEARCH_PATH ?= "${THISDIR}:${@':'.join('%s/files/wic' % p for p in '${BBPATH}'.split(':'))}:${@':'.join('%s/wic' % p for p in '${BBPATH}'.split(':'))}:${@':'.join('%s/scripts/lib/wic/canned-wks' % l for l in '${BBPATH}:${COREBASE}'.split(':'))}" +WKS_SEARCH_PATH ?= "${THISDIR}:${@':'.join('%s/files/wic' % p for p in '${BBPATH}'.split(':'))}" WKS_FULL_PATH = "${@wks_search(d.getVar('WKS_FILES').split(), d.getVar('WKS_SEARCH_PATH')) or ''}" def wks_search(files, search_path):