[bootlin/training-materials updates] master: slides/buildroot-build: fix merge_config.sh examples (3f534c21)

[Thomas Petazzoni]

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

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

commit 3f534c2167585f49068d6683ed0740884520d4ce
Author: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
Date:   Tue Aug 27 12:13:58 2019 +0200

    slides/buildroot-build: fix merge_config.sh examples
    
     - merge_config.sh does generate the .config directly, no need to
       redirect the output (it in fact doesn't work if you redirect the
       output)
    
     - it already does an alldefconfig, so the make olddefconfig is not
       needed, the build can be started right away
    
    Issue reported by Nasser Afshin <afshin.nasser at gmail.com>.
    
    Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>


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

3f534c2167585f49068d6683ed0740884520d4ce
 slides/buildroot-build/buildroot-build.tex | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/slides/buildroot-build/buildroot-build.tex b/slides/buildroot-build/buildroot-build.tex
index e911f73e..4874a016 100644
--- a/slides/buildroot-build/buildroot-build.tex
+++ b/slides/buildroot-build/buildroot-build.tex
@@ -282,9 +282,7 @@ BR2_PACKAGE_STRACE=y
   \begin{block}{Build a release system for {\em platform1}}
     {\scriptsize
 \begin{verbatim}
-$ ./support/kconfig/merge_config.sh platform1.frag packages.frag > \
-        .config
-$ make olddefconfig
+$ ./support/kconfig/merge_config.sh platform1.frag packages.frag
 $ make
 \end{verbatim}
     }
@@ -294,8 +292,7 @@ $ make
     {\scriptsize
 \begin{verbatim}
 $ ./support/kconfig/merge_config.sh platform2.frag packages.frag \
-        debug.frag > .config
-$ make olddefconfig
+        debug.frag
 $ make
 \end{verbatim}
     }