diff mbox series

dpkg-base: Fix do_cleanall_apt with custom DISTRO values

Message ID b94f35cd-5fef-4a34-9e5d-8af282afe7c7@siemens.com
State Accepted, archived
Headers show
Series dpkg-base: Fix do_cleanall_apt with custom DISTRO values | expand

Commit Message

Jan Kiszka July 15, 2024, 11:46 a.m. UTC 
From: Jan Kiszka <jan.kiszka@siemens.com>

This was apparently forgotten by 5e85ad04e205.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta/classes/dpkg-base.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Uladzimir Bely July 30, 2024, 8:05 a.m. UTC | #1 
On Mon, 2024-07-15 at 13:46 +0200, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> This was apparently forgotten by 5e85ad04e205.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  meta/classes/dpkg-base.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-
> base.bbclass
> index d90b32a9..95cc830d 100644
> --- a/meta/classes/dpkg-base.bbclass
> +++ b/meta/classes/dpkg-base.bbclass
> @@ -172,7 +172,7 @@ addtask apt_unpack after do_apt_fetch
>  do_cleanall_apt[nostamp] = "1"
>  do_cleanall_apt() {
>      for uri in "${SRC_APT}"; do
> -        rm -rf "${DEBSRCDIR}"/"${DISTRO}"/"$uri"
> +        rm -rf "${DEBSRCDIR}/${BASE_DISTRO}-
> ${BASE_DISTRO_CODENAME}/$uri"
>      done
>  }
>  

Applied to next, thanks.
diff mbox series

Patch

diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass
index d90b32a9..95cc830d 100644
--- a/meta/classes/dpkg-base.bbclass
+++ b/meta/classes/dpkg-base.bbclass
@@ -172,7 +172,7 @@  addtask apt_unpack after do_apt_fetch
 do_cleanall_apt[nostamp] = "1"
 do_cleanall_apt() {
     for uri in "${SRC_APT}"; do
-        rm -rf "${DEBSRCDIR}"/"${DISTRO}"/"$uri"
+        rm -rf "${DEBSRCDIR}/${BASE_DISTRO}-${BASE_DISTRO_CODENAME}/$uri"
     done
 }