From patchwork Mon Nov 3 11:51:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 4510 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 03 Nov 2025 13:03:25 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-ej1-f62.google.com (mail-ej1-f62.google.com [209.85.218.62]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 5A3C3PEo002206 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 3 Nov 2025 13:03:25 +0100 Received: by mail-ej1-f62.google.com with SMTP id a640c23a62f3a-b3cbee9769fsf612770266b.3 for ; Mon, 03 Nov 2025 04:03:25 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1762171399; cv=pass; d=google.com; s=arc-20240605; b=INk06spTS2mOA/nStgKhjBjFcC4dgYStQKeEtJ4y34qBlvzXveYMy1eVzZ2qBDpzk5 kK7nYr65rzOIyY6+uJc1GbAiiqR9gF4qgo3u2XBbGT2vOPxjmPLGZaz9V1OccCh+w+9f PeGOvSUvKS6AGbEWn2QaQkcUKG/qO6AUpsj3tWoblZA03GO62U6H6bTdKix3CtFSECLw CevnrhteN+YFc2j0j+q92n2B8dmTgu1XshsFdETMG85RS6isa9O8elKri8U4CeYtvGeJ z/h2yrOaEen3FWqNcIBc76uAEHwmMgFV0IUligim7ozNmtZ+XoFN/mcwW9ajLhQ1AI+p ec/g== 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=UeeuOCWheEEKup/DxJHEEOZBXeVcU0Jw30tNcG/Yc2U=; fh=VvXTU0Cwk8U8DzibGAad9eWej4KtG0lfCaKq1tC1enc=; b=jlW670oD1KdZ0hnkQgogR5yHYw+iNP4AbplhOPtcn4GmEeZMJ2BaBhH0UtkHZgve4U xRI6nUhIHE3o1WrJnUWwbn8bqDoj8zlqzJTshSGxGsCmYyu4eFJ5pHs2iHLymSFd0GLA bnnfzZH1xI+0qtYl6P1bRIoQVtvPK++Em0oq73Bvz9A0PNB8hrrekEDx7F3MuR2zHlD4 uFXPqw4okkF9OxNnhr/3aWpHET3drZ2+RXhAnouZPBwKEXVWpRyfuwTL/mHKt1+CpspH bCiUPrt81s2yz9G66Z/u3ssxV3gK5rqMRjgR5UEbWO+M0lwpz1vzQVrkTgDaGmko2AsM Ervg==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=F1fILGm1; spf=pass (google.com: domain of fm-294854-2025110311521663c76d259500020705-kughoe@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-2025110311521663c76d259500020705-KUGHoE@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=1762171399; x=1762776199; 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=UeeuOCWheEEKup/DxJHEEOZBXeVcU0Jw30tNcG/Yc2U=; b=m1O8rKhLNQwHSRzXumxMGkPrOH5X+TbrhCcDrM+qYn4u/wQuI32zSliGtseQjpXjp2 oLasxwdZJ61qs3QOkdPh6DSs3jvn4BXwqQLHlEeAwgWz/UES+RvI5q/xqI5lQOsmFUrM gKqh7DO7syjWOj9rKxoOjlLeURHoo64WyIFxhP1j9FHFIvNAPpkq/nvolmkEL/LxNi2X ZNGBEoNW5udEXY62fAmCXi2/i5urh09casmwqzXV8+9enlqWfjeAc3iwCeOAQeM+9VLZ 6eVkBsLGS00X6Of1rtauv4O7fnCE51laPmRJSaucCv3zF0CxdNHRrxZ3jkRYaYLeWgSO Dx8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762171399; x=1762776199; 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=UeeuOCWheEEKup/DxJHEEOZBXeVcU0Jw30tNcG/Yc2U=; b=a11CEb8LRwZWtCGodyUOlGuvYkuxdt80dVsRkvhDE3x8+0GmFKdBTM1iePFDM7s1/D RD4NBRGm5FHLA4BLRjarsN7Sc+UibkSxGeg92Xr6z7WjqsBunroxVlUHO6rcNBHaavc2 CaBw2PZ0K22UO7lz9hm5v0EoO12HHYX+Rj2bMu9T3vRLNP1jfkrGBgE74SDsqMB3kAqx /fJvt23AxqLPvq9Af/sC+Tkf4t1oAYcymuZQV8fBaieS2lK029Pz62J7qT/TE4MMkk4S xdkm029Vq5CFFhjPX93tGn/RszTYnfLkAOeaeFtg0WwzQRZpaDVSjWWkfYvWndONAgy+ nmng== X-Forwarded-Encrypted: i=2; AJvYcCW2yxIEPHM/31Plo0mmKjafikMElk3Nq+BkS5NKiKJLmeVCzDTVRqhUN0pIEk+wqtj5SYgiQnw=@isar-build.org X-Gm-Message-State: AOJu0Yx+F7QVLzAurI6yIcyxBl7QM9tUJuvuQPYsyXgVfE7I5jeGV89z 0H5aDCQEdJBGrsc1uYoMJnQtoLNvmhgSTEnMKIa+vZ++bjtiFCrXvpeO X-Google-Smtp-Source: AGHT+IHn9oQIlWBNSVRVgTh+WAphZ5SgvAhQEz853q4SwfIDl5KEwK0sx4xiS9J+SBDnaU7IWXFErw== X-Received: by 2002:a05:6512:3c92:b0:577:6e42:3718 with SMTP id 2adb3069b0e04-5941d4f530emr3668279e87.7.1762170741087; Mon, 03 Nov 2025 03:52:21 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="Ae8XA+arp2ZujxHevmTM+NwynemiBE+NW3elNgwEJ2+BgeGFTQ==" Received: by 2002:ac2:5edc:0:b0:594:27b6:4801 with SMTP id 2adb3069b0e04-59427b64967ls125075e87.0.-pod-prod-03-eu; Mon, 03 Nov 2025 03:52:17 -0800 (PST) X-Received: by 2002:a05:6512:23a5:b0:594:2725:ff8d with SMTP id 2adb3069b0e04-59427260154mr1689462e87.40.1762170737468; Mon, 03 Nov 2025 03:52:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1762170737; cv=none; d=google.com; s=arc-20240605; b=h0ZGlRAeJg0XAsSYV1sCglhlpkvwoOCIdt02IpHqJzTTZyIuvHm+2D5ydJIi/hwcvr eQ4NdFHQUFw1T+/C7/EwXBDxOYtabIFBpuFDVTj/zx91O9csoLusUym5iY96jNksGPfU Q2dYwLv4vrkhqMnByy+uJg27v7fnu69aT8tK7miVu0A0CWfJ9VuhUtkQLwJj7TdQt+oc kUNCqPVRnP0/30wZ/4CA+fB32zmxtFTKoKij85FZjqvtw2c5yevWQqJC9lEWZGm8B1lc alMNqWl46QYJnbgaeKSR+YBCkBFIhXFzsEvrjsTN5zMSQmgx/AOV3wtTu+QlgBHbtMDM 8oXQ== 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=8r3gIbmY+yFNKBk7fQeVhsCAg1ZBlEE4trsvoR0AW3g=; fh=hOBXq6nisExkIRIwN8IDOmOCLKwX8PM0ANlxQbNMEqA=; b=eChih3KI6URmLAMHQ7YX7wqlI+TjB+1s5mgq++YI2vVTPnYtqJfIcu90oKIzHWBoOQ wAptSzD5+Thzf3/pOAR3crJX19N8R+NhX93jITXzFiJzU7unTaoVKDA23QPWm93hTI06 SeZxyhX2n3HTxrGDeyVpW7YUP6zZ1EcEKbgs1yt1Lni5Smfo1Gy/CsLE2QB7Vr4anmFy sZyQKgWuloP7aPdp2mmgnPoy8yA3Fsiqz3nAvMzlD+PhGbTeu79lYjtxX3sIa4pfziEL dn7uRODw6d1ooDkCQ6+ITccQyUpo5y4+eomXjPUXi0sHDNtO/6lcMOrCovTpJ9mPUtsA bgqg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=F1fILGm1; spf=pass (google.com: domain of fm-294854-2025110311521663c76d259500020705-kughoe@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-2025110311521663c76d259500020705-KUGHoE@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net. [185.136.64.226]) by gmr-mx.google.com with ESMTPS id 2adb3069b0e04-5941f3ba8bdsi279733e87.4.2025.11.03.03.52.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Nov 2025 03:52:17 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-2025110311521663c76d259500020705-kughoe@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) client-ip=185.136.64.226; Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 2025110311521663c76d259500020705 for ; Mon, 03 Nov 2025 12:52:16 +0100 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Subject: [PATCH 03/27] meta: Move recipe-pulled classes into classes-recipe Date: Mon, 3 Nov 2025 12:51:51 +0100 Message-ID: <235bd1d984b7fc9ddff5ffbd0c7a1c61b4f8096f.1762170735.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=F1fILGm1; spf=pass (google.com: domain of fm-294854-2025110311521663c76d259500020705-kughoe@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-2025110311521663c76d259500020705-KUGHoE@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_H3,RCVD_IN_MSPIKE_WL, 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 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')