From b9310311238c9a82837eda861bc8d8a003462357 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 21 Jan 2023 11:53:09 +0100 Subject: [PATCH] agenda: de-duplicate Yocto agenda definition Signed-off-by: Thomas Petazzoni Signed-off-by: Thomas Bonnefille --- agenda/common.inc | 24 +++++++ agenda/yocto-agenda.tex | 48 +------------- agenda/yocto-fr-agenda.tex | 48 +------------- agenda/yocto-online-agenda.tex | 79 +---------------------- agenda/yocto-online-fr-agenda.tex | 45 +------------ agenda/yocto.inc | 104 ++++++++++++++++++++++++++++++ 6 files changed, 132 insertions(+), 216 deletions(-) diff --git a/agenda/common.inc b/agenda/common.inc index e5c5e9c54e..2cd8fae544 100644 --- a/agenda/common.inc +++ b/agenda/common.inc @@ -28,3 +28,27 @@ \csname #1@#2@contents\endcsname } } + +\newcommand\showonlineagendaday[1]{ + \ifthenelse{\equal{\agendalanguage}{french}}{ + \section{#1 demi-journée} + }{ + \section{Half day #1} + } +} + +\newcommand\showonsiteagendaday[2]{ + \ifthenelse{\equal{\agendalanguage}{french}}{ + \ifthenelse{\equal{#2}{morning}}{ + \section{Jour #1 - Matin} + }{ + \section{Jour #1 - Après-midi} + } + }{ + \ifthenelse{\equal{#2}{morning}}{ + \section{Day #1 - Morning} + }{ + \section{Day #1 - Afternoon} + } + } +} diff --git a/agenda/yocto-agenda.tex b/agenda/yocto-agenda.tex index 22823bd694..432c1ff7b6 100644 --- a/agenda/yocto-agenda.tex +++ b/agenda/yocto-agenda.tex @@ -85,53 +85,7 @@ \end{center} } -\section{Day 1 - Morning} - -\showagendaitem{intro}{lecture} - -\showagendaitem{overview}{lecture} - -\showagendaitem{firstbuild}{lab} - -\section{Day 1 - Afternoon} - -\showagendaitem{basics}{lecture} - -\showagendaitem{flashingbooting}{lab} - -\showagendaitem{usingadvanced}{lecture} - -\showagendaitem{nfsconfiguring}{lab} - -\section{Day 2 - Morning} - -\showagendaitem{writingrecipebasics}{lecture} - -\showagendaitem{appcompilation}{lab} - -\showagendaitem{writingrecipesadvanced}{lecture} - -\section{Day 2 - Afternoon} - -\showagendaitem{layers}{lecture} - -\showagendaitem{writinglayer}{lab} - -\section{Day 3 - Morning} - -\showagendaitem{writingbsp}{lecture} - -\showagendaitem{kernelchanges}{lab} - -\section{Day 3 - Afternoon} - -\showagendaitem{image}{lecture} - -\showagendaitem{image}{lab} - -\showagendaitem{sdk}{lecture} - -\showagendaitem{sdk}{lab} +\onsiteagenda \end{document} diff --git a/agenda/yocto-fr-agenda.tex b/agenda/yocto-fr-agenda.tex index 051edc8951..756ac542c7 100644 --- a/agenda/yocto-fr-agenda.tex +++ b/agenda/yocto-fr-agenda.tex @@ -85,52 +85,6 @@ \end{center} } -\section{1\textsuperscript{er} jour - Matin} - -\showagendaitem{intro}{lecture} - -\showagendaitem{overview}{lecture} - -\showagendaitem{firstbuild}{lab} - -\section{1\textsuperscript{er} Jour - Après-midi} - -\showagendaitem{basics}{lecture} - -\showagendaitem{flashingbooting}{lab} - -\showagendaitem{usingadvanced}{lecture} - -\showagendaitem{nfsconfiguring}{lab} - -\section{2\textsuperscript{ème} jour - Matin} - -\showagendaitem{writingrecipebasics}{lecture} - -\showagendaitem{appcompilation}{lab} - -\showagendaitem{writingrecipesadvanced}{lecture} - -\section{2\textsuperscript{ème} jour - Après-midi} - -\showagendaitem{layers}{lecture} - -\showagendaitem{writinglayer}{lab} - -\section{3\textsuperscript{ème} jour - Matin} - -\showagendaitem{writingbsp}{lecture} - -\showagendaitem{kernelchanges}{lab} - -\section{3\textsuperscript{ème} jour - Après-midi} - -\showagendaitem{image}{lecture} - -\showagendaitem{image}{lab} - -\showagendaitem{sdk}{lecture} - -\showagendaitem{sdk}{lab} +\onsiteagenda \end{document} diff --git a/agenda/yocto-online-agenda.tex b/agenda/yocto-online-agenda.tex index e9d0cd5cd9..16aee73d39 100644 --- a/agenda/yocto-online-agenda.tex +++ b/agenda/yocto-online-agenda.tex @@ -85,84 +85,7 @@ \end{center} } -\section{Half day 1} - - -\showagendaitem{intro}{lecture} - -\showagendaitem{overview}{lecture} - -\showagendaitem{firstbuild}{lab} - -\showagendaitem{basics}{lecture} - -\showagendaitem{flashingbooting}{lab} - -\section{Half day 2} - -\showagendaitem{usingadvanced}{lecture} - -\showagendaitem{nfsconfiguring}{lab} - -\showagendaitem{writingrecipebasics}{lecture} - -\showagendaitem{appcompilation}{lab} - -\showagendaitem{writingrecipesadvanced}{lecture} - -\section{Half day 3} - -\showagendaitem{layers}{lecture} - -\showagendaitem{writinglayer}{lab} - -\showagendaitem{writingbsp}{lecture} - -\showagendaitem{kernelchanges}{lab} - -\section{Half day 4} - -\showagendaitem{image}{lecture} - -\showagendaitem{image}{lab} - -\showagendaitem{sdk}{lecture} - -\showagendaitem{sdk}{lab} - -\feagendatwocolumn -{Lecture - Devtool} -{ - \begin{itemize} - \item About devtool - \item Devtool use cases - \end{itemize} -} -{Demo 9 - Using devtool} -{ - \begin{itemize} - \item Generate a new recipe - \item Modify a recipe to add a new patch - \item Upgrade a recipe to a newer version - \end{itemize} -} - -\feagendatwocolumn -{Lecture - Automating layer management} -{ - \begin{itemize} - \item Automating layer management - \end{itemize} -} -{Lecture - Runtime Package Management} -{ - \begin{itemize} - \item Introduction to runtime package management - \item Build configuration - \item Package server configuration - \item Target configuration - \end{itemize} -} +\onlineagenda \feagendaonecolumn {Questions and Answers} diff --git a/agenda/yocto-online-fr-agenda.tex b/agenda/yocto-online-fr-agenda.tex index 3b46d89977..3a93b1e39e 100644 --- a/agenda/yocto-online-fr-agenda.tex +++ b/agenda/yocto-online-fr-agenda.tex @@ -85,50 +85,7 @@ \end{center} } -\section{1\textsuperscript{ère} demi-journée} - -\showagendaitem{intro}{lecture} - - -\showagendaitem{overview}{lecture} - -\showagendaitem{firstbuild}{lab} - -\showagendaitem{basics}{lecture} - -\showagendaitem{flashingbooting}{lab} - -\section{2\textsuperscript{ème} demi-journée} - -\showagendaitem{usingadvanced}{lecture} - -\showagendaitem{nfsconfiguring}{lab} - -\showagendaitem{writingrecipebasics}{lecture} - -\showagendaitem{appcompilation}{lab} - -\showagendaitem{writingrecipesadvanced}{lecture} - -\section{3\textsuperscript{ème} demi-journée} - -\showagendaitem{layers}{lecture} - -\showagendaitem{writinglayer}{lab} - -\showagendaitem{writingbsp}{lecture} - -\showagendaitem{kernelchanges}{lab} - -\section{4\textsuperscript{ème} demi-journée} - -\showagendaitem{image}{lecture} - -\showagendaitem{image}{lab} - -\showagendaitem{sdk}{lecture} - -\showagendaitem{sdk}{lab} +\onlineagenda \feagendaonecolumn {Questions / réponses} diff --git a/agenda/yocto.inc b/agenda/yocto.inc index bde565f194..f8e5241edd 100644 --- a/agenda/yocto.inc +++ b/agenda/yocto.inc @@ -664,3 +664,107 @@ \item Configuration de la machine cible \end{itemize} } + +\def \onlineagenda { + \showonlineagendaday{1} + + \showagendaitem{intro}{lecture} + + \showagendaitem{overview}{lecture} + + \showagendaitem{firstbuild}{lab} + + \showagendaitem{basics}{lecture} + + \showagendaitem{flashingbooting}{lab} + + \showonlineagendaday{2} + + \showagendaitem{usingadvanced}{lecture} + + \showagendaitem{nfsconfiguring}{lab} + + \showagendaitem{writingrecipesbasics}{lecture} + + \showagendaitem{appcompilation}{lab} + + \showagendaitem{writingrecipesadvanced}{lecture} + + \showonlineagendaday{3} + + \showagendaitem{layers}{lecture} + + \showagendaitem{writinglayer}{lab} + + \showagendaitem{writingbsp}{lecture} + + \showagendaitem{kernelchanges}{lab} + + \showonlineagendaday{4} + + \showagendaitem{image}{lecture} + + \showagendaitem{image}{lab} + + \showagendaitem{sdk}{lecture} + + \showagendaitem{sdk}{lab} +} + +\def \onsiteagenda { + \showonsiteagendaday{1}{morning} + + \showagendaitem{intro}{lecture} + + \showagendaitem{overview}{lecture} + + \showagendaitem{firstbuild}{lab} + + \showonsiteagendaday{1}{afternoon} + + \showagendaitem{basics}{lecture} + + \showagendaitem{flashingbooting}{lab} + + \showagendaitem{usingadvanced}{lecture} + + \showagendaitem{nfsconfiguring}{lab} + + \showonsiteagendaday{2}{morning} + + \showagendaitem{writingrecipesbasics}{lecture} + + \showagendaitem{appcompilation}{lab} + + \showagendaitem{writingrecipesadvanced}{lecture} + + \showonsiteagendaday{2}{afternoon} + + \showagendaitem{layers}{lecture} + + \showagendaitem{writinglayer}{lab} + + \showonsiteagendaday{3}{morning} + + \showagendaitem{writingbsp}{lecture} + + \showagendaitem{kernelchanges}{lab} + + \showonsiteagendaday{3}{afternoon} + + \showagendaitem{image}{lecture} + + \showagendaitem{image}{lab} + + \showagendaitem{sdk}{lecture} + + \showagendaitem{sdk}{lab} + + \showagendaitem{devtool}{lecture} + + \showagendaitem{devtool}{lab} + + \showagendaitem{automatinglayermanagement}{lecture} + + \showagendaitem{runtimepackagemanagement}{lecture} +}