From: ms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Date: Sat, 2 Feb 2008 14:06:25 +0000 (+0000)
Subject: Reorganized the process of packaging the iso.
X-Git-Tag: v3.0-alpha1~1114
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=75c838a080fffffd0f53396b4ec095c1abe306e3;p=ipfire-3.x.git

Reorganized the process of packaging the iso.
strip did the wrong files.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@1173 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
---

diff --git a/lfs/cdrom b/lfs/cdrom
index 0fee01969..494d83ea6 100644
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -46,19 +46,24 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	
 	mkdir -p $(CDROM_DIR)/{boot/grub,doc}
 	
-	### Compress root fs
+	### Compressing root fs
 	#
-	cd / && find $(DIR_SOURCE)/rootfiles/core -maxdepth 1 -type f | xargs cat | \
-		grep -v ^# | sed -e "s/KVER/$(KVER)/g" | sort | uniq | \
-		cpio -o -H newc 2>/tmp/cpio.err | \
-		lzma e -si -so > $(CDROM_DIR)/$(SNAME)-$(VERSION).img
-		
-	if grep "No such file or directory" < /tmp/cpio.err; then \
-		rm -f /tmp/cpio.err; \
+	find $(DIR_SOURCE)/rootfiles/core -maxdepth 1 -type f | xargs cat | \
+		grep -v ^# | sed -e "s/KVER/$(KVER)/g" | sort | uniq > $(CDROM_DIR)/archive.files
+	
+	cd / && cpio -o -H newc < $(CDROM_DIR)/archive.files \
+		> $(CDROM_DIR)/$(SNAME)-$(VERSION).img.tmp 2>$(CDROM_DIR)/archive.errors
+
+	@cat $(CDROM_DIR)/archive.errors
+	if grep "No such file or directory" < $(CDROM_DIR)/archive.errors; then \
 		exit 1; \
-	else \
-		rm -f /tmp/cpio.err; \
 	fi
+	
+	lzma e 	$(CDROM_DIR)/$(SNAME)-$(VERSION).img.tmp \
+					$(CDROM_DIR)/$(SNAME)-$(VERSION).img
+	
+	# These files won't be included in the iso
+	@rm -f $(CDROM_DIR)/archive.{files,errors} $(CDROM_DIR)/$(SNAME)-$(VERSION).img.tmp
 
 	# Other files
 	sed 's/VERSION/$(VERSION)/' $(DIR_CONF)/cdrom/README.txt > $(CDROM_DIR)/README.txt
diff --git a/lfs/strip b/lfs/strip
index 892bc284b..be78c281b 100644
--- a/lfs/strip
+++ b/lfs/strip
@@ -52,8 +52,8 @@ ifeq "$(STAGE)" "toolchain"
 endif
 
 ifeq "$(STAGE)" "packages"
-	-$(TOOLS_DIR)/bin/find /{,usr/}{bin,lib,sbin} -type f ! -name make ! -name bash -exec \
+	-$(TOOLS_DIR)/bin/find $(LFS)/{,usr/}{bin,lib,sbin} -type f -exec \
 		$(TOOLS_DIR)/bin/strip --strip-debug '{}' ';' &>/dev/null
-	-$(TOOLS_DIR)/bin/find /{,usr/}{bin,sbin} -type f ! -name make ! -name bash -exec \
+	-$(TOOLS_DIR)/bin/find $(LFS)/{,usr/}{bin,sbin} -type f -exec \
 		$(TOOLS_DIR)/bin/strip --strip-all '{}' ';' &>/dev/null
 endif