From patchwork Mon Mar 23 19:34:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2853 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 48mPjf3Vy3z3yBY for ; Mon, 23 Mar 2020 19:35:18 +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 48mPjb1N8kz2L3; Mon, 23 Mar 2020 19:35:15 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 48mPjZ3zxZz2yyG; 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 48mPjW6Tqnz2ycJ 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 48mPjW59zvz28p; 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=+42oZ4pN3fsO82nAzPrlRUxNBQuTHrqW78Ue6FLYSNQ=; b=oz5MS9byf//5p51cL+e6HbK1HzXcggvFvHaItBvXUCkfGJluNY25meDufoCTrzPAu779qg KGct9vMvtg0dMfCg== 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=+42oZ4pN3fsO82nAzPrlRUxNBQuTHrqW78Ue6FLYSNQ=; b=jX8JV1IPgoU9ps+hXmrY10rldmGxUIxdxE+ovw2X4Rvy0/WeQ11TPgwnGmCm/iezfwWS93 hUf51kUetKQYt9NyDotuEbT+j7pWIoyVb3jipRl4jHKjSoVkDvyy1OJZfah2HOALMnGqXO P3IR77RnRMktNcLd7kpCnMPKrSaHj25b66WyR2aMrgQVCv+vniDJ5a/767WvU9hAOuuVxr wflfKk+BA8I61v3VRL9fW4iqymL8wPW7ZfNZG0FRwxvimoJaifj9zeCNn9cXExD0MgXXgD j+phlIIkxV93LDHVkRLjlz1gV1jHe5RaZmUZnY5q6g8B4i1jBY9GpMUfcMDNQw== 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> 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" 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 . - # 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