From 76217c6b0d719820290e88dd0ef9b810b4c31194 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Wed, 24 Jan 2024 14:35:55 +1100 Subject: [PATCH] Ensure sources are always cleaned the same Otherwise, in --repo mode, sources are not cleaned identically to how they are in non --repo mode --- steps/improve/clean_sources.sh | 6 ++++++ steps/linux-4.9.10/pass1.sh | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/steps/improve/clean_sources.sh b/steps/improve/clean_sources.sh index c8a8f7ab..746472d7 100755 --- a/steps/improve/clean_sources.sh +++ b/steps/improve/clean_sources.sh @@ -1,4 +1,5 @@ # SPDX-FileCopyrightText: 2023 Eduardo Sánchez Muñoz +# SPDX-FileCopyrightText: 2024 fosslinux # # SPDX-License-Identifier: GPL-3.0-or-later @@ -37,6 +38,11 @@ for source in "${DISTFILES}/"*; do rm "${source}" done +if [ -e "/external/repo-preseeded/linux-4.9.10_0.tar.bz2" ]; then + # This is done in src_extract out of necessity usually -- I can't think of a better solution :( + rm -f "${DISTFILES}/linux-4.9.10.tar.gz" +fi + unset get_source_filename unset pkgs pkg line unset keep_sources keep_source diff --git a/steps/linux-4.9.10/pass1.sh b/steps/linux-4.9.10/pass1.sh index 0b9a1fe2..2c1b6191 100644 --- a/steps/linux-4.9.10/pass1.sh +++ b/steps/linux-4.9.10/pass1.sh @@ -7,7 +7,7 @@ src_unpack() { mkdir "${pkg}" - mv "${DISTFILES}/deblob-4.9" "${pkg}/" + cp "${DISTFILES}/deblob-4.9" "${pkg}/" default || true # Predictable link errors - not a problem rm "${DISTFILES}/${pkg}.tar.gz" }