[bootlin/training-materials updates] master: kernel: Reintroduce modules.alias explanation (cb7fd9f4)

[Miquel Raynal]

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

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

commit cb7fd9f4e99241a89610b7e460dcca4d495fb57a
Author: Miquel Raynal <miquel.raynal at bootlin.com>
Date:   Wed Jan 18 14:26:54 2023 +0100

    kernel: Reintroduce modules.alias explanation
    
    The sysdev-ng merge did drop it from the kernel training entirely, while
    it got moved at another place in the other training.
    
    Signed-off-by: Miquel Raynal <miquel.raynal at bootlin.com>


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

cb7fd9f4e99241a89610b7e460dcca4d495fb57a
 slides/kernel-hw-devices/module-alias-usage.dia      | Bin 0 -> 15851 bytes
 slides/kernel-intro-modules/kernel-intro-modules.tex |  14 --------------
 .../sysdev-kernel-building.tex                       |  19 +++++++++++++++++--
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/slides/kernel-hw-devices/module-alias-usage.dia b/slides/kernel-hw-devices/module-alias-usage.dia
new file mode 100644
index 00000000..1d3dd761
Binary files /dev/null and b/slides/kernel-hw-devices/module-alias-usage.dia differ
diff --git a/slides/kernel-intro-modules/kernel-intro-modules.tex b/slides/kernel-intro-modules/kernel-intro-modules.tex
index 056d962c..eced145f 100644
--- a/slides/kernel-intro-modules/kernel-intro-modules.tex
+++ b/slides/kernel-intro-modules/kernel-intro-modules.tex
@@ -22,20 +22,6 @@
   \end{columns}
 \end{frame}
 
-\begin{frame}
-  \frametitle{Module dependencies}
-  \begin{itemize}
-  \item Some kernel modules can depend on other modules,
-    which need to be loaded first.
-  \item Example: the \code{ubifs} module depends on the
-    \code{ubi} and \code{mtd} modules.
-  \item Dependencies are described
-    both in \code{/lib/modules/<kernel-version>/modules.dep}
-    and in \code{/lib/modules/<kernel-version>/modules.dep.bin} (binary hashed format)\\
-    These files are generated when you run \code{make modules_install}.
-  \end{itemize}
-\end{frame}
-
 \begin{frame}
   \frametitle{Module utilities: extracting information}
   \code{<module_name>}: name of the module file without the trailing \code{.ko}\\
diff --git a/slides/sysdev-kernel-building/sysdev-kernel-building.tex b/slides/sysdev-kernel-building/sysdev-kernel-building.tex
index 6038f8e7..a13e83a4 100644
--- a/slides/sysdev-kernel-building/sysdev-kernel-building.tex
+++ b/slides/sysdev-kernel-building/sysdev-kernel-building.tex
@@ -458,9 +458,16 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437
       Module \code{.ko} (Kernel Object) files, in the same directory
       structure as in the sources.
     \item \code{modules.alias}, \code{modules.alias.bin}\\
-      Aliases for module loading utilities.
+      Aliases for module loading utilities
+      \ifthenelse{\equal{\training}{linux-kernel}}{, see next slide}{}
     \item \code{modules.dep}, \code{modules.dep.bin}\\
-      Module dependencies
+      \ifthenelse{\equal{\training}{linux-kernel}}{}{
+        Kernel modules can depend on other modules, based on the
+        symbols (functions and data structures) they use.
+      }
+      {
+        Module dependencies
+      }
     \item \code{modules.symbols}, \code{modules.symbols.bin}\\
       Tells which module a given symbol belongs to (related to
       module dependencies).
@@ -470,6 +477,14 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437
   \end{itemize}
 \end{frame}
 
+\ifthenelse{\equal{\training}{linux-kernel}}{
+\begin{frame}{Module alias: {\em modules.alias}}
+  \begin{center}
+    \includegraphics[width=\textwidth]{slides/kernel-hw-devices/module-alias-usage.pdf}
+  \end{center}
+\end{frame}
+}{}
+
 \begin{frame}
   \frametitle{Module installation: embedded case}
   \begin{itemize}