Re: [PATCH 1/1] add support for debian build profiles

[vijai kumar <vijaikumar.kanagarajan@gmail.com>]

On Wed, Dec 22, 2021 at 12:37 AM Felix Moessbauer
<felix.moessbauer@siemens.com> wrote:
>
> This patch adds the bitbake variables DEB_BUILD_PROFILES and
> DEB_BUILD_PROFILES_CROSS.
> The values of these variables are used to define the DEB_BUILD_PROFILES
> environment variable.
>
> When cross-compiling, the DEB_BUILD_PROFILES_CROSS variable is defaulted
> to "cross", to be consistent with upstream debian.
>
> Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
> ---
>  RECIPE-API-CHANGELOG.md        |  8 ++++++++
>  meta/classes/dpkg-base.bbclass | 12 ++++++++++++
>  meta/classes/dpkg.bbclass      |  5 ++---
>  3 files changed, 22 insertions(+), 3 deletions(-)
>
> diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md
> index 55836258..f95f7db5 100644
> --- a/RECIPE-API-CHANGELOG.md
> +++ b/RECIPE-API-CHANGELOG.md
> @@ -306,3 +306,11 @@ When using the plugins it is advised to name the partition "/boot" and to exclud
>
>  The variable is renamed to get closer to OE/Poky variables naming. The old naming
>  will still also work, but with deprecation warning shown.
> +
> +### Introduce debian build profiles
> +
> +All recipes that inherit from dpkg and dpkg-base can utilize the variables DEB_BUILD_PROFILES and DEB_BUILD_PROFILES_CROSS.
> +These variables define the DEB_BUILD_PROFILES environment variable which is available in do_install_builddeps and do_dpkg_build.
> +The DEB_BUILD_PROFILES_CROSS bitbake variable is set to "cross" when cross compiling.

Hi Felix,

Thank you for the patch.

We could modify the u-boot recipe to have it as an example.

Also, It might be useful if we can say something about custom profile
names. Debian has a standard[1] for those.
pkg.$sourcepackage.$anything

Better to recommend users to follow it, to make sure they don't
accidentally reuse one of the registered profile names when creating
custom profiles.

[1] https://wiki.debian.org/BuildProfileSpec

> +
> +
> diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass
> index 6704385b..c1588528 100644
> --- a/meta/classes/dpkg-base.bbclass
> +++ b/meta/classes/dpkg-base.bbclass
> @@ -13,6 +13,8 @@ inherit deb-dl-dir
>  DEPENDS ?= ""
>
>  DEPENDS_append_riscv64 = "${@' crossbuild-essential-riscv64' if d.getVar('ISAR_CROSS_COMPILE', True) == '1' and d.getVar('PN') != 'crossbuild-essential-riscv64' else ''}"
> +DEB_BUILD_PROFILES ?= ""
> +DEB_BUILD_PROFILES_CROSS ?= "cross"

Do we really need two variables? Is the DEB_BUILD_PROFILES not sufficient?

>
>  python do_adjust_git() {
>      import subprocess
> @@ -201,7 +203,16 @@ dpkg_runbuild() {
>      die "This should never be called, overwrite it in your derived class"
>  }
>
> +def isar_export_build_profiles(d):
> +    import os
> +    deb_build_profiles = os.environ['DEB_BUILD_PROFILES'] if 'DEB_BUILD_PROFILES' in os.environ else ''

Ideally the user should set DEB_BUILD_PROFILES in the recipe and the
below line would be sufficient.

> +    deb_build_profiles += ' ' + d.getVar('DEB_BUILD_PROFILES', True)
> +    if d.getVar("ISAR_CROSS_COMPILE") == "1":
> +        deb_build_profiles += ' ' + d.getVar('DEB_BUILD_PROFILES_CROSS', True)

Probably we can directly add "cross" and drop DEB_BUILD_PROFILES_CROSS

> +    os.environ['DEB_BUILD_PROFILES'] = deb_build_profiles.strip()
> +
>  python do_dpkg_build() {
> +    isar_export_build_profiles(d)
>      lock = bb.utils.lockfile(d.getVar("REPO_ISAR_DIR") + "/isar.lock",
>                               shared=True)
>      bb.build.exec_func("dpkg_do_mounts", d)
> @@ -278,6 +289,7 @@ python do_devshell() {
>      bb.build.exec_func('dpkg_do_mounts', d)
>
>      isar_export_proxies(d)
> +    isar_export_build_profiles(d)
>
>      buildchroot = d.getVar('BUILDCHROOT_DIR')
>      pp_pps = os.path.join(d.getVar('PP'), d.getVar('PPS'))
> diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass
> index 7da73341..8e5626e8 100644
> --- a/meta/classes/dpkg.bbclass
> +++ b/meta/classes/dpkg.bbclass
> @@ -9,10 +9,9 @@ PACKAGE_ARCH ?= "${DISTRO_ARCH}"
>  do_install_builddeps() {
>      dpkg_do_mounts
>      E="${@ isar_export_proxies(d)}"
> +    E="${@ isar_export_build_profiles(d)}"
>      distro="${DISTRO}"
> -    if [ ${ISAR_CROSS_COMPILE} -eq 1 ]; then
> -       distro="${HOST_DISTRO}"
> -    fi

Probably a mistake dropping the above lines?

Thanks,
Vijai Kumar K

> +
>      deb_dl_dir_import "${BUILDCHROOT_DIR}" "${distro}"
>      sudo -E chroot ${BUILDCHROOT_DIR} /isar/deps.sh \
>          ${PP}/${PPS} ${PACKAGE_ARCH} --download-only
> --
> 2.30.2
>
> --
> 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://groups.google.com/d/msgid/isar-users/20211221190653.1142246-1-felix.moessbauer%40siemens.com.