make.sh: Drop stripping

This will massively improve the build process because we will only strip
the files that we need. The build system will remain as is.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/lfs/Config b/lfs/Config
index 71abb8b8500065fb6c71ae4128e6965126f7cb92..6914298a1bfd8d590c65a45cdc7df2ca7a3e039d 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -360,8 +360,12 @@ define COPY_FILES
        # Copy all files from $(1) to $(2)
        $(call COLLECT_FILES,$(1)) | $(call __FILES_IN) | $(call __FILES_OUT,$(2))
 
-       # Strip everything
-       $(DIR_SRC)/src/stripper $(2)
+       # Strip everything, except a few things
+       $(DIR_SRC)/src/stripper $(2) \
+               --exclude=/lib/firmware \
+               --exclude=/usr/lib/go \
+               --exclude=/usr/lib/vdr \
+               --exclude=/usr/sbin/vdr
 endef
 
 # Called to compress a file that will be distributed

diff --git a/lfs/strip b/lfs/strip
index 8fc7218e19fdfffdcb7326afc55d358c2b0bc11b..9dad68268f46e6d041c5527b44858af6c2ec632f 100644 (file)
--- a/lfs/strip
+++ b/lfs/strip
@@ -52,23 +52,4 @@ ifeq "$(TOOLCHAIN)" "1"
                --strip="$(TOOLS_DIR)/$(CROSSTARGET)/bin/strip" \
                --ignore-errors \
                --exclude=$(TOOLS_DIR)/$(CROSSTARGET)
-else
-       # Don't strip VDR binaries, because they use a weird plugin system
-       # which does not work when unneeded symbols get stripped from
-       # /usr/sbin/vdr.
-       $(DIR_SRC)/src/stripper / \
-               --exclude=$(TOOLS_DIR) \
-               --exclude=$(QEMU_TARGET_HELPER) \
-               --exclude=/lib/firmware/qcom/sc8280xp/LENOVO/21BX \
-               --exclude=/tmp \
-               --exclude=/usr/lib/go \
-               --exclude=/usr/lib/vdr \
-               --exclude=/usr/sbin/vdr \
-               --exclude=/usr/bin/cargo \
-               --exclude=/usr/bin/rustdoc \
-               --exclude=/usr/bin/rustc \
-               --exclude=/usr/libexec/rust-analyzer-proc-macro-srv \
-               --exclude=/usr/libexec/cargo-credential-1password \
-               --exclude=/usr/src \
-               --exclude=/var/tmp
 endif

diff --git a/make.sh b/make.sh
index 3c89f0e69bacb4b3e4059916a2b29c7243e27ffd..2e34abd2141471b52a128b0c669d61a523d9dd00 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -2022,9 +2022,6 @@ build_system() {
        # Build the installer
        lfsmake2 installer
 
-       # use toolchain bash for chroot to strip
-       CUSTOM_PATH="${TOOLS_DIR}/bin" lfsmake2 strip
-
        # Build images
        lfsmake2 cdrom
        lfsmake2 flash-images