[bootlin/training-materials updates] master: yocto: slides: reorder and rename two conditional assignment slides (d196bb48)

[Luca Ceresoli]

Repository : https://github.com/bootlin/training-materials
On branch  : master
Link       : https://github.com/bootlin/training-materials/commit/d196bb48e8153a71a3371fc2599f9abaeb48ba74

>---------------------------------------------------------------

commit d196bb48e8153a71a3371fc2599f9abaeb48ba74
Author: Luca Ceresoli <luca.ceresoli at bootlin.com>
Date:   Tue May 9 14:21:44 2023 +0200

    yocto: slides: reorder and rename two conditional assignment slides
    
    The slide title "Combining overrides 2/2" is not appropriate as the slide
    is about precedence, not about combining. Rename it (and remove "1/2" from
    the previous slide), and also move it hust after the "Overrides for
    conditional assignment" as it is adding more details to it.
    
    Signed-off-by: Luca Ceresoli <luca.ceresoli at bootlin.com>


>---------------------------------------------------------------

d196bb48e8153a71a3371fc2599f9abaeb48ba74
 slides/yocto-advanced/yocto-advanced.tex | 42 ++++++++++++++++----------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/slides/yocto-advanced/yocto-advanced.tex b/slides/yocto-advanced/yocto-advanced.tex
index f80f2a1f..cd9a37de 100644
--- a/slides/yocto-advanced/yocto-advanced.tex
+++ b/slides/yocto-advanced/yocto-advanced.tex
@@ -162,8 +162,28 @@ KERNEL_DEVICETREE:dra7xx-evm = "dra7-evm.dtb"    # This is ignored
   \end{block}
 \end{frame}
 
+\begin{frame}[fragile]
+  \frametitle{Overrides for conditional assignment: precedence}
+  \begin{itemize}
+    \item The most specific assignment takes precedence.
+    \item Example:
+      \begin{minted}[fontsize=\footnotesize]{console}
+IMAGE_INSTALL:beaglebone = "busybox mtd-utils i2c-tools"
+IMAGE_INSTALL = "busybox mtd-utils"
+      \end{minted}
+    \item If the machine is \code{beaglebone}:
+      \begin{itemize}
+        \item \code{IMAGE_INSTALL = "busybox mtd-utils i2c-tools"}
+      \end{itemize}
+    \item Otherwise:
+      \begin{itemize}
+        \item \code{IMAGE_INSTALL = "busybox mtd-utils"}
+      \end{itemize}
+  \end{itemize}
+\end{frame}
+
 \begin{frame}
-  \frametitle{Combining overrides 1/2}
+  \frametitle{Combining overrides}
   \begin{itemize}
     \item The previous methods can be combined.
     \item If we define:
@@ -183,26 +203,6 @@ KERNEL_DEVICETREE:dra7xx-evm = "dra7-evm.dtb"    # This is ignored
   \end{itemize}
 \end{frame}
 
-\begin{frame}[fragile]
-  \frametitle{Combining overrides 2/2}
-  \begin{itemize}
-    \item The most specific assignment takes precedence.
-    \item Example:
-      \begin{minted}[fontsize=\footnotesize]{console}
-IMAGE_INSTALL:beaglebone = "busybox mtd-utils i2c-tools"
-IMAGE_INSTALL = "busybox mtd-utils"
-      \end{minted}
-    \item If the machine is \code{beaglebone}:
-      \begin{itemize}
-        \item \code{IMAGE_INSTALL = "busybox mtd-utils i2c-tools"}
-      \end{itemize}
-    \item Otherwise:
-      \begin{itemize}
-        \item \code{IMAGE_INSTALL = "busybox mtd-utils"}
-      \end{itemize}
-  \end{itemize}
-\end{frame}
-
 \begin{frame}
   \frametitle{Order of variable assignment}
   \begin{columns}