[bootlin/training-materials updates] master: slides/buildroot-internals: update to Buildroot 2019.02 (302d744c)
Thomas Petazzoni
thomas.petazzoni at bootlin.com
Wed Mar 20 16:21:08 CET 2019
Repository : https://github.com/bootlin/training-materials
On branch : master
Link : https://github.com/bootlin/training-materials/commit/302d744c87ed509367e59c4b3b1adfb0ba3c0c75
>---------------------------------------------------------------
commit 302d744c87ed509367e59c4b3b1adfb0ba3c0c75
Author: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
Date: Wed Mar 20 16:21:08 2019 +0100
slides/buildroot-internals: update to Buildroot 2019.02
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
>---------------------------------------------------------------
302d744c87ed509367e59c4b3b1adfb0ba3c0c75
slides/buildroot-internals/buildroot-internals.tex | 93 ++++++----
slides/buildroot-internals/final-example.dia | 201 +++++++--------------
slides/buildroot-internals/global-build-logic.dia | 36 ++--
3 files changed, 142 insertions(+), 188 deletions(-)
diff --git a/slides/buildroot-internals/buildroot-internals.tex b/slides/buildroot-internals/buildroot-internals.tex
index d6be4d7e..bd99a1e8 100644
--- a/slides/buildroot-internals/buildroot-internals.tex
+++ b/slides/buildroot-internals/buildroot-internals.tex
@@ -151,7 +151,8 @@ $(BUILD_DIR)/%/.stamp_target_installed:
$(BUILD_DIR)/%/.stamp_downloaded:
$(foreach hook,$($(PKG)_PRE_DOWNLOAD_HOOKS),$(call $(hook))$(sep))
[...]
- $(foreach p,$($(PKG)_ALL_DOWNLOADS),$(call DOWNLOAD,$(p))$(sep))
+ $(foreach p,$($(PKG)_ALL_DOWNLOADS),$(call DOWNLOAD,$(p))$(sep))
+ $(foreach hook,$($(PKG)_POST_DOWNLOAD_HOOKS),$(call $(hook))$(sep))
$(Q)mkdir -p $(@D)
$(Q)touch $@
\end{minted}
@@ -181,8 +182,8 @@ $(BUILD_DIR)/%/.stamp_built::
$(foreach hook,$($(PKG)_PRE_BUILD_HOOKS),$(call $(hook))$(sep))
+$($(PKG)_BUILD_CMDS)
$(foreach hook,$($(PKG)_POST_BUILD_HOOKS),$(call $(hook))$(sep))
- $(Q)touch $@
@$(call step_end,build)
+ $(Q)touch $@
\end{minted}
\end{block}
@@ -396,7 +397,7 @@ $$($(2)_TARGET_EXTRACT): $$($(2)_TARGET_SOURCE)
$(1)-source: $$($(2)_TARGET_SOURCE)
-$$($(2)_TARGET_SOURCE): | dirs prepare
+$$($(2)_TARGET_SOURCE): | prepare
$$($(2)_TARGET_SOURCE): | dependencies
\end{minted}
\end{block}
@@ -443,22 +444,18 @@ xzcat /home/thomas/dl/zlib-1.2.8.tar.xz | tar ...
\end{verbatim}
\end{frame}
-\begin{frame}[fragile]{Preparation work: dirs, prepare, dependencies}
+\begin{frame}[fragile]{Preparation work: prepare, dependencies}
\begin{block}{pkg-generic.mk}
\begin{minted}[fontsize=\tiny]{make}
-$$($(2)_TARGET_SOURCE): | dirs prepare
+$$($(2)_TARGET_SOURCE): | prepare
$$($(2)_TARGET_SOURCE): | dependencies
\end{minted}
\end{block}
\begin{itemize}
- \item All packages have three targets in their dependencies:
+ \item All packages have two targets in their dependencies:
\begin{itemize}
- \item \code{dirs}: creates the main directories (\code{BUILD_DIR},
- \code{TARGET_DIR}, \code{HOST_DIR}, etc.). As part of creating
- \code{TARGET_DIR}, the root filesystem skeleton is copied into
- it
\item \code{prepare}: generates a kconfig-related \code{auto.conf}
file
\item \code{dependencies}: triggers the check of Buildroot system
@@ -506,7 +503,7 @@ $(1)-reconfigure: $(1)-clean-for-reconfigure $(1)
\item Specialized {\bf package infrastructures} were created to
handle these packages, and reduce the amount of duplication
\item For {\em autotools}, {\em CMake}, {\em Python}, {\em Perl},
- {\em Lua} and {\em kconfig} packages
+ {\em Lua}, {\em Meson}, {\em Golang} and {\em kconfig} packages
\end{itemize}
\end{frame}
@@ -514,20 +511,19 @@ $(1)-reconfigure: $(1)-clean-for-reconfigure $(1)
\begin{block}{package/flann/flann.mk}
\begin{minted}[fontsize=\tiny]{make}
-FLANN_VERSION = d0c04f4d290ebc3aa9411a3322992d298e51f5aa
+FLANN_VERSION = 1.9.1
FLANN_SITE = $(call github,mariusmuja,flann,$(FLANN_VERSION))
FLANN_INSTALL_STAGING = YES
FLANN_LICENSE = BSD-3-Clause
FLANN_LICENSE_FILES = COPYING
-FLANN_CONF_OPT = \
+FLANN_CONF_OPTS = \
-DBUILD_C_BINDINGS=ON \
-DBUILD_PYTHON_BINDINGS=OFF \
-DBUILD_MATLAB_BINDINGS=OFF \
-DBUILD_EXAMPLES=$(if $(BR2_PACKAGE_FLANN_EXAMPLES),ON,OFF) \
- -DBUILD_TESTS=OFF \
- -DBUILD_DOC=OFF \
-DUSE_OPENMP=$(if $(BR2_GCC_ENABLE_OPENMP),ON,OFF) \
- -DPYTHON_EXECUTABLE=OFF
+ -DPYTHON_EXECUTABLE=OFF \
+ -DCMAKE_DISABLE_FIND_PACKAGE_HDF5=TRUE
$(eval $(cmake-package))
\end{minted}
@@ -717,36 +713,59 @@ endif
\end{itemize}
\end{frame}
-\begin{frame}[fragile]{{\tt fs/common.mk}}
+\begin{frame}[fragile]{{\tt fs/common.mk}, part 1}
\begin{block}{}
- \begin{minted}[fontsize=\tiny]{make}
-define ROOTFS_TARGET_INTERNAL
-
-ROOTFS_$(2)_DEPENDENCIES += host-fakeroot host-makedevs \
- $$(if $$(PACKAGES_USERS),host-mkpasswd)
+\begin{minted}[fontsize=\tiny]{make}
+ROOTFS_COMMON_DEPENDENCIES = \
+ host-fakeroot host-makedevs \
+ $(BR2_TAR_HOST_DEPENDENCY) \
+ $(if $(PACKAGES_USERS)$(ROOTFS_USERS_TABLES),host-mkpasswd)
+
+rootfs-common: $(ROOTFS_COMMON_DEPENDENCIES) target-finalize
+ @$(call MESSAGE,"Generating root filesystems common tables")
+ rm -rf $(FS_DIR)
+ mkdir -p $(FS_DIR)
+ $(call PRINTF,$(PACKAGES_USERS)) >> $(ROOTFS_FULL_USERS_TABLE)
+ cat $(ROOTFS_USERS_TABLES) >> $(ROOTFS_FULL_USERS_TABLE)
+ $(call PRINTF,$(PACKAGES_PERMISSIONS_TABLE)) > $(ROOTFS_FULL_DEVICES_TABLE)
+ cat $(ROOTFS_DEVICE_TABLES) >> $(ROOTFS_FULL_DEVICES_TABLE)
+\end{minted}
+ \end{block}
+\end{frame}
-$$(BINARIES_DIR)/rootfs.$(1): target-finalize $$(ROOTFS_$(2)_DEPENDENCIES)
- @$$(call MESSAGE,"Generating root filesystem image rootfs.$(1)")
- $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),$$(call $$(hook))$$(sep))
- ...
+\begin{frame}[fragile]{{\tt fs/common.mk}, part 2}
+ \begin{block}{}
+\begin{minted}[fontsize=\tiny]{make}
+define inner-rootfs
+ROOTFS_$(2)_IMAGE_NAME ?= rootfs.$(1)
+ROOTFS_$(2)_FINAL_IMAGE_NAME = $$(strip $$(ROOTFS_$(2)_IMAGE_NAME))
+ROOTFS_$(2)_DIR = $$(FS_DIR)/$(1)
+ROOTFS_$(2)_TARGET_DIR = $$(ROOTFS_$(2)_DIR)/target
+
+$$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES)
+ @$$(call MESSAGE,"Generating filesystem image $$(ROOTFS_$(2)_FINAL_IMAGE_NAME)")
+ [...]
+ mkdir -p $$(ROOTFS_$(2)_DIR)
+ rsync -auH \
+ --exclude=/$$(notdir $$(TARGET_DIR_WARNING_FILE)) \
+ $$(BASE_TARGET_DIR)/ \
+ $$(TARGET_DIR)
+ echo '#!/bin/sh' > $$(FAKEROOT_SCRIPT)
+ echo "set -e" >> $$(FAKEROOT_SCRIPT)
echo "chown -h -R 0:0 $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT)
- echo "$$(HOST_DIR)/bin/makedevs -d $$(FULL_DEVICE_TABLE) $$(TARGET_DIR)" >> \
- $$(FAKEROOT_SCRIPT)
- echo "$$(ROOTFS_$(2)_CMD)" >> $$(FAKEROOT_SCRIPT)
+ PATH=$$(BR_PATH) $$(TOPDIR)/support/scripts/mkusers $$(ROOTFS_FULL_USERS_TABLE) $$(TARGET_DIR) >> $$(FAKEROOT_SCRIPT)
+ echo "$$(HOST_DIR)/bin/makedevs -d $$(ROOTFS_FULL_DEVICES_TABLE) $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT)
+ [...]
+ $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT)
chmod a+x $$(FAKEROOT_SCRIPT)
PATH=$$(BR_PATH) $$(HOST_DIR)/bin/fakeroot -- $$(FAKEROOT_SCRIPT)
- ...
-
-rootfs-$(1): $$(BINARIES_DIR)/rootfs.$(1) $$(ROOTFS_$(2)_POST_TARGETS)
-
+[...]
ifeq ($$(BR2_TARGET_ROOTFS_$(2)),y)
TARGETS_ROOTFS += rootfs-$(1)
endif
endef
-define ROOTFS_TARGET
-$(call ROOTFS_TARGET_INTERNAL,$(1),$(call UPPERCASE,$(1)))
-endef
+rootfs = $(call inner-rootfs,$(pkgname),$(call UPPERCASE,$(pkgname)))
\end{minted}
\end{block}
\end{frame}
@@ -771,7 +790,7 @@ define ROOTFS_UBIFS_CMD
$(HOST_DIR)/sbin/mkfs.ubifs -d $(TARGET_DIR) $(UBIFS_OPTS) -o $@
endef
-$(eval $(call ROOTFS_TARGET,ubifs))
+$(eval $(rootfs))
\end{minted}
\end{block}
\end{frame}
diff --git a/slides/buildroot-internals/final-example.dia b/slides/buildroot-internals/final-example.dia
index 319ec785..ddf13c5c 100644
--- a/slides/buildroot-internals/final-example.dia
+++ b/slides/buildroot-internals/final-example.dia
@@ -68,7 +68,7 @@
<dia:point val="22.2,42.6"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="22.15,42.55;36.05,51.45"/>
+ <dia:rectangle val="22.15,42.55;36.05,49.05"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="22.2,42.6"/>
@@ -77,7 +77,7 @@
<dia:real val="13.799999999999997"/>
</dia:attribute>
<dia:attribute name="elem_height">
- <dia:real val="8.8000000000000043"/>
+ <dia:real val="6.3999999999999986"/>
</dia:attribute>
<dia:attribute name="border_width">
<dia:real val="0.10000000149011612"/>
@@ -126,7 +126,7 @@
<dia:point val="26,5"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="25.1525,4.42875;26.8475,5.57125"/>
+ <dia:rectangle val="25.1525,4.4075;26.8475,5.5925"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -140,7 +140,7 @@
<dia:real val="1.411111056804657"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="26,5.37125"/>
+ <dia:point val="26,5.3775"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -191,7 +191,7 @@
<dia:point val="26,9"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="24.5875,8.42875;27.4125,9.57125"/>
+ <dia:rectangle val="24.5875,8.4075;27.4125,9.5925"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -205,7 +205,7 @@
<dia:real val="1.411111056804657"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="26,9.37125"/>
+ <dia:point val="26,9.3775"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -256,7 +256,7 @@
<dia:point val="26,13"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="21.1975,12.4287;30.8025,13.5712"/>
+ <dia:rectangle val="21.1975,12.4075;30.8025,13.5925"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -270,7 +270,7 @@
<dia:real val="1.411111056804657"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="26,13.3712"/>
+ <dia:point val="26,13.3775"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -321,12 +321,12 @@
<dia:point val="20,17"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="15.48,16.4287;24.52,17.5712"/>
+ <dia:rectangle val="15.1975,16.3631;24.8321,17.6369"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
- <dia:string>#$(TARGET_ROOTFS)#</dia:string>
+ <dia:string>#$(TARGETS_ROOTFS)#</dia:string>
</dia:attribute>
<dia:attribute name="font">
<dia:font family="Inconsolata" style="48" name="Courier"/>
@@ -335,7 +335,7 @@
<dia:real val="1.411111056804657"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="20,17.3712"/>
+ <dia:point val="20,17.3627"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -383,7 +383,7 @@
<dia:point val="34,20"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="29.7625,19.4287;38.2375,20.5712"/>
+ <dia:rectangle val="30.045,19.4075;37.955,20.5925"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -397,7 +397,7 @@
<dia:real val="1.411111056804657"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="34,20.3712"/>
+ <dia:point val="34,20.3775"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -448,7 +448,7 @@
<dia:point val="34,26"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="30.8925,25.3859;37.1361,26.6141"/>
+ <dia:rectangle val="30.8925,25.4075;37.1075,26.5925"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -462,7 +462,7 @@
<dia:real val="1.411111056804657"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="34,26.357"/>
+ <dia:point val="34,26.3775"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -572,7 +572,7 @@
<dia:point val="35,5.2"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="35,4.2575;40.65,5.4"/>
+ <dia:rectangle val="35,4.23;40.65,5.415"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -605,7 +605,7 @@
<dia:point val="35,9.2"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="35,8.2575;48.56,9.4"/>
+ <dia:rectangle val="35,8.23;48.56,9.415"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -638,12 +638,12 @@
<dia:point val="35,12.8"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="35,11.8575;63.815,13"/>
+ <dia:rectangle val="35,11.8004;63.8446,13.0743"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
- <dia:string>#target-post-image: $(TARGET_ROOTFS) target-finalize#</dia:string>
+ <dia:string>#target-post-image: $(TARGETS_ROOTFS) target-finalize#</dia:string>
</dia:attribute>
<dia:attribute name="font">
<dia:font family="Inconsolata" style="48" name="Courier"/>
@@ -1004,7 +1004,7 @@ image types to generate#</dia:string>
<dia:point val="43.15,18.1"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="43.15,17.1289;58.9986,18.3571"/>
+ <dia:rectangle val="43.15,17.13;58.405,18.315"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -1126,7 +1126,7 @@ image types to generate#</dia:string>
<dia:point val="34.25,28.25"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="33.13,27.925;35.37,28.575"/>
+ <dia:rectangle val="33.13,27.9138;35.37,28.5862"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -1140,7 +1140,7 @@ image types to generate#</dia:string>
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="34.25,28.46"/>
+ <dia:point val="34.25,28.4638"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -1191,7 +1191,7 @@ image types to generate#</dia:string>
<dia:point val="28.25,28.75"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="26.81,28.425;29.69,29.075"/>
+ <dia:rectangle val="26.81,28.4138;29.69,29.0862"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -1205,7 +1205,7 @@ image types to generate#</dia:string>
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="28.25,28.96"/>
+ <dia:point val="28.25,28.9638"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -1256,7 +1256,7 @@ image types to generate#</dia:string>
<dia:point val="29.25,31.25"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="26.37,30.925;32.13,31.575"/>
+ <dia:rectangle val="26.37,30.9138;32.13,31.5862"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -1270,7 +1270,7 @@ image types to generate#</dia:string>
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="29.25,31.46"/>
+ <dia:point val="29.25,31.4638"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -1321,7 +1321,7 @@ image types to generate#</dia:string>
<dia:point val="39.75,28.25"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="38.95,27.925;40.55,28.575"/>
+ <dia:rectangle val="38.95,27.9138;40.55,28.5862"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -1335,7 +1335,7 @@ image types to generate#</dia:string>
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="39.75,28.46"/>
+ <dia:point val="39.75,28.4638"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -1386,7 +1386,7 @@ image types to generate#</dia:string>
<dia:point val="34.25,34.75"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="32.81,34.425;35.69,35.075"/>
+ <dia:rectangle val="32.81,34.4138;35.69,35.0862"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -1400,7 +1400,7 @@ image types to generate#</dia:string>
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="34.25,34.96"/>
+ <dia:point val="34.25,34.9637"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -1451,7 +1451,7 @@ image types to generate#</dia:string>
<dia:point val="40.75,34.75"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="38.19,34.425;43.31,35.075"/>
+ <dia:rectangle val="38.19,34.4138;43.31,35.0862"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -1465,7 +1465,7 @@ image types to generate#</dia:string>
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="40.75,34.96"/>
+ <dia:point val="40.75,34.9637"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -1516,7 +1516,7 @@ image types to generate#</dia:string>
<dia:point val="20.125,19.25"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="18.205,18.925;22.045,19.575"/>
+ <dia:rectangle val="18.205,18.9138;22.045,19.5862"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -1530,7 +1530,7 @@ image types to generate#</dia:string>
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="20.125,19.46"/>
+ <dia:point val="20.125,19.4638"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -1581,7 +1581,7 @@ image types to generate#</dia:string>
<dia:point val="22.25,23.25"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="20.17,22.925;24.33,23.575"/>
+ <dia:rectangle val="20.17,22.9138;24.33,23.5862"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -1595,7 +1595,7 @@ image types to generate#</dia:string>
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="22.25,23.46"/>
+ <dia:point val="22.25,23.4638"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -1646,7 +1646,7 @@ image types to generate#</dia:string>
<dia:point val="16.25,23.25"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="14.97,22.925;17.53,23.575"/>
+ <dia:rectangle val="14.97,22.9138;17.53,23.5862"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -1660,7 +1660,7 @@ image types to generate#</dia:string>
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="16.25,23.46"/>
+ <dia:point val="16.25,23.4638"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -1711,7 +1711,7 @@ image types to generate#</dia:string>
<dia:point val="10.25,23.25"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="8.17,22.925;12.33,23.575"/>
+ <dia:rectangle val="8.17,22.9138;12.33,23.5862"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -1725,7 +1725,7 @@ image types to generate#</dia:string>
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="10.25,23.46"/>
+ <dia:point val="10.25,23.4638"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -1776,7 +1776,7 @@ image types to generate#</dia:string>
<dia:point val="13.75,32.25"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="12.31,31.925;15.19,32.575"/>
+ <dia:rectangle val="12.31,31.9137;15.19,32.5862"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -1790,7 +1790,7 @@ image types to generate#</dia:string>
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="13.75,32.46"/>
+ <dia:point val="13.75,32.4637"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -1841,7 +1841,7 @@ image types to generate#</dia:string>
<dia:point val="20.75,32.25"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="18.51,31.925;22.99,32.575"/>
+ <dia:rectangle val="18.51,31.9137;22.99,32.5862"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -1855,7 +1855,7 @@ image types to generate#</dia:string>
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="20.75,32.46"/>
+ <dia:point val="20.75,32.4637"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -1906,7 +1906,7 @@ image types to generate#</dia:string>
<dia:point val="25.625,38.25"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="23.705,37.925;27.545,38.575"/>
+ <dia:rectangle val="23.705,37.9138;27.545,38.5862"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -1920,7 +1920,7 @@ image types to generate#</dia:string>
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="25.625,38.46"/>
+ <dia:point val="25.625,38.4637"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -1971,7 +1971,7 @@ image types to generate#</dia:string>
<dia:point val="47.25,34.75"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="45.81,34.425;48.69,35.075"/>
+ <dia:rectangle val="45.81,34.4138;48.69,35.0862"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -1985,7 +1985,7 @@ image types to generate#</dia:string>
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="47.25,34.96"/>
+ <dia:point val="47.25,34.9637"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -2036,7 +2036,7 @@ image types to generate#</dia:string>
<dia:point val="47.25,37.25"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="45.97,36.925;48.53,37.575"/>
+ <dia:rectangle val="45.97,36.9138;48.53,37.5862"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -2050,7 +2050,7 @@ image types to generate#</dia:string>
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="47.25,37.46"/>
+ <dia:point val="47.25,37.4637"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -2101,7 +2101,7 @@ image types to generate#</dia:string>
<dia:point val="47.375,39.75"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="45.295,39.425;49.455,40.075"/>
+ <dia:rectangle val="45.295,39.4138;49.455,40.0862"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -2115,7 +2115,7 @@ image types to generate#</dia:string>
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="47.375,39.96"/>
+ <dia:point val="47.375,39.9637"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -2166,7 +2166,7 @@ image types to generate#</dia:string>
<dia:point val="47.375,42.25"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="45.295,41.925;49.455,42.575"/>
+ <dia:rectangle val="45.295,41.9138;49.455,42.5862"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -2180,7 +2180,7 @@ image types to generate#</dia:string>
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="47.375,42.46"/>
+ <dia:point val="47.375,42.4637"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -2231,7 +2231,7 @@ image types to generate#</dia:string>
<dia:point val="43.875,44.75"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="41.955,44.425;45.795,45.075"/>
+ <dia:rectangle val="41.955,44.4138;45.795,45.0862"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -2245,7 +2245,7 @@ image types to generate#</dia:string>
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="43.875,44.96"/>
+ <dia:point val="43.875,44.9637"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -2296,7 +2296,7 @@ image types to generate#</dia:string>
<dia:point val="50.875,44.75"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="49.755,44.425;51.995,45.075"/>
+ <dia:rectangle val="49.755,44.4138;51.995,45.0862"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -2310,7 +2310,7 @@ image types to generate#</dia:string>
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="50.875,44.96"/>
+ <dia:point val="50.875,44.9637"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -2872,7 +2872,7 @@ image types to generate#</dia:string>
<dia:point val="29,44.6"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="27.0225,44.0288;30.9775,45.1713"/>
+ <dia:rectangle val="27.0225,44.0075;30.9775,45.1925"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -2886,7 +2886,7 @@ image types to generate#</dia:string>
<dia:real val="1.411111056804657"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="29,44.9713"/>
+ <dia:point val="29,44.9775"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -2937,7 +2937,7 @@ image types to generate#</dia:string>
<dia:point val="29,47.2"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="25.61,46.6288;32.39,47.7713"/>
+ <dia:rectangle val="25.61,46.6075;32.39,47.7925"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -2951,7 +2951,7 @@ image types to generate#</dia:string>
<dia:real val="1.411111056804657"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="29,47.5713"/>
+ <dia:point val="29,47.5775"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -2968,72 +2968,7 @@ image types to generate#</dia:string>
<dia:connection handle="0" to="O91" connection="8"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Box" version="0" id="O93">
- <dia:attribute name="obj_pos">
- <dia:point val="23,48.8"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="22.95,48.75;35.05,50.85"/>
- </dia:attribute>
- <dia:attribute name="elem_corner">
- <dia:point val="23,48.8"/>
- </dia:attribute>
- <dia:attribute name="elem_width">
- <dia:real val="12"/>
- </dia:attribute>
- <dia:attribute name="elem_height">
- <dia:real val="2"/>
- </dia:attribute>
- <dia:attribute name="border_width">
- <dia:real val="0.10000000149011612"/>
- </dia:attribute>
- <dia:attribute name="border_color">
- <dia:color val="#5cacff"/>
- </dia:attribute>
- <dia:attribute name="inner_color">
- <dia:color val="#add8e6"/>
- </dia:attribute>
- <dia:attribute name="show_background">
- <dia:boolean val="true"/>
- </dia:attribute>
- </dia:object>
- <dia:object type="Standard - Text" version="1" id="O94">
- <dia:attribute name="obj_pos">
- <dia:point val="29,49.8"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="27.87,49.2287;30.13,50.3712"/>
- </dia:attribute>
- <dia:attribute name="text">
- <dia:composite type="text">
- <dia:attribute name="string">
- <dia:string>#dirs#</dia:string>
- </dia:attribute>
- <dia:attribute name="font">
- <dia:font family="Inconsolata" style="48" name="Courier"/>
- </dia:attribute>
- <dia:attribute name="height">
- <dia:real val="1.411111056804657"/>
- </dia:attribute>
- <dia:attribute name="pos">
- <dia:point val="29,50.1713"/>
- </dia:attribute>
- <dia:attribute name="color">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:attribute name="alignment">
- <dia:enum val="1"/>
- </dia:attribute>
- </dia:composite>
- </dia:attribute>
- <dia:attribute name="valign">
- <dia:enum val="2"/>
- </dia:attribute>
- <dia:connections>
- <dia:connection handle="0" to="O93" connection="8"/>
- </dia:connections>
- </dia:object>
- <dia:object type="Standard - Line" version="0" id="O95">
+ <dia:object type="Standard - Line" version="0" id="O93">
<dia:attribute name="obj_pos">
<dia:point val="40.4,35.6"/>
</dia:attribute>
@@ -3063,7 +2998,7 @@ image types to generate#</dia:string>
<dia:connection handle="1" to="O0" connection="1"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Line" version="0" id="O96">
+ <dia:object type="Standard - Line" version="0" id="O94">
<dia:attribute name="obj_pos">
<dia:point val="29.2394,32.0494"/>
</dia:attribute>
@@ -3094,7 +3029,7 @@ image types to generate#</dia:string>
<dia:connection handle="1" to="O0" connection="1"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Line" version="0" id="O97">
+ <dia:object type="Standard - Line" version="0" id="O95">
<dia:attribute name="obj_pos">
<dia:point val="25.625,39"/>
</dia:attribute>
@@ -3125,7 +3060,7 @@ image types to generate#</dia:string>
<dia:connection handle="1" to="O0" connection="1"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Text" version="1" id="O98">
+ <dia:object type="Standard - Text" version="1" id="O96">
<dia:attribute name="obj_pos">
<dia:point val="27.2,41.4"/>
</dia:attribute>
@@ -3159,7 +3094,7 @@ for all packages#</dia:string>
<dia:enum val="3"/>
</dia:attribute>
</dia:object>
- <dia:object type="Standard - Text" version="1" id="O99">
+ <dia:object type="Standard - Text" version="1" id="O97">
<dia:attribute name="obj_pos">
<dia:point val="52.8338,19.2525"/>
</dia:attribute>
@@ -3194,7 +3129,7 @@ copy rootfs overlays, run post-build scripts, etc.)#</dia:string>
<dia:enum val="3"/>
</dia:attribute>
</dia:object>
- <dia:object type="Standard - Text" version="1" id="O100">
+ <dia:object type="Standard - Text" version="1" id="O98">
<dia:attribute name="obj_pos">
<dia:point val="3.74,46.6425"/>
</dia:attribute>
diff --git a/slides/buildroot-internals/global-build-logic.dia b/slides/buildroot-internals/global-build-logic.dia
index 9ab45d21..19f46dfd 100644
--- a/slides/buildroot-internals/global-build-logic.dia
+++ b/slides/buildroot-internals/global-build-logic.dia
@@ -97,7 +97,7 @@
<dia:point val="26,5"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="25.1525,4.42875;26.8475,5.57125"/>
+ <dia:rectangle val="25.1525,4.4075;26.8475,5.5925"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -111,7 +111,7 @@
<dia:real val="1.411111056804657"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="26,5.37125"/>
+ <dia:point val="26,5.3775"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -162,7 +162,7 @@
<dia:point val="26,9"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="24.5875,8.42875;27.4125,9.57125"/>
+ <dia:rectangle val="24.5875,8.4075;27.4125,9.5925"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -176,7 +176,7 @@
<dia:real val="1.411111056804657"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="26,9.37125"/>
+ <dia:point val="26,9.3775"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -227,7 +227,7 @@
<dia:point val="26,13"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="21.1975,12.4287;30.8025,13.5712"/>
+ <dia:rectangle val="21.1975,12.4075;30.8025,13.5925"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -241,7 +241,7 @@
<dia:real val="1.411111056804657"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="26,13.3712"/>
+ <dia:point val="26,13.3775"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -292,12 +292,12 @@
<dia:point val="20,17"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="15.48,16.4287;24.52,17.5712"/>
+ <dia:rectangle val="15.1975,16.3631;24.8321,17.6369"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
- <dia:string>#$(TARGET_ROOTFS)#</dia:string>
+ <dia:string>#$(TARGETS_ROOTFS)#</dia:string>
</dia:attribute>
<dia:attribute name="font">
<dia:font family="Inconsolata" style="48" name="Courier"/>
@@ -306,7 +306,7 @@
<dia:real val="1.411111056804657"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="20,17.3712"/>
+ <dia:point val="20,17.3627"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -357,7 +357,7 @@
<dia:point val="34,20"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="29.7625,19.4287;38.2375,20.5712"/>
+ <dia:rectangle val="30.045,19.4075;37.955,20.5925"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -371,7 +371,7 @@
<dia:real val="1.411111056804657"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="34,20.3712"/>
+ <dia:point val="34,20.3775"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -422,7 +422,7 @@
<dia:point val="34,24"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="30.8925,23.3859;37.1361,24.6141"/>
+ <dia:rectangle val="30.8925,23.4075;37.1075,24.5925"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -436,7 +436,7 @@
<dia:real val="1.411111056804657"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="34,24.357"/>
+ <dia:point val="34,24.3775"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -549,7 +549,7 @@
<dia:point val="35,5.2"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="35,4.2575;40.65,5.4"/>
+ <dia:rectangle val="35,4.23;40.65,5.415"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -582,7 +582,7 @@
<dia:point val="35,9.2"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="35,8.2575;48.56,9.4"/>
+ <dia:rectangle val="35,8.23;48.56,9.415"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -615,12 +615,12 @@
<dia:point val="35,12.8"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="35,11.8575;63.815,13"/>
+ <dia:rectangle val="35,11.8004;63.8446,13.0743"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
- <dia:string>#target-post-image: $(TARGET_ROOTFS) target-finalize#</dia:string>
+ <dia:string>#target-post-image: $(TARGETS_ROOTFS) target-finalize#</dia:string>
</dia:attribute>
<dia:attribute name="font">
<dia:font family="Inconsolata" style="48" name="Courier"/>
@@ -981,7 +981,7 @@ image types to generate#</dia:string>
<dia:point val="43,19.6"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="43,18.6289;58.8486,19.8571"/>
+ <dia:rectangle val="43,18.63;58.255,19.815"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
More information about the training-materials-updates
mailing list