From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 2/4] cdrom: Do not write the temporary tarball to disk
Date: Tue, 10 Mar 2020 13:26:04 +0000
Message-ID: <20200310132606.21372-3-michael.tremer@ipfire.org>
In-Reply-To: <20200310132606.21372-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0667048760750605091=="
List-Id: <development.lists.ipfire.org>

--===============0667048760750605091==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

In order to remove any duplicate files in the tarball, we
have to unpack it again. The whole filesystem is written
to disk twice which is unnecessary.

This patch removes that temporary step and reduces IO
during the build.

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 lfs/cdrom | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/lfs/cdrom b/lfs/cdrom
index b26db754b..836cae981 100644
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -29,6 +29,9 @@ VER =3D ipfire
 THISAPP    =3D cdrom
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
=20
+# Fail when there is an error in the tar pipe
+SHELL=3D/bin/bash -o pipefail
+
 ifeq "$(BUILD_PLATFORM)" "arm"
 	TAR_OPTIONS =3D
 else
@@ -147,7 +150,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	# since stage2 has been executed..
 	echo "$(SYSTEM_RELEASE)" > /etc/system-release
=20
-	rm -rf /install/cdrom /tmp/*
+	rm -rf /install/cdrom
 	mkdir -p /install/cdrom/doc
=20
 	# Clear mtab (prevents .journal problems)
@@ -158,18 +161,18 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	BUILDTARGET=3D"$(BUILDTARGET)" BUILD_ARCH=3D"$(BUILD_ARCH)" KVER=3D"$(KVER)=
" \
 		$(DIR_SRC)/src/scripts/archive.files \
 		$(DIR_SRC)/config/rootfiles/common \
-		> /tmp/ROOTFILES
+		> $(DIR_TMP)/ROOTFILES
=20
 	# Compress root filesystem
 	# Reason for this tar+untar+tar is removing of entries listed two or more i=
n src/ROOTFILES
-	tar -c --exclude=3D'#*' --exclude=3D'proc/*' --exclude=3D'dev/pts/*' \
-		--exclude=3D'__pycache__' --exclude=3D'tmp/ROOTFILES' \
-		-C / --files-from=3D/tmp/ROOTFILES -f /$(SNAME).tar
-	rm -f /tmp/ROOTFILES
-	tar -x -C /tmp -f /$(SNAME).tar
-	rm -f /$(SNAME).tar
-	@mkdir /tmp/sys
-	cd /tmp && tar cf - * | xz $(XZ_OPT) > /install/cdrom/distro.img && rm -rf *
+	rm -rf $(DIR_TMP)/root && mkdir -p $(DIR_TMP)/root
+	tar -c --exclude=3D'#*' --exclude=3D'proc/*' --exclude=3D'dev/pts/*' --excl=
ude=3D'tmp/*' \
+		--exclude=3D'__pycache__' \
+		-C / --files-from=3D$(DIR_TMP)/ROOTFILES | tar -x -C $(DIR_TMP)/root
+	rm -f $(DIR_TMP)/ROOTFILES
+	mkdir $(DIR_TMP)/root/sys
+	cd $(DIR_TMP)/root && tar cf - * | xz $(XZ_OPT) > /install/cdrom/distro.img
+	rm -rf $(DIR_TMP)/root
=20
 	# Other files
 	touch /install/cdrom/$(SNAME)-$(VERSION)-core$(CORE).media
--=20
2.20.1


--===============0667048760750605091==--