core-updates: Ensure we have no temporary data in the package

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/lfs/cdrom b/lfs/cdrom
index 175a5aedc1b4cb26efc1a68ff3f5a0b282c3dbfb..f18b80a033dc57bf13c9350789e100aa032ecf52 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

diff --git a/lfs/core-updates b/lfs/core-updates
index fe4fb837cfffa2b2634b5f7cf110814c5319066b..e0dfa69f4a1f0b4e0a4009c4015c195c684705a4 100644 (file)
--- 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 422acac22e2c2803661b3e77cad2611e1280b2fc..5f39c488f610e25fdaa8ccd17952260e19ad0225 100644 (file)
--- 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