RE: [PATCH v7 06/13] sbuild: support of DEB_BUILD_PROFILES

["Moessbauer, Felix" <felix.moessbauer@siemens.com>]

Hi,

> -----Original Message-----
> From: isar-users@googlegroups.com <isar-users@googlegroups.com> On
> Behalf Of Uladzimir Bely
> Sent: Sunday, February 13, 2022 8:45 AM
> To: isar-users@googlegroups.com
> Subject: [PATCH v7 06/13] sbuild: support of DEB_BUILD_PROFILES
> 
> In Isar packages may use their own profiles. For example, linux-custom.inc
> introduces 'nolibcdev' profile that should be passed to dpkg-buildpackage in
> both cross and native builds.
> 
> By default, sbuild for cross-building uses passes "cross,nocheck" options to
> dpkg-buildpackage and ignores DEB_BUILD_PROFILES environment variable.

There is a typo (uses passes).

> 
> This change makes sbuild use custom profiles even in cross-build mode.
> 
> Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
> ---
>  meta/classes/dpkg.bbclass | 10 +++++++++-
>  1 file changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index
> 848ffad1..5511de64 100644
> --- a/meta/classes/dpkg.bbclass
> +++ b/meta/classes/dpkg.bbclass
> @@ -40,10 +40,18 @@ dpkg_runbuild() {
>      export DEB_BUILD_PROFILES="${@ isar_deb_build_profiles(d)}"
>      export PARALLEL_MAKE="${PARALLEL_MAKE}"
> 
> +    profiles=$(grep "DEB_BUILD_PROFILES" ${SBUILD_CONFIG} | tail -n1 | cut -d
> "'" -f 4)
> +    if [ ${ISAR_CROSS_COMPILE} -eq 1 ]; then
> +        profiles="${profiles} cross nocheck"
> +    fi
> +    if [ ! -z "$profiles" ]; then
> +        profiles=$(echo --profiles="$profiles" | sed -e 's/ \+/,/g')
> +    fi
> +
>      export SBUILD_CONFIG="${SBUILD_CONFIG}"
> 
>      sbuild -A -n -c ${SBUILD_CHROOT} --extra-repository="${ISAR_APT_REPO}" \
> -        --host=${PACKAGE_ARCH} --build=${SBUILD_HOST_ARCH} \
> +        --host=${PACKAGE_ARCH} --build=${SBUILD_HOST_ARCH} ${profiles}

As we handle the DEB_BUILD_PROFILES exclusively in ISAR anyways, can't we simplify this code by always adding --profiles="${@ isar_deb_build_profiles(d)}" and get rid of the export?
Otherwise we have to maintain the "cross nocheck" logic for cross-compiling at two different locations.

Felix


> + \
>          --no-run-lintian --no-run-piuparts --no-run-autopkgtest \
>          --debbuildopts="--source-option=-I" \
>          --build-dir=${WORKDIR} ${WORKDIR}/${PPS}
> --
> 2.20.1
> 
> --
> 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 on the web visit
> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgroups.g
> oogle.com%2Fd%2Fmsgid%2Fisar-users%2F20220213074459.24200-7-
> ubely%2540ilbers.de&amp;data=04%7C01%7Cfelix.moessbauer%40siemens.co
> m%7C9a465e3edb52484113a108d9eec4bf92%7C38ae3bcd95794fd4addab42e1
> 495d55a%7C1%7C0%7C637803351819682721%7CUnknown%7CTWFpbGZsb3d8
> eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%
> 7C3000&amp;sdata=Qq0ecQNOACm2ILez0sEG1A4qlyvrZ04kRT8dxkc4w2c%3D&
> amp;reserved=0.