From patchwork Mon Mar 23 19:34:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2852 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 48mPjc65dnz3yBq for ; Mon, 23 Mar 2020 19:35:16 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 48mPjZ4stwz2K4; Mon, 23 Mar 2020 19:35:14 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 48mPjZ24J1z2xlT; Mon, 23 Mar 2020 19:35:14 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 48mPjW5fn8z2xm4 for ; Mon, 23 Mar 2020 19:35:11 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 48mPjW497Tzc; Mon, 23 Mar 2020 19:35:11 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1584992111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ktQY7owHgvB7IiE5jHUf73w/MdKjcMoE1a9UhUggX6s=; b=ERs8nUjMjee8/FVS8ZAPfJuuKNgP+ctRbFDiaOYTHzjjGi6t+PvK/h/5mO8MLbdzasEVsp ibgBI9p+eajxGkBQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1584992111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ktQY7owHgvB7IiE5jHUf73w/MdKjcMoE1a9UhUggX6s=; b=mTg4GvX6Vj6QW4HTBSY5c/IJSXdTFCQV75WLy1oGawuPLJtzSwx8vyjLzp2AR9nB/0TB7K AJsHZVPGWWteGP+wLWQJumuXAtqQVN6JJgXu3/0qXQNDLiNTJUGkQdgUwiOkeJslNhJE2N YurwMTkQX46ApL3Qi+0RAI0ffuATm+26S49tlYNbc1CH+XYePpTO6ZIQJ4sKnq3LCw2KaP JHG0NUVQq7BeqvqwKy34FzWgP0YXwrmCjralKC6emFRGd3Bn1Y9cOKVGe7BrTW9G9LtYWI 5YPWDEhecRMfbjduU8WpdACGsv4YNyiRTAa86831Sccmha64fNrcS0skQ5Ls9Q== From: Michael Tremer 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> References: <20200323193459.19522-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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 --- 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 = $(LFS_BASEDIR)/cache/check DIR_CONF = $(LFS_BASEDIR)/config DIR_INFO = $(LFS_BASEDIR)/log DIR_TMP = /tmp +DIR_TMP_PAK = $(DIR_TMP)/package-$(PROG) # Add the compiler location and version and specs to the ccache hash CCACHE_COMPILERCHECK += $(shell gcc -dumpspecs 2>/dev/null | md5sum | cut -d ' ' -f1) @@ -227,39 +228,62 @@ endef 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 --exclude='#*' --exclude='__pycache__' --files-from=/install/packages/package/ROOTFILES - # Double tar to remove double files - tar xfp /install/packages/package/files.tmp --numeric-owner -C /install/packages/package/tmp/ - rm -f /install/packages/package/files.tmp - cd /install/packages/package/tmp/ && tar cf - -p --numeric-owner * | xz $(XZ_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/ROOTFILES - cd /install/packages/package && tar cf ../$(PROG)-$(VER)-$(PAK_VER).ipfire --files-from=/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='#*' --exclude='proc/*' --exclude='dev/pts/*' --exclude='tmp/*' \ + --exclude='__pycache__' \ + -C / --files-from=$(DIR_TMP_PAK)/ROOTFILES | tar -x -C $(DIR_TMP_PAK)/root + + # 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).ipfire * + + # 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=\"%s\" /install/packages/$(PROG)-$(VER)-$(PAK_VER).ipfire)/g" \ < /usr/src/src/pakfire/meta > /install/packages/meta-$(PROG) endef