From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 4/4] core-updates: Ensure we have no temporary data in the package Date: Mon, 23 Mar 2020 19:34:59 +0000 Message-ID: <20200323193459.19522-4-michael.tremer@ipfire.org> In-Reply-To: <20200323193459.19522-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6519013271152982433==" List-Id: --===============6519013271152982433== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Signed-off-by: Michael Tremer --- lfs/cdrom | 3 --- lfs/core-updates | 2 +- lfs/flash-images | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lfs/cdrom b/lfs/cdrom index 175a5aedc..f18b80a03 100644 --- a/lfs/cdrom +++ b/lfs/cdrom @@ -255,9 +255,6 @@ endif cd $(DIR_TMP)/cdrom && mkisofs $(ISO_ARGS) \ -o /install/images/$(SNAME)-$(VERSION).$(BUILD_ARCH)-full-core$(CORE).iso . =20 - # Cleanup everything - rm -rf $(DIR_TMP)/cdrom - ifeq "$(HAS_ISOLINUX)" "1" isohybrid $(ISOHYBRID_ARGS) /install/images/$(SNAME)-$(VERSION).$(BUILD_ARC= H)-full-core$(CORE).iso endif diff --git a/lfs/core-updates b/lfs/core-updates index fe4fb837c..e0dfa69f4 100644 --- a/lfs/core-updates +++ b/lfs/core-updates @@ -52,7 +52,7 @@ $(TARGET) : $(CORE) =20 .PHONY: core/%: - rm -rf /install/packages/package + rm -rf /install/packages/package /tmp/* mkdir -p /install/packages/package eval $$(cat /usr/src/config/rootfiles/$@/meta) =20 diff --git a/lfs/flash-images b/lfs/flash-images index 422acac22..5f39c488f 100644 --- a/lfs/flash-images +++ b/lfs/flash-images @@ -262,4 +262,4 @@ endif =20 # Compress Image xz $(XZ_OPT) < $(IMG) > $(IMAGE_FILE) - rm -rf $(IMG) $(MNThdd) + rm -rf $(IMG) $(MNThdd) $(DIR_TMP)/cdrom --=20 2.20.1 --===============6519013271152982433==--