[FE training-materials-updates] slides/buildroot: more host/usr removals

Thomas Petazzoni thomas.petazzoni at free-electrons.com
Sat Oct 14 23:31:23 CEST 2017 

Repository : git://git.free-electrons.com/training-materials.git
On branch  : master
Link       : http://git.free-electrons.com/training-materials/commit/?id=ede17865a5071ba891236d0c2f8ff027ea29a88f

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

commit ede17865a5071ba891236d0c2f8ff027ea29a88f
Author: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
Date:   Sat Oct 14 23:31:23 2017 +0200

    slides/buildroot: more host/usr removals
    
    Signed-off-by: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>


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

ede17865a5071ba891236d0c2f8ff027ea29a88f
 .../buildroot-advanced-packages.tex                  |  4 ++--
 slides/buildroot-appdev/buildroot-appdev.tex         |  2 +-
 slides/buildroot-internals/buildroot-internals.tex   | 20 ++++++++++----------
 slides/buildroot-make/buildroot-make.tex             |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/slides/buildroot-advanced-packages/buildroot-advanced-packages.tex b/slides/buildroot-advanced-packages/buildroot-advanced-packages.tex
index 5d96f36..7516c41 100644
--- a/slides/buildroot-advanced-packages/buildroot-advanced-packages.tex
+++ b/slides/buildroot-advanced-packages/buildroot-advanced-packages.tex
@@ -544,8 +544,8 @@ $ ./output/staging/usr/bin/libpng-config --cflags --ldflags
 {\tiny
   \begin{verbatim}
 $ ./output/staging/usr/bin/libpng-config --cflags --ldflags
--I.../buildroot/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/libpng16
--L.../buildroot/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib -lpng16
+-I.../buildroot/output/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/libpng16
+-L.../buildroot/output/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib -lpng16
   \end{verbatim}}
 \end{block}
 
diff --git a/slides/buildroot-appdev/buildroot-appdev.tex b/slides/buildroot-appdev/buildroot-appdev.tex
index 6b0d338..e1d0f0b 100644
--- a/slides/buildroot-appdev/buildroot-appdev.tex
+++ b/slides/buildroot-appdev/buildroot-appdev.tex
@@ -280,7 +280,7 @@ LINUX_OVERRIDE_SRCDIR = $(HOME)/projects/linux
     \end{itemize}
   \item On the host, start \code{<tuple>-gdb}
     \begin{itemize}
-    \item \code{$ ./output/host/usr/bin/<tuple>-gdb <program>}
+    \item \code{$ ./output/host/bin/<tuple>-gdb <program>}
     \item \code{<program>} is the path to the program to debug, with
       debugging symbols
     \end{itemize}
diff --git a/slides/buildroot-internals/buildroot-internals.tex b/slides/buildroot-internals/buildroot-internals.tex
index 5f501bc..700190a 100644
--- a/slides/buildroot-internals/buildroot-internals.tex
+++ b/slides/buildroot-internals/buildroot-internals.tex
@@ -454,7 +454,7 @@ xzcat /home/thomas/dl/zlib-1.2.8.tar.xz | tar ...
 
 >>> zlib 1.2.8 Installing to staging directory
 /usr/bin/make -j1 -C /home/thomas/projets/buildroot/output/build/zlib-1.2.8
-  DESTDIR=/home/thomas/projets/buildroot/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot
+  DESTDIR=/home/thomas/projets/buildroot/output/host/arm-buildroot-linux-uclibcgnueabi/sysroot
   LDCONFIG=true install
 
 >>> zlib 1.2.8 Installing to target
@@ -573,8 +573,8 @@ ifndef $(2)_CONFIGURE_CMDS
 ifeq ($(4),target)
 define $(2)_CONFIGURE_CMDS
     (cd $$($$(PKG)_BUILDDIR) && \
-     $$($$(PKG)_CONF_ENV) $$(HOST_DIR)/usr/bin/cmake $$($$(PKG)_SRCDIR) \
-         -DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake" \
+     $$($$(PKG)_CONF_ENV) $$(HOST_DIR)/bin/cmake $$($$(PKG)_SRCDIR) \
+         -DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/share/buildroot/toolchainfile.cmake" \
          ...
          $$($$(PKG)_CONF_OPT) \
     )
@@ -678,9 +678,9 @@ endif
   \item Build starts with utility host tools and libraries needed for
     gcc (\code{host-m4}, \code{host-mpc}, \code{host-mpfr},
     \code{host-gmp}). Installed in
-    \code{$(HOST_DIR)/usr/{bin,include,lib}}
+    \code{$(HOST_DIR)/{bin,include,lib}}
   \item Build goes on with the cross binutils, \code{host-binutils},
-    installed in \code{$(HOST_DIR)/usr/bin}
+    installed in \code{$(HOST_DIR)/bin}
   \item Then the first stage compiler, \code{host-gcc-initial}
   \item We need the \code{linux-headers}, installed in
     \code{$(STAGING_DIR)/usr/include}
@@ -688,7 +688,7 @@ endif
     in \code{$(STAGING_DIR)/lib}, \code{$(STAGING_DIR)/usr/include}
     and of course \code{$(TARGET_DIR)/lib}
   \item We build the final compiler \code{host-gcc-final}, installed
-    in \code{$(HOST_DIR)/usr/bin}
+    in \code{$(HOST_DIR)/bin}
   \end{itemize}
   \column{0.3\textwidth}
   \includegraphics[width=\textwidth]{slides/buildroot-internals/internal-toolchain-graph-depends.pdf}
@@ -711,7 +711,7 @@ endif
       kernel headers) to \code{$(STAGING_DIR)/usr/{include,lib}}
     \item Copy the toolchain libraries to \code{$(TARGET_DIR)/usr/lib}
     \item Create symbolic links or wrappers for the compiler, linker,
-      debugger, etc from \code{$(HOST_DIR)/usr/bin/<tuple>-<tool>} to
+      debugger, etc from \code{$(HOST_DIR)/bin/<tuple>-<tool>} to
       \code{$(HOST_DIR)/opt/ext-toolchain/bin/<tuple>-<tool>}
     \item A wrapper program is used for certain tools (gcc, ld, g++,
       etc.) in order to ensure a certain number of compiler flags are
@@ -751,11 +751,11 @@ $$(BINARIES_DIR)/rootfs.$(1): target-finalize $$(ROOTFS_$(2)_DEPENDENCIES)
         $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),$$(call $$(hook))$$(sep))
         ...
         echo "chown -h -R 0:0 $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT)
-        echo "$$(HOST_DIR)/usr/bin/makedevs -d $$(FULL_DEVICE_TABLE) $$(TARGET_DIR)" >> \
+        echo "$$(HOST_DIR)/bin/makedevs -d $$(FULL_DEVICE_TABLE) $$(TARGET_DIR)" >> \
               $$(FAKEROOT_SCRIPT)
         echo "$$(ROOTFS_$(2)_CMD)" >> $$(FAKEROOT_SCRIPT)
         chmod a+x $$(FAKEROOT_SCRIPT)
-        PATH=$$(BR_PATH) $$(HOST_DIR)/usr/bin/fakeroot -- $$(FAKEROOT_SCRIPT)
+        PATH=$$(BR_PATH) $$(HOST_DIR)/bin/fakeroot -- $$(FAKEROOT_SCRIPT)
         ...
 
 rootfs-$(1): $$(BINARIES_DIR)/rootfs.$(1) $$(ROOTFS_$(2)_POST_TARGETS)
@@ -789,7 +789,7 @@ UBIFS_OPTS += $(call qstrip,$(BR2_TARGET_ROOTFS_UBIFS_OPTS))
 ROOTFS_UBIFS_DEPENDENCIES = host-mtd
 
 define ROOTFS_UBIFS_CMD
-        $(HOST_DIR)/usr/sbin/mkfs.ubifs -d $(TARGET_DIR) $(UBIFS_OPTS) -o $@
+        $(HOST_DIR)/sbin/mkfs.ubifs -d $(TARGET_DIR) $(UBIFS_OPTS) -o $@
 endef
 
 $(eval $(call ROOTFS_TARGET,ubifs))
diff --git a/slides/buildroot-make/buildroot-make.tex b/slides/buildroot-make/buildroot-make.tex
index 3c96ac3..377fd12 100644
--- a/slides/buildroot-make/buildroot-make.tex
+++ b/slides/buildroot-make/buildroot-make.tex
@@ -92,7 +92,7 @@ endef
     \begin{block}{}
 \begin{minted}[fontsize=\tiny]{make}
 ifeq ($(BR2_CCACHE),y)
-CCACHE := $(HOST_DIR)/usr/bin/ccache
+CCACHE := $(HOST_DIR)/bin/ccache
 endif
 
 distclean: clean

More information about the training-materials-updates mailing list