[PATCH 03/27] meta: Move recipe-pulled classes into classes-recipe

["'Jan Kiszka' via isar-users" <isar-users@googlegroups.com>]

From: Jan Kiszka <jan.kiszka@siemens.com>

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 <jan.kiszka@siemens.com>
---
 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 7d045955..23c2b90d 100644
--- a/doc/technical_overview.md
+++ b/doc/technical_overview.md
@@ -183,12 +183,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 ecb1fb2c..b577f76c 100644
--- a/doc/user_manual.md
+++ b/doc/user_manual.md
@@ -964,7 +964,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 a1214e9c..675015af 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')
 
-- 
2.51.0

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/235bd1d984b7fc9ddff5ffbd0c7a1c61b4f8096f.1762170735.git.jan.kiszka%40siemens.com.