Re: [PATCH v2 1/2] do not add cross profile when building native package

["'MOESSBAUER, Felix' via isar-users" <isar-users@googlegroups.com>]

On Tue, 2025-11-04 at 17:19 +0100, Jan Kiszka wrote:
> On 04.11.25 16:44, Felix Moessbauer wrote:
> > When building a -native package, the cross profile must not be added as
> > otherwise stricter apt cache checks added in trixie trigger. It anyways
> > makes no sense to add the cross profile when BUILD_ARCH equals
> > PACKAGE_ARCH. Previously this check was implemented incorrectly, as the
> > build arch was compared to the DISTRO_ARCH, which is always the target
> > arch in isar terms. This resulted in the following error message in
> > sbuild:
> > 
> >  E: The package cache was built for different architectures: amd64 vs arm64
> >  W: You may want to run apt-get update to correct these problems
> >  E: The package cache file is corrupted
> >  E: apt-get dist-upgrade failed
> > 
> > On bookworm, the incorrect check remained unnoticed, as apt did not have
> > the stricter checks yet.
> > 
> > Fixes: 872ef2e3 ("dpkg-base: Fix enabling of cross build profile")
> > Tested-by: Benedikt Niedermayr <benedikt.niedermayr@siemens.com>
> > Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
> > ---
> >  meta/classes/dpkg-base.bbclass             | 2 +-
> >  meta/recipes-kernel/linux/linux-custom.inc | 2 +-
> >  2 files changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass
> > index 4468a49a..d8287e8d 100644
> > --- a/meta/classes/dpkg-base.bbclass
> > +++ b/meta/classes/dpkg-base.bbclass
> > @@ -146,7 +146,7 @@ dpkg_runbuild() {
> >  
> >  def isar_deb_build_profiles(d):
> >      deb_build_profiles = d.getVar('DEB_BUILD_PROFILES')
> > -    if d.getVar('BUILD_ARCH') != d.getVar('DISTRO_ARCH'):
> > +    if d.getVar('BUILD_ARCH') != d.getVar('PACKAGE_ARCH'):
> >          deb_build_profiles += ' cross'
> >      return deb_build_profiles.strip()
> >  
> > diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc
> > index f2892921..01398697 100644
> > --- a/meta/recipes-kernel/linux/linux-custom.inc
> > +++ b/meta/recipes-kernel/linux/linux-custom.inc
> > @@ -109,7 +109,7 @@ KERNEL_NAME_PROVIDED ?= "${@ d.getVar('BPN').partition('linux-')[2]}"
> >  
> >  # Determine cross-profile override
> >  python() {
> > -    if d.getVar("DISTRO_ARCH") != d.getVar("HOST_ARCH") and bb.utils.to_boolean(d.getVar("ISAR_CROSS_COMPILE")) and "class-native" not in d.getVar("OVERRIDES").split(":"):
> > +    if d.getVar('BUILD_ARCH') != d.getVar('PACKAGE_ARCH') and bb.utils.to_boolean(d.getVar("ISAR_CROSS_COMPILE")) and "class-native" not in d.getVar("OVERRIDES").split(":"):
> >          d.appendVar("OVERRIDES", ":cross-profile")
> >  }
> >  
> 
> This looks like a separate patch, even if a dependency for this one. Or
> would fixing linux-custom.inc not be possible before fixing dpkg-base?

This needs to be fixed in a lockstep, as otherwise the :cross-profile
override and the DEB_BUILD_PROFILE = cross are not in sync.

Felix

> 
> Jan
> 
> -- 
> Siemens AG, Foundational Technologies
> Linux Expert Center

-- 
Siemens AG
Linux Expert Center
Friedrich-Ludwig-Bauer-Str. 3
85748 Garching, Germany

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/c2f47610d0dc307cab17684870bbad3af53915d6.camel%40siemens.com.