From: Michael Tremer <michael.tremer@ipfire.org>
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 [thread overview]
Message-ID: <20200323193459.19522-4-michael.tremer@ipfire.org> (raw)
In-Reply-To: <20200323193459.19522-1-michael.tremer@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 1329 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
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 .
- # Cleanup everything
- rm -rf $(DIR_TMP)/cdrom
-
ifeq "$(HAS_ISOLINUX)" "1"
isohybrid $(ISOHYBRID_ARGS) /install/images/$(SNAME)-$(VERSION).$(BUILD_ARCH)-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)
.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)
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
# Compress Image
xz $(XZ_OPT) < $(IMG) > $(IMAGE_FILE)
- rm -rf $(IMG) $(MNThdd)
+ rm -rf $(IMG) $(MNThdd) $(DIR_TMP)/cdrom
--
2.20.1
prev parent reply other threads:[~2020-03-23 19:34 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-23 19:34 [PATCH 1/4] cdrom: Cleanup everything after mastering Michael Tremer
2020-03-23 19:34 ` [PATCH 2/4] lfs: Drop quotes in DEPS variable Michael Tremer
2020-03-23 19:34 ` [PATCH 3/4] Config: Refactor mastering packages Michael Tremer
2020-03-23 19:34 ` Michael Tremer [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200323193459.19522-4-michael.tremer@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox