From 7abde63fc4cb233707bf571c3b4fe2f1c03d65bc Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 9 Jul 2024 17:47:04 +0000
Subject: [PATCH] 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>
---
 lfs/Config |  8 ++++++--
 lfs/strip  | 19 -------------------
 make.sh    |  3 ---
 3 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/lfs/Config b/lfs/Config
index 71abb8b85..6914298a1 100644
--- 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 8fc7218e1..9dad68268 100644
--- 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 3c89f0e69..2e34abd21 100755
--- 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
-- 
2.39.5