From 818a55fbac51e5f430d25af6f80c2742820e0174 Mon Sep 17 00:00:00 2001
From: Antonin Godard <antonin.godard@bootlin.com>
Date: Wed, 13 Nov 2024 13:57:56 +0100
Subject: [PATCH] slides: yocto: move to the classes-recipe/classes-global
 naming

* Fix the directory name for classes that are part of classes-global or
  classes-recipe.
* In the intro to classes, introduce the classes-* directories.
* In the "common classes" slide, add a note on why classes/ still
  exists and add the classes directory to the examples.

Signed-off-by: Antonin Godard <antonin.godard@bootlin.com>
---
 slides/yocto-image/yocto-image.tex            |  4 +--
 .../yocto-recipe-advanced.tex                 | 33 ++++++++++---------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/slides/yocto-image/yocto-image.tex b/slides/yocto-image/yocto-image.tex
index 9a6e4526ef..8d1a69e89c 100644
--- a/slides/yocto-image/yocto-image.tex
+++ b/slides/yocto-image/yocto-image.tex
@@ -101,7 +101,7 @@ \subsection{Introduction to images}
       first valid package type defined in \yoctovar{PACKAGE_CLASSES} is
       used.
     \item All the magic is done in
-      \code{meta/classes/rootfs_${IMAGE_PKGTYPE}.bbclass}
+      \code{meta/classes-recipe/rootfs_${IMAGE_PKGTYPE}.bbclass}
   \end{itemize}
 \end{frame}
 
@@ -115,7 +115,7 @@ \subsection{Image types}
       will be generated.
     \item Image formats instructions are provided by
       \code{openembedded-core}, in
-      \code{meta/classes/image_types.bbclass}
+      \code{meta/classes-recipe/image_types.bbclass}
     \item Common image formats are: \code{ext2}, \code{ext3}, \code{ext4},
           \code{squashfs}, \code{squashfs-xz}, \code{cpio}, \code{jffs2},
           \code{ubifs}, \code{tar.bz2}, \code{tar.gz}\dots
diff --git a/slides/yocto-recipe-advanced/yocto-recipe-advanced.tex b/slides/yocto-recipe-advanced/yocto-recipe-advanced.tex
index 05ca0591d6..f825bb264a 100644
--- a/slides/yocto-recipe-advanced/yocto-recipe-advanced.tex
+++ b/slides/yocto-recipe-advanced/yocto-recipe-advanced.tex
@@ -119,7 +119,8 @@ \subsection{Classes}
     \item Any metadata and task which can be put in a recipe can be
           used in a class.
     \item Classes extension is \code{.bbclass}
-    \item Classes are located in the \code{classes} folder of a layer.
+    \item Classes are located in the \code{classes-recipe},
+      \code{classes-global}, or \code{classes} folders of a layer.
     \item Recipes can use this common code by inheriting a class:
     \begin{itemize}
       \item \code{inherit <class>}
@@ -131,23 +132,23 @@ \subsection{Classes}
 \begin{frame}
   \frametitle{Common classes}
   \begin{itemize}
-    \item Common classes can be found in \code{meta/classes/}
+    \item Most classes are split into scope-specific subdirectories:
+      \code{meta/classes-recipe/}, \code{meta/classes-global/}
+    \item Classes whose usage context is not clearly defined can be found in
+      \code{meta/classes/}
     \begin{itemize}
-      \item \code{base.bbclass}
-      \item \code{kernel.bbclass}
-      \item \code{autotools.bbclass}
-      \item \code{autotools-brokensep.bbclass}
-      \item \code{cmake.bbclass}
-      \item \code{meson.bbclass}
-      \item \code{native.bbclass}
-      \item \code{systemd.bbclass}
-      \item \code{update-rc.d.bbclass}
-      \item \code{useradd.bbclass}
+      \item \code{classes-global/base.bbclass}
+      \item \code{classes-recipe/kernel.bbclass}
+      \item \code{classes-recipe/autotools.bbclass}
+      \item \code{classes-recipe/autotools-brokensep.bbclass}
+      \item \code{classes-recipe/cmake.bbclass}
+      \item \code{classes-recipe/meson.bbclass}
+      \item \code{classes-recipe/native.bbclass}
+      \item \code{classes-recipe/systemd.bbclass}
+      \item \code{classes-recipe/update-rc.d.bbclass}
+      \item \code{classes/useradd.bbclass}
       \item \dots
     \end{itemize}
-  \item Starting with Yocto Langdale (4.1), most classes are split into
-    scope-specific subdirectories: \code{meta/classes-recipe/},
-    \code{meta/classes-global/}
   \end{itemize}
 \end{frame}
 
@@ -404,7 +405,7 @@ \subsection{Network usage}
 
 \begin{frame}[fragile]
   \frametitle{Mirror configuration in OpenEmbedded-Core}
-  \code{meta/classes/mirrors.bbclass}
+  \code{meta/classes-global/mirrors.bbclass}
   \begin{block}{}
     \begin{minted}[fontsize=\tiny]{sh}
 PREMIRRORS += "git://sourceware.org/git/glibc.git        https://downloads.yoctoproject.org/mirror/sources/ \