From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 3/4] Config: Refactor mastering packages
Date: Mon, 23 Mar 2020 19:34:58 +0000
Message-ID: <20200323193459.19522-3-michael.tremer@ipfire.org>
In-Reply-To: <20200323193459.19522-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3857050462780670993=="
List-Id: <development.lists.ipfire.org>

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

Those are now created in their own temporary directory, so that
no other files can be included by accident.

We also package with fewer temporary files.

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

diff --git a/lfs/Config b/lfs/Config
index 3c552f3f0..faf01ca1a 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -98,6 +98,7 @@ DIR_CHK     =3D $(LFS_BASEDIR)/cache/check
 DIR_CONF    =3D $(LFS_BASEDIR)/config
 DIR_INFO    =3D $(LFS_BASEDIR)/log
 DIR_TMP     =3D /tmp
+DIR_TMP_PAK =3D $(DIR_TMP)/package-$(PROG)
=20
 # Add the compiler location and version and specs to the ccache hash
 CCACHE_COMPILERCHECK +=3D $(shell gcc -dumpspecs 2>/dev/null | md5sum | cut =
-d ' ' -f1)
@@ -227,39 +228,62 @@ endef
=20
 define PAK
 	# Bringing the files to their right place.
-	@rm -rf /install/packages/package
-	@mkdir -p /install/packages/package/tmp
+	@rm -rf $(DIR_TMP_PAK) && mkdir -p $(DIR_TMP_PAK)
 	if [ -e "/usr/src/src/paks/$(PROG)" ]; then \
 		cp -f /usr/src/src/paks/$(PROG)/{,un}install.sh /usr/src/src/paks/$(PROG)/=
update.sh \
-		/install/packages/package; \
+		$(DIR_TMP_PAK); \
 	else \
 		cp -f /usr/src/src/paks/default/{,un}install.sh /usr/src/src/paks/default/=
update.sh \
-		/install/packages/package; \
+		$(DIR_TMP_PAK); \
 	fi
 	for i in $(DIR_SRC)/config/rootfiles/packages/{$(BUILD_ARCH),}/$(PROG); do \
 		if [ -e "$${i}" ]; then \
-			cp -v $${i} /install/packages/package/ROOTFILES; \
+			cp -v $${i} $(DIR_TMP_PAK)/ROOTFILES; \
 			break; \
 		fi; \
 	done
-	sed -e 's/BUILDTARGET/$(BUILDTARGET)/g' -e 's/KVER/$(KVER)/g' -e 's/MACHINE=
/$(BUILD_ARCH)/g' -i /install/packages/package/ROOTFILES
-	sed -e 's/xxxKVERxxx/$(KVER)/g' -i /install/packages/package/install.sh
-	chmod 755 /install/packages/package/{{,un}install,update}.sh
-	cd / && tar cfp /install/packages/package/files.tmp --numeric-owner --exclu=
de=3D'#*' --exclude=3D'__pycache__' --files-from=3D/install/packages/package/=
ROOTFILES
-	# Double tar to remove double files
-	tar xfp /install/packages/package/files.tmp --numeric-owner -C /install/pac=
kages/package/tmp/
-	rm -f /install/packages/package/files.tmp
-	cd /install/packages/package/tmp/ && tar cf - -p --numeric-owner * | xz $(X=
Z_OPT) > /install/packages/package/files.tar.xz
-	rm -r /install/packages/package/tmp
-	-cat /install/packages/package/ROOTFILES | grep -v "#" > /install/packages/=
package/ROOTFILES.tmp
-	mv /install/packages/package/ROOTFILES.tmp /install/packages/package/ROOTFI=
LES
-	cd /install/packages/package && tar cf ../$(PROG)-$(VER)-$(PAK_VER).ipfire =
--files-from=3D/usr/src/src/paks/files
-	rm -rf /install/packages/package
-	sed -e s/NAME/$(PROG)/g \
-			-e s/VER/$(VER)/g \
-			-e s/RELEASE/$(PAK_VER)/g \
-			-e s/DEPS/$(DEPS)/g \
-			-e s/SIZE/`ls -l \/install\/packages\/$(PROG)-$(VER)-$(PAK_VER).ipfire | =
awk '{ print $$5 }'`/g \
+
+	# Replace variables in rootfiles
+	sed -i $(DIR_TMP_PAK)/ROOTFILES \
+		-e 's/BUILDTARGET/$(BUILDTARGET)/g' \
+		-e 's/KVER/$(KVER)/g' \
+		-e 's/MACHINE/$(BUILD_ARCH)/g'
+
+	# Replace variables in scripts
+	sed -i $(DIR_TMP_PAK)/install.sh \
+		-e 's/xxxKVERxxx/$(KVER)/g'
+
+	# Make scripts executable
+	chmod 754 $(DIR_TMP_PAK)/{{,un}install,update}.sh
+
+	# Collect all files
+	rm -rf $(DIR_TMP_PAK)/root && mkdir -p $(DIR_TMP_PAK)/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_PAK)/ROOTFILES | tar -x -C $(DIR_TMP_PAK)/ro=
ot
+
+	# Compress tarball
+	cd $(DIR_TMP_PAK)/root && tar cf - * | xz $(XZ_OPT) > $(DIR_TMP_PAK)/files.=
tar.xz
+
+	# Cleanup temporary files
+	rm -rf $(DIR_TMP_PAK)/root
+
+	# Remove any commented lines
+	sed -i $(DIR_TMP_PAK)/ROOTFILES -e "/^#/d"
+
+	# Make package
+	cd $(DIR_TMP_PAK) && tar cf /install/packages/$(PROG)-$(VER)-$(PAK_VER).ipf=
ire *
+
+	# Cleanup
+	rm -rf $(DIR_TMP_PAK)
+
+	# Create meta file
+	sed \
+		-e "s/NAME/$(PROG)/g" \
+		-e "s/VER/$(VER)/g" \
+		-e "s/RELEASE/$(PAK_VER)/g" \
+		-e "s/DEPS/$(DEPS)/g" \
+		-e "s/SIZE/$$(stat --format=3D\"%s\" /install/packages/$(PROG)-$(VER)-$(PA=
K_VER).ipfire)/g" \
 	  < /usr/src/src/pakfire/meta > /install/packages/meta-$(PROG)
 endef
=20
--=20
2.20.1


--===============3857050462780670993==--