sbuild-chroot: Drop no longer needed and now broken riscv64 special case

Message ID e0283029-6862-4282-a235-0dab237a143e@siemens.com
State Accepted, archived
Headers show
Series sbuild-chroot: Drop no longer needed and now broken riscv64 special case | expand

Commit Message

Jan Kiszka Feb. 24, 2025, 9:02 p.m. UTC
From: Jan Kiszka <jan.kiszka@siemens.com>

This was forgotten while cleaning up for trixie in 735dc16c1e. However,
it continued to work - until these days. Fix the riscv64 build by simply
dropping the obsolete package list.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

Found via isar-cip-core where riscv64 is no longer allowed to break the 
build.

 meta/recipes-devtools/sbuild-chroot/sbuild-chroot-host.bb | 6 ------
 1 file changed, 6 deletions(-)

Comments

Jan Kiszka March 10, 2025, 6:31 a.m. UTC | #1
On 24.02.25 22:02, 'Jan Kiszka' via isar-users wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> This was forgotten while cleaning up for trixie in 735dc16c1e. However,
> it continued to work - until these days. Fix the riscv64 build by simply
> dropping the obsolete package list.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
> 
> Found via isar-cip-core where riscv64 is no longer allowed to break the 
> build.
> 
>  meta/recipes-devtools/sbuild-chroot/sbuild-chroot-host.bb | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot-host.bb b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot-host.bb
> index 255d6937..3f0888d8 100644
> --- a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot-host.bb
> +++ b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot-host.bb
> @@ -18,9 +18,3 @@ SBUILD_CHROOT_PREINSTALL ?= " \
>      crossbuild-essential-${DISTRO_ARCH} \
>      apt-utils \
>      "
> -
> -SBUILD_CHROOT_PREINSTALL:riscv64 ?= " \
> -    ${SBUILD_CHROOT_PREINSTALL_COMMON} \
> -    gcc-riscv64-linux-gnu \
> -    g++-riscv64-linux-gnu \
> -    dpkg-cross"

Can we please finally merge this fix? I'd like to avoid have to release
a downstream layer with an isar patch.

Jan
Felix Moessbauer March 10, 2025, 8:35 a.m. UTC | #2
On Mon, 2025-03-10 at 07:31 +0100, 'Jan Kiszka' via isar-users wrote:
> On 24.02.25 22:02, 'Jan Kiszka' via isar-users wrote:
> > From: Jan Kiszka <jan.kiszka@siemens.com>
> > 
> > This was forgotten while cleaning up for trixie in 735dc16c1e.
> > However,
> > it continued to work - until these days. Fix the riscv64 build by
> > simply
> > dropping the obsolete package list.
> > 
> > Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> > ---
> > 
> > Found via isar-cip-core where riscv64 is no longer allowed to break
> > the 
> > build.
> > 
> >  meta/recipes-devtools/sbuild-chroot/sbuild-chroot-host.bb | 6 ----
> > --
> >  1 file changed, 6 deletions(-)
> > 
> > diff --git a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot-
> > host.bb b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot-host.bb
> > index 255d6937..3f0888d8 100644
> > --- a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot-host.bb
> > +++ b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot-host.bb
> > @@ -18,9 +18,3 @@ SBUILD_CHROOT_PREINSTALL ?= " \
> >      crossbuild-essential-${DISTRO_ARCH} \
> >      apt-utils \
> >      "
> > -
> > -SBUILD_CHROOT_PREINSTALL:riscv64 ?= " \
> > -    ${SBUILD_CHROOT_PREINSTALL_COMMON} \
> > -    gcc-riscv64-linux-gnu \
> > -    g++-riscv64-linux-gnu \
> > -    dpkg-cross"
> 
> Can we please finally merge this fix? I'd like to avoid have to
> release
> a downstream layer with an isar patch.

If you want to release a downstream layer, you also need to consider
the "fix(rootfs): cleanup leftover 0000bootstrap.list" patch.
It would be good if that could get merged as well.

Currently ISAR is in a - let's say - not optimal state.

Felix

> 
> Jan
> 
> -- 
> Siemens AG, Foundational Technologies
> Linux Expert Center
Uladzimir Bely March 12, 2025, 1:09 p.m. UTC | #3
On Mon, 2025-02-24 at 22:02 +0100, 'Jan Kiszka' via isar-users wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> This was forgotten while cleaning up for trixie in 735dc16c1e.
> However,
> it continued to work - until these days. Fix the riscv64 build by
> simply
> dropping the obsolete package list.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
> 
> Found via isar-cip-core where riscv64 is no longer allowed to break
> the 
> build.
> 
>  meta/recipes-devtools/sbuild-chroot/sbuild-chroot-host.bb | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot-
> host.bb b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot-host.bb
> index 255d6937..3f0888d8 100644
> --- a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot-host.bb
> +++ b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot-host.bb
> @@ -18,9 +18,3 @@ SBUILD_CHROOT_PREINSTALL ?= " \
>      crossbuild-essential-${DISTRO_ARCH} \
>      apt-utils \
>      "
> -
> -SBUILD_CHROOT_PREINSTALL:riscv64 ?= " \
> -    ${SBUILD_CHROOT_PREINSTALL_COMMON} \
> -    gcc-riscv64-linux-gnu \
> -    g++-riscv64-linux-gnu \
> -    dpkg-cross"
> -- 
> 2.43.0
> 

Applied to next, thanks.

Patch

diff --git a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot-host.bb b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot-host.bb
index 255d6937..3f0888d8 100644
--- a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot-host.bb
+++ b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot-host.bb
@@ -18,9 +18,3 @@  SBUILD_CHROOT_PREINSTALL ?= " \
     crossbuild-essential-${DISTRO_ARCH} \
     apt-utils \
     "
-
-SBUILD_CHROOT_PREINSTALL:riscv64 ?= " \
-    ${SBUILD_CHROOT_PREINSTALL_COMMON} \
-    gcc-riscv64-linux-gnu \
-    g++-riscv64-linux-gnu \
-    dpkg-cross"