[bootlin/training-materials updates] master: slides/buildroot-new-packages: update zlib example (9fd62b69)

[Thomas Petazzoni]

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

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

commit 9fd62b695c4145263f0aed24db5423ec1fd49b39
Author: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
Date:   Wed Apr 15 08:21:35 2020 +0200

    slides/buildroot-new-packages: update zlib example
    
    zlib.mk is now libzlib.mk, so update the example. Also, drop the title
    of the box to save a bit of space and really see the entire example on
    the slide.
    
    Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>


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

9fd62b695c4145263f0aed24db5423ec1fd49b39
 .../buildroot-new-packages.tex                     | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/slides/buildroot-new-packages/buildroot-new-packages.tex b/slides/buildroot-new-packages/buildroot-new-packages.tex
index 61145f36..7c20b49c 100644
--- a/slides/buildroot-new-packages/buildroot-new-packages.tex
+++ b/slides/buildroot-new-packages/buildroot-new-packages.tex
@@ -914,34 +914,34 @@ $(eval $(generic-package))
   \end{block}
 \end{frame}
 
-\begin{frame}[fragile]{Describing actions: example (2)}
-  \begin{block}{zlib.mk}
+\begin{frame}[fragile]{Describing actions: libzlib.mk example}
+  \begin{block}{}
     \begin{minted}[fontsize=\tiny]{make}
-ZLIB_VERSION = 1.2.8
-ZLIB_SOURCE = zlib-$(ZLIB_VERSION).tar.xz
-ZLIB_SITE = http://downloads.sourceforge.net/project/libpng/zlib/$(ZLIB_VERSION)
-ZLIB_INSTALL_STAGING = YES
+LIBZLIB_VERSION = 1.2.11
+LIBZLIB_SOURCE = zlib-$(LIBZLIB_VERSION).tar.xz
+LIBZLIB_SITE = http://www.zlib.net
+LIBZLIB_INSTALL_STAGING = YES
 
-define ZLIB_CONFIGURE_CMDS
+define LIBZLIB_CONFIGURE_CMDS
         (cd $(@D); rm -rf config.cache; \
                 $(TARGET_CONFIGURE_ARGS) \
                 $(TARGET_CONFIGURE_OPTS) \
-                CFLAGS="$(TARGET_CFLAGS) $(ZLIB_PIC)" \
+                CFLAGS="$(TARGET_CFLAGS) $(LIBZLIB_PIC)" \
                 ./configure \
-                $(ZLIB_SHARED) \
+                $(LIBZLIB_SHARED) \
                 --prefix=/usr \
         )
 endef
 
-define ZLIB_BUILD_CMDS
+define LIBZLIB_BUILD_CMDS
         $(MAKE1) -C $(@D)
 endef
 
-define ZLIB_INSTALL_STAGING_CMDS
+define LIBZLIB_INSTALL_STAGING_CMDS
         $(MAKE1) -C $(@D) DESTDIR=$(STAGING_DIR) LDCONFIG=true install
 endef
 
-define ZLIB_INSTALL_TARGET_CMDS
+define LIBZLIB_INSTALL_TARGET_CMDS
         $(MAKE1) -C $(@D) DESTDIR=$(TARGET_DIR) LDCONFIG=true install
 endef