core-updates: Ensure we have no temporary data in the package
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 23 Mar 2020 19:34:59 +0000 (19:34 +0000)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 24 Mar 2020 08:58:10 +0000 (08:58 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
lfs/cdrom
lfs/core-updates
lfs/flash-images

index 175a5ae..f18b80a 100644 (file)
--- 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
index fe4fb83..e0dfa69 100644 (file)
@@ -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)
 
index 422acac..5f39c48 100644 (file)
@@ -262,4 +262,4 @@ endif
 
        # Compress Image
        xz $(XZ_OPT) < $(IMG) > $(IMAGE_FILE)
-       rm -rf $(IMG) $(MNThdd)
+       rm -rf $(IMG) $(MNThdd) $(DIR_TMP)/cdrom