From patchwork Sun Nov 30 09:27:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 4666 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Sun, 30 Nov 2025 10:28:04 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-ed1-f57.google.com (mail-ed1-f57.google.com [209.85.208.57]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 5AU9S2vf005424 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sun, 30 Nov 2025 10:28:02 +0100 Received: by mail-ed1-f57.google.com with SMTP id 4fb4d7f45d1cf-640b8d02165sf4346117a12.2 for ; Sun, 30 Nov 2025 01:28:02 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1764494873; cv=pass; d=google.com; s=arc-20240605; b=ZTTa8hVa/gCzy/gRDJpeKRRaUoZVrgWjAYrw1nHzPglOWiGRMrpMOFZHkD029WGmkT EW9/ty3DbL1mVzZXaK0/GIJnte4vNhUAoPzfzYmWqBVDZOceWCV4uQfv7bi6vWtGQVXe tSsNdMgRww0qrMkxPS5KjlxQrejWJoz/YAuXc3LBDRCsMbmxL2yVMsD+05AUK+dact4a l+2+kp03q2S7tZq3DEsqeoYhgegH6Fsbq1+9djEtyHZBSm+3yRyP3faMesmc6ungrcwu Wa/n8PgUNjYLadQqHwZUA85fJAochmwJJGSP1BD110Hz+Qb1Lri4XiriwDO84VEKJ6fT sF7w== 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:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=O0t2MnbxlfIX7e7ZgMekAFlv7oJrjhVT/v0r0NLCjZY=; fh=W/wUPDp/qDNA+w0nW0KPPOBtwsanvgBZpr8NSYXDbiw=; b=Hsss4ZjptdsbrBXhF0R29ZsiJs6NeOtUX035VxARSbDiYoP0La3WN5BiRLta+R4EMg p66OKPWqBdvLFucN+80RfVBRg5tan5pUW2UV789Pb3J2aVE+zMdKlcoPJ35JiA43rngV 3nN2wzOFfvjbrhKozp8H2KCsqMWl5pU24l+QM4FFkFUW3rVa62nXaEU0kyhD9Exjj9SU 5nzOx+qajQxFiJzSF6Cejd7dkMrbUXT69oYlhSIlyguiyKhT+397lwVjLDzFU0V7Eba8 MeprPBWZ/gIfaCJVm7+oPDqobddDubYgSZ5fOD5UzmS73GDljiB8yOQEXF+OTLvkrNzf xjsw==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Ucudvsp2; spf=pass (google.com: domain of fm-294854-202511300927483467aee798000207ea-uih3wi@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-294854-202511300927483467aee798000207ea-UiH3Wi@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1764494873; x=1765099673; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:to:from :from:to:cc:subject:date:message-id:reply-to; bh=O0t2MnbxlfIX7e7ZgMekAFlv7oJrjhVT/v0r0NLCjZY=; b=JVIz8Y7VC3y2SP6E9D72ivueeUymU6rYbr4/GHBm1TKOHxwIF7a2rIOK81Eifi28NY RRHmo9GBEl2bpUMnqdnnfmP2Ryv6BZZ9arUnD0xftb+iQ4NYTD6SLqDcFHZzfxRjEfSi mmMDf40QiPb0h9jR71XN5I8YrppK25SvNdIzptcvk/oTwPc6UaltQ0EnyH8zeNeWzpRH W1JeLON7aGGQjFswsPU02uKes/FV3GJqrfLToACCDUwkmdIn+HhIik5mGNOpfYw3Or0i uBJOmljhAyWtnrxTVl0bs6Fi0V+miAD+vyTRKzNoh2UHQRTWG1c76ONAamx7FNgNZvZg vEcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764494873; x=1765099673; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=O0t2MnbxlfIX7e7ZgMekAFlv7oJrjhVT/v0r0NLCjZY=; b=rU3rEpOXPxl3Pf3KQdjqSoTUGuX6U82RJueb+9YsvLT9RnaNKX+kphEW7UbiyOxxOd vyleX99UMfSf4fWdOuhw2g6+yVYJCL1wSz1Ec4kzr8ZqknKfFjAoCf45cm7UvnGuqkFP TwYOL9zcHkkR/ii8FP/9dgiADtfaqvxp3OgdhnkcwDGuXrehpxQg4waTw/I/6Xkjvndj 3/DdP+WdnFOq+2lfI2IUeLfqP3m7PP4qVFy4yKX/0kXwJg+7RHxjwW6ri+jXYIhLXoJK k2Pl7vy/rnyo6a/59uPC62rYqFPEdKihQgBJH5Zeh/Y7uni6alLemr1pS1IqQmBd7HsU ypVQ== X-Forwarded-Encrypted: i=2; AJvYcCW0FSr2XRxKdwkCcfYBFqFnb5RNeOSxIZVdgrGNSSmD7rQMY6rJ36F78np8xJtPBI8bh6YO9uc=@isar-build.org X-Gm-Message-State: AOJu0YwCBlIXtTG7ElrzdZwxN1wXzLLdSpAYPEhlsHHBQRh0KqruIhN+ mHWTcoxf/kl14Q8St0zc8U5FfKU8t8Gjg1uRYdYbgjAJEgJUpIFptdYG X-Google-Smtp-Source: AGHT+IG2Jjrz+RZ67iPqAjNyfNJmrmVARGFfu0719v5NDosxAC0B+zpC6NxcWqJ7iSSa80IbrAIHLg== X-Received: by 2002:a05:6402:518a:b0:641:8d6b:88cb with SMTP id 4fb4d7f45d1cf-64555cf06b5mr32536055a12.28.1764494872273; Sun, 30 Nov 2025 01:27:52 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="Ae8XA+ZmSNgn148K+WavhZMpV+wwvK4lAW9PbMu7/Vc4Jo921w==" Received: by 2002:a05:6402:534e:20b0:641:5d3e:7868 with SMTP id 4fb4d7f45d1cf-64749b486bbls3937697a12.1.-pod-prod-04-eu; Sun, 30 Nov 2025 01:27:49 -0800 (PST) X-Received: by 2002:a05:6402:2816:b0:640:9db5:ba2f with SMTP id 4fb4d7f45d1cf-64555cf7197mr33998851a12.30.1764494869406; Sun, 30 Nov 2025 01:27:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1764494869; cv=none; d=google.com; s=arc-20240605; b=Myuwmw3z/hBSehkQYX0TvFlATTjNkZPOR49Mwxoq7eTyDz0SUcjYX4HQNbVZs2attL hFQg7/kWS6k3b6mqFKprMLQpvSCeiGnsKeGdTznGlrslomdCGtjhg1WOs52EXDOFfIhD Lq2tTVxvjH3GwVzhUZvxOsu2aGACd7LTPYb/j6EQ3Xus52g5DYZRzXzPkrqntLzbVuom RPgN23qJs9wb6V+c2/VQSfXzCYnukBvJ772NUYBKvi4d+etvA9cALF2sA6zKL/ow8suK 9wjUSdPnaIz8YJbDEkB4w4jIo1AHRyZ8boVHdxpLi2x9BokxvgSG+8DO186lWvsyAVb/ 8qYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:to:from:dkim-signature; bh=dvSYKVuNhnQ5//bsmDmhWxkPk2AYK5Bp+Y+zLG9WAWI=; fh=hOBXq6nisExkIRIwN8IDOmOCLKwX8PM0ANlxQbNMEqA=; b=C5X53et9A4HvFstb7e1GPPanFiA3YL3hlFIVzAaNf2Gi4GltL2nl7+ybWoEQAilYqw EJm06rSmR+vsPS83rO3Nd5sKI1Kl+agbbBTU1Lnbov7ST/zce/I5fNW2xu4BJg0OduTJ qRtcQFDFctKSwniowBmYgNPjxNAFuRaoy5yosajrRMbaQR62aO7rbfRb2j0yJXM/95yS OTO1qAasZJHm2L6pjx3UzqDnD/mreEX1Ys2K1lX8JLnOMGlWwP38QYDIYrSw1ja8v7py aMNhgfPonMYeDxv+A2tSPdStJMp82SKW9BF02tVa1bAtbvB3Ho9Ec6mWbIPisS8Pj9aP O+Gw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Ucudvsp2; spf=pass (google.com: domain of fm-294854-202511300927483467aee798000207ea-uih3wi@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-294854-202511300927483467aee798000207ea-UiH3Wi@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net. [185.136.64.228]) by gmr-mx.google.com with ESMTPS id 4fb4d7f45d1cf-6475101eaeasi144137a12.4.2025.11.30.01.27.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Nov 2025 01:27:49 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-202511300927483467aee798000207ea-uih3wi@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) client-ip=185.136.64.228; Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 202511300927483467aee798000207ea for ; Sun, 30 Nov 2025 10:27:49 +0100 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Subject: [PATCH v3 03/27] meta: Move recipe-pulled classes into classes-recipe Date: Sun, 30 Nov 2025 10:27:23 +0100 Message-ID: <14f4e0f44893e7dd7550e0226e8323f7b9319ed8.1764494867.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Ucudvsp2; spf=pass (google.com: domain of fm-294854-202511300927483467aee798000207ea-uih3wi@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-294854-202511300927483467aee798000207ea-UiH3Wi@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Jan Kiszka Reply-To: Jan Kiszka 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-Spam-Status: No, score=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Jan Kiszka This follows the class types description of yocto [1]. The only class remaining in the classes dir is terminal.bbclass, just like in yocto. [1] https://docs.yoctoproject.org/bitbake/bitbake-user-manual/bitbake-user-manual-intro.html#class-types Signed-off-by: Jan Kiszka --- doc/technical_overview.md | 8 ++++---- doc/user_manual.md | 2 +- meta/{classes => classes-recipe}/bootstrap.bbclass | 0 meta/{classes => classes-recipe}/compat.bbclass | 0 meta/{classes => classes-recipe}/crossvars.bbclass | 0 .../customization-base.bbclass | 0 meta/{classes => classes-recipe}/deb-dl-dir.bbclass | 0 meta/{classes => classes-recipe}/debianize.bbclass | 0 meta/{classes => classes-recipe}/dpkg-base.bbclass | 0 .../dpkg-customization.bbclass | 0 meta/{classes => classes-recipe}/dpkg-gbp.bbclass | 0 meta/{classes => classes-recipe}/dpkg-prebuilt.bbclass | 0 meta/{classes => classes-recipe}/dpkg-raw.bbclass | 0 meta/{classes => classes-recipe}/dpkg-source.bbclass | 0 meta/{classes => classes-recipe}/dpkg.bbclass | 0 meta/{classes => classes-recipe}/essential.bbclass | 0 meta/{classes => classes-recipe}/features_check.bbclass | 0 .../image-account-extension.bbclass | 0 .../image-customizations.bbclass | 0 .../image-locales-extension.bbclass | 0 .../image-postproc-extension.bbclass | 0 .../image-tools-extension.bbclass | 0 meta/{classes => classes-recipe}/image.bbclass | 0 meta/{classes => classes-recipe}/imagetypes.bbclass | 0 .../imagetypes_container.bbclass | 0 meta/{classes => classes-recipe}/imagetypes_vm.bbclass | 0 meta/{classes => classes-recipe}/imagetypes_wic.bbclass | 0 meta/{classes => classes-recipe}/initramfs.bbclass | 0 meta/{classes => classes-recipe}/kbuildtarget.bbclass | 0 meta/{classes => classes-recipe}/multiarch.bbclass | 0 meta/{classes => classes-recipe}/native.bbclass | 0 meta/{classes => classes-recipe}/opensbi.bbclass | 0 meta/{classes => classes-recipe}/patch.bbclass | 0 meta/{classes => classes-recipe}/per-kernel.bbclass | 0 meta/{classes => classes-recipe}/repository.bbclass | 0 meta/{classes => classes-recipe}/rootfs-add-files.bbclass | 0 meta/{classes => classes-recipe}/rootfs.bbclass | 0 meta/{classes => classes-recipe}/sbuild.bbclass | 0 meta/{classes => classes-recipe}/sdk.bbclass | 0 meta/{classes => classes-recipe}/squashfs.bbclass | 0 testsuite/citest.py | 2 +- testsuite/unittests/test_image_account_extension.py | 2 +- 42 files changed, 7 insertions(+), 7 deletions(-) rename meta/{classes => classes-recipe}/bootstrap.bbclass (100%) rename meta/{classes => classes-recipe}/compat.bbclass (100%) rename meta/{classes => classes-recipe}/crossvars.bbclass (100%) rename meta/{classes => classes-recipe}/customization-base.bbclass (100%) rename meta/{classes => classes-recipe}/deb-dl-dir.bbclass (100%) rename meta/{classes => classes-recipe}/debianize.bbclass (100%) rename meta/{classes => classes-recipe}/dpkg-base.bbclass (100%) rename meta/{classes => classes-recipe}/dpkg-customization.bbclass (100%) rename meta/{classes => classes-recipe}/dpkg-gbp.bbclass (100%) rename meta/{classes => classes-recipe}/dpkg-prebuilt.bbclass (100%) rename meta/{classes => classes-recipe}/dpkg-raw.bbclass (100%) rename meta/{classes => classes-recipe}/dpkg-source.bbclass (100%) rename meta/{classes => classes-recipe}/dpkg.bbclass (100%) rename meta/{classes => classes-recipe}/essential.bbclass (100%) rename meta/{classes => classes-recipe}/features_check.bbclass (100%) rename meta/{classes => classes-recipe}/image-account-extension.bbclass (100%) rename meta/{classes => classes-recipe}/image-customizations.bbclass (100%) rename meta/{classes => classes-recipe}/image-locales-extension.bbclass (100%) rename meta/{classes => classes-recipe}/image-postproc-extension.bbclass (100%) rename meta/{classes => classes-recipe}/image-tools-extension.bbclass (100%) rename meta/{classes => classes-recipe}/image.bbclass (100%) rename meta/{classes => classes-recipe}/imagetypes.bbclass (100%) rename meta/{classes => classes-recipe}/imagetypes_container.bbclass (100%) rename meta/{classes => classes-recipe}/imagetypes_vm.bbclass (100%) rename meta/{classes => classes-recipe}/imagetypes_wic.bbclass (100%) rename meta/{classes => classes-recipe}/initramfs.bbclass (100%) rename meta/{classes => classes-recipe}/kbuildtarget.bbclass (100%) rename meta/{classes => classes-recipe}/multiarch.bbclass (100%) rename meta/{classes => classes-recipe}/native.bbclass (100%) rename meta/{classes => classes-recipe}/opensbi.bbclass (100%) rename meta/{classes => classes-recipe}/patch.bbclass (100%) rename meta/{classes => classes-recipe}/per-kernel.bbclass (100%) rename meta/{classes => classes-recipe}/repository.bbclass (100%) rename meta/{classes => classes-recipe}/rootfs-add-files.bbclass (100%) rename meta/{classes => classes-recipe}/rootfs.bbclass (100%) rename meta/{classes => classes-recipe}/sbuild.bbclass (100%) rename meta/{classes => classes-recipe}/sdk.bbclass (100%) rename meta/{classes => classes-recipe}/squashfs.bbclass (100%) diff --git a/doc/technical_overview.md b/doc/technical_overview.md index 2b01021a..82b2ba0f 100644 --- a/doc/technical_overview.md +++ b/doc/technical_overview.md @@ -181,12 +181,12 @@ Isar image that can be customized according to the user requirements: Isar provides the possibility to build Debian packages from sources. This feature works with Debian-like source packages, i.e. the source code tree should contain debian folder. This build process is implemented in -`meta/classes/dpkg.bbclass`. Moreover this process is common for both: native -and cross compilation modes. +`meta/classes-recipe/dpkg.bbclass`. Moreover this process is common for both: +native and cross compilation modes. Another way of creating Debian packages is implemented in -`meta/classes/dpkg-raw.bbclass`. This class can be used for customizations that -are not based on source code that should become a package. +`meta/classes-recipe/dpkg-raw.bbclass`. This class can be used for +customizations that are not based on source code that should become a package. Both consist of the following steps: diff --git a/doc/user_manual.md b/doc/user_manual.md index d197ae7b..20f84f69 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -966,7 +966,7 @@ If it does not fully fit your needs, it probably gives you a good starting point The shell function `deb_debianize` creates a `debian` folder. But it will not overwrite files that already are in WORKDIR. So you can either just call it to fully generate the `debian` folder. Or you combine it with pre-existing parts. -Have a look at meta-isar/recipes-app/samefile/samefile_2.14.bb and meta/classes/debianize.bbclass for an example and the implementation. +Have a look at `meta-isar/recipes-app/samefile/samefile_2.14.bb` and `meta/classes-recipe/debianize.bbclass` for an example and the implementation. Here ISAR's debianize class generates/adds the following files under debian directory: diff --git a/meta/classes/bootstrap.bbclass b/meta/classes-recipe/bootstrap.bbclass similarity index 100% rename from meta/classes/bootstrap.bbclass rename to meta/classes-recipe/bootstrap.bbclass diff --git a/meta/classes/compat.bbclass b/meta/classes-recipe/compat.bbclass similarity index 100% rename from meta/classes/compat.bbclass rename to meta/classes-recipe/compat.bbclass diff --git a/meta/classes/crossvars.bbclass b/meta/classes-recipe/crossvars.bbclass similarity index 100% rename from meta/classes/crossvars.bbclass rename to meta/classes-recipe/crossvars.bbclass diff --git a/meta/classes/customization-base.bbclass b/meta/classes-recipe/customization-base.bbclass similarity index 100% rename from meta/classes/customization-base.bbclass rename to meta/classes-recipe/customization-base.bbclass diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes-recipe/deb-dl-dir.bbclass similarity index 100% rename from meta/classes/deb-dl-dir.bbclass rename to meta/classes-recipe/deb-dl-dir.bbclass diff --git a/meta/classes/debianize.bbclass b/meta/classes-recipe/debianize.bbclass similarity index 100% rename from meta/classes/debianize.bbclass rename to meta/classes-recipe/debianize.bbclass diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes-recipe/dpkg-base.bbclass similarity index 100% rename from meta/classes/dpkg-base.bbclass rename to meta/classes-recipe/dpkg-base.bbclass diff --git a/meta/classes/dpkg-customization.bbclass b/meta/classes-recipe/dpkg-customization.bbclass similarity index 100% rename from meta/classes/dpkg-customization.bbclass rename to meta/classes-recipe/dpkg-customization.bbclass diff --git a/meta/classes/dpkg-gbp.bbclass b/meta/classes-recipe/dpkg-gbp.bbclass similarity index 100% rename from meta/classes/dpkg-gbp.bbclass rename to meta/classes-recipe/dpkg-gbp.bbclass diff --git a/meta/classes/dpkg-prebuilt.bbclass b/meta/classes-recipe/dpkg-prebuilt.bbclass similarity index 100% rename from meta/classes/dpkg-prebuilt.bbclass rename to meta/classes-recipe/dpkg-prebuilt.bbclass diff --git a/meta/classes/dpkg-raw.bbclass b/meta/classes-recipe/dpkg-raw.bbclass similarity index 100% rename from meta/classes/dpkg-raw.bbclass rename to meta/classes-recipe/dpkg-raw.bbclass diff --git a/meta/classes/dpkg-source.bbclass b/meta/classes-recipe/dpkg-source.bbclass similarity index 100% rename from meta/classes/dpkg-source.bbclass rename to meta/classes-recipe/dpkg-source.bbclass diff --git a/meta/classes/dpkg.bbclass b/meta/classes-recipe/dpkg.bbclass similarity index 100% rename from meta/classes/dpkg.bbclass rename to meta/classes-recipe/dpkg.bbclass diff --git a/meta/classes/essential.bbclass b/meta/classes-recipe/essential.bbclass similarity index 100% rename from meta/classes/essential.bbclass rename to meta/classes-recipe/essential.bbclass diff --git a/meta/classes/features_check.bbclass b/meta/classes-recipe/features_check.bbclass similarity index 100% rename from meta/classes/features_check.bbclass rename to meta/classes-recipe/features_check.bbclass diff --git a/meta/classes/image-account-extension.bbclass b/meta/classes-recipe/image-account-extension.bbclass similarity index 100% rename from meta/classes/image-account-extension.bbclass rename to meta/classes-recipe/image-account-extension.bbclass diff --git a/meta/classes/image-customizations.bbclass b/meta/classes-recipe/image-customizations.bbclass similarity index 100% rename from meta/classes/image-customizations.bbclass rename to meta/classes-recipe/image-customizations.bbclass diff --git a/meta/classes/image-locales-extension.bbclass b/meta/classes-recipe/image-locales-extension.bbclass similarity index 100% rename from meta/classes/image-locales-extension.bbclass rename to meta/classes-recipe/image-locales-extension.bbclass diff --git a/meta/classes/image-postproc-extension.bbclass b/meta/classes-recipe/image-postproc-extension.bbclass similarity index 100% rename from meta/classes/image-postproc-extension.bbclass rename to meta/classes-recipe/image-postproc-extension.bbclass diff --git a/meta/classes/image-tools-extension.bbclass b/meta/classes-recipe/image-tools-extension.bbclass similarity index 100% rename from meta/classes/image-tools-extension.bbclass rename to meta/classes-recipe/image-tools-extension.bbclass diff --git a/meta/classes/image.bbclass b/meta/classes-recipe/image.bbclass similarity index 100% rename from meta/classes/image.bbclass rename to meta/classes-recipe/image.bbclass diff --git a/meta/classes/imagetypes.bbclass b/meta/classes-recipe/imagetypes.bbclass similarity index 100% rename from meta/classes/imagetypes.bbclass rename to meta/classes-recipe/imagetypes.bbclass diff --git a/meta/classes/imagetypes_container.bbclass b/meta/classes-recipe/imagetypes_container.bbclass similarity index 100% rename from meta/classes/imagetypes_container.bbclass rename to meta/classes-recipe/imagetypes_container.bbclass diff --git a/meta/classes/imagetypes_vm.bbclass b/meta/classes-recipe/imagetypes_vm.bbclass similarity index 100% rename from meta/classes/imagetypes_vm.bbclass rename to meta/classes-recipe/imagetypes_vm.bbclass diff --git a/meta/classes/imagetypes_wic.bbclass b/meta/classes-recipe/imagetypes_wic.bbclass similarity index 100% rename from meta/classes/imagetypes_wic.bbclass rename to meta/classes-recipe/imagetypes_wic.bbclass diff --git a/meta/classes/initramfs.bbclass b/meta/classes-recipe/initramfs.bbclass similarity index 100% rename from meta/classes/initramfs.bbclass rename to meta/classes-recipe/initramfs.bbclass diff --git a/meta/classes/kbuildtarget.bbclass b/meta/classes-recipe/kbuildtarget.bbclass similarity index 100% rename from meta/classes/kbuildtarget.bbclass rename to meta/classes-recipe/kbuildtarget.bbclass diff --git a/meta/classes/multiarch.bbclass b/meta/classes-recipe/multiarch.bbclass similarity index 100% rename from meta/classes/multiarch.bbclass rename to meta/classes-recipe/multiarch.bbclass diff --git a/meta/classes/native.bbclass b/meta/classes-recipe/native.bbclass similarity index 100% rename from meta/classes/native.bbclass rename to meta/classes-recipe/native.bbclass diff --git a/meta/classes/opensbi.bbclass b/meta/classes-recipe/opensbi.bbclass similarity index 100% rename from meta/classes/opensbi.bbclass rename to meta/classes-recipe/opensbi.bbclass diff --git a/meta/classes/patch.bbclass b/meta/classes-recipe/patch.bbclass similarity index 100% rename from meta/classes/patch.bbclass rename to meta/classes-recipe/patch.bbclass diff --git a/meta/classes/per-kernel.bbclass b/meta/classes-recipe/per-kernel.bbclass similarity index 100% rename from meta/classes/per-kernel.bbclass rename to meta/classes-recipe/per-kernel.bbclass diff --git a/meta/classes/repository.bbclass b/meta/classes-recipe/repository.bbclass similarity index 100% rename from meta/classes/repository.bbclass rename to meta/classes-recipe/repository.bbclass diff --git a/meta/classes/rootfs-add-files.bbclass b/meta/classes-recipe/rootfs-add-files.bbclass similarity index 100% rename from meta/classes/rootfs-add-files.bbclass rename to meta/classes-recipe/rootfs-add-files.bbclass diff --git a/meta/classes/rootfs.bbclass b/meta/classes-recipe/rootfs.bbclass similarity index 100% rename from meta/classes/rootfs.bbclass rename to meta/classes-recipe/rootfs.bbclass diff --git a/meta/classes/sbuild.bbclass b/meta/classes-recipe/sbuild.bbclass similarity index 100% rename from meta/classes/sbuild.bbclass rename to meta/classes-recipe/sbuild.bbclass diff --git a/meta/classes/sdk.bbclass b/meta/classes-recipe/sdk.bbclass similarity index 100% rename from meta/classes/sdk.bbclass rename to meta/classes-recipe/sdk.bbclass diff --git a/meta/classes/squashfs.bbclass b/meta/classes-recipe/squashfs.bbclass similarity index 100% rename from meta/classes/squashfs.bbclass rename to meta/classes-recipe/squashfs.bbclass diff --git a/testsuite/citest.py b/testsuite/citest.py index 6f8e03cf..27cc9ff6 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -88,7 +88,7 @@ class DevTest(CIBaseTest): self.init() layerdir_core = CIUtils.getVars('LAYERDIR_core') - dpkgbase_file = layerdir_core + '/classes/dpkg-base.bbclass' + dpkgbase_file = layerdir_core + '/classes-recipe/dpkg-base.bbclass' self.backupfile(dpkgbase_file) with open(dpkgbase_file, 'a') as file: diff --git a/testsuite/unittests/test_image_account_extension.py b/testsuite/unittests/test_image_account_extension.py index 636c2a8b..97d221fd 100644 --- a/testsuite/unittests/test_image_account_extension.py +++ b/testsuite/unittests/test_image_account_extension.py @@ -17,7 +17,7 @@ sys.path.append(os.path.join(os.path.dirname(__file__), '../../bitbake/lib')) from bb import process from bb.data_smart import DataSmart -file_name = 'meta/classes/image-account-extension.bbclass' +file_name = 'meta/classes-recipe/image-account-extension.bbclass' image_create_users = load_function(file_name, 'image_create_users') image_create_groups = load_function(file_name, 'image_create_groups')