Re: [PATCH v5 1/4] u-boot: Switch to use DEB_BUILD_PROFILES

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

On Tue, Feb 1, 2022 at 6:24 PM Moessbauer, Felix
<felix.moessbauer@siemens.com> wrote:
>
> Hi Vijai,
>
> > -----Original Message-----
> > From: isar-users@googlegroups.com <isar-users@googlegroups.com> On
> > Behalf Of Vijai Kumar K
> > Sent: Tuesday, February 1, 2022 12:57 PM
> > To: isar-users@googlegroups.com; Kiszka, Jan (T CED)
> > <jan.kiszka@siemens.com>
> > Cc: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
> > Subject: [PATCH v5 1/4] u-boot: Switch to use DEB_BUILD_PROFILES
> >
> > Use DEB_BUILD_PROFILES to select packages to build.
> >
> > This patch drops the U_BOOT_TOOLS_PACKAGE and
> > U_BOOT_CONFIG_PACKAGE variables and introduces
> > U_BOOT_BUILD_PROFILES through which we can enable particular packages
> > like u-boot-tools, u-boot-dev and u-boot-config.
> >
> > Also, provide backward compatibility with U_BOOT_*_PACKAGES variable and
> > prompt a deprecation warning to user.
> >
> > Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
> > ---
> >  RECIPE-API-CHANGELOG.md                       | 11 ++++
> >  .../u-boot/files/debian/control.tmpl          | 13 +++++
> >  meta/recipes-bsp/u-boot/files/debian/rules    |  9 +++-
> >  meta/recipes-bsp/u-boot/u-boot-custom.inc     | 52 ++++++++++---------
> >  4 files changed, 59 insertions(+), 26 deletions(-)
> >
> > diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index
> > ce0a6da..118b328 100644
> > --- a/RECIPE-API-CHANGELOG.md
> > +++ b/RECIPE-API-CHANGELOG.md
> > @@ -335,3 +335,14 @@ names for kernel/headers.
> >  Changes in next
> >  ---------------
> >
> > +### Deprecate U_BOOT_TOOLS_PACKAGE and U_BOOT_CONFIG_PACKAGE
> > +
> > +Use U_BOOT_BUILD_PROFILES instead of U_BOOT_TOOLS_PACKAGE and
> > +U_BOOT_CONFIG_PACKAGE
> > +
> > +U_BOOT_TOOLS_PACKAGE = "1" is achieved by U_BOOT_BUILD_PROFILES +=
> > "tools"
> > +U_BOOT_CONFIG_PACKAGE = "1" is achieved by U_BOOT_BUILD_PROFILES +=
> > "config"
> > +
> > +u-boot-${MACHINE}-dev package build can also be controlled now. Enabled
> > +by default in u-boot-custom.inc. To remove use the below code in your recipe.
> > +
> > +U_BOOT_BUILD_PROFILES_remove = "dev"
> > diff --git a/meta/recipes-bsp/u-boot/files/debian/control.tmpl b/meta/recipes-
> > bsp/u-boot/files/debian/control.tmpl
> > index 9379be7..7ac11ad 100644
> > --- a/meta/recipes-bsp/u-boot/files/debian/control.tmpl
> > +++ b/meta/recipes-bsp/u-boot/files/debian/control.tmpl
> > @@ -11,4 +11,17 @@ Description: ${DESCRIPTION}, bootloader binaries
> >
> >  Package: u-boot-${MACHINE}-dev
> >  Architecture: ${DISTRO_ARCH}
> > +Build-Profiles: <dev>
> >  Description: ${DESCRIPTION}, bootloader libraries
> > +
> > +Package: u-boot-tools
> > +Architecture: linux-any
> > +Build-Profiles: <tools>
> > +Depends: ${shlibs:Depends}, ${misc:Depends}
> > +Description: ${DESCRIPTION}, companion tools
> > +
> > +Package: u-boot-${MACHINE}-config
> > +Build-Profiles: <config>
> > +Provides: u-boot-config
> > +Architecture: ${DISTRO_ARCH}
> > +Description: ${DESCRIPTION}, environment configuration
> > diff --git a/meta/recipes-bsp/u-boot/files/debian/rules b/meta/recipes-bsp/u-
> > boot/files/debian/rules
> > index 3d66762..121b00e 100755
> > --- a/meta/recipes-bsp/u-boot/files/debian/rules
> > +++ b/meta/recipes-bsp/u-boot/files/debian/rules
> > @@ -20,10 +20,17 @@ override_dh_auto_build:
> >       else \
> >               ./scripts/get_default_envs.sh >u-boot-initial-env; \
> >       fi
> > -     $(MAKE) $(PARALLEL_MAKE) $(SET_CROSS_BUILD_TOOLS) NO_SDL=1
> > tools-only envtools
> > +ifneq (,$(filter dev,$(DEB_BUILD_PROFILES)))
> > +     $(MAKE) $(PARALLEL_MAKE) $(SET_CROSS_BUILD_TOOLS) NO_SDL=1
> > envtools
> > +endif ifneq (,$(filter tools,$(DEB_BUILD_PROFILES)))
> > +     $(MAKE) $(PARALLEL_MAKE) $(SET_CROSS_BUILD_TOOLS) NO_SDL=1
> > tools-only
> > +endif
> >
> >  override_dh_auto_install:
> > +ifneq (,$(filter dev,$(DEB_BUILD_PROFILES)))
> >       mv tools/env/lib.a tools/env/libubootenv.a
> > +endif
> >
> >  override_dh_auto_test:
> >
> > diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/recipes-bsp/u-
> > boot/u-boot-custom.inc
> > index 9984d8c..5198809 100644
> > --- a/meta/recipes-bsp/u-boot/u-boot-custom.inc
> > +++ b/meta/recipes-bsp/u-boot/u-boot-custom.inc
> > @@ -9,10 +9,13 @@ FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/files:"
> >
> >  DESCRIPTION ?= "Custom U-Boot"
> >
> > -PROVIDES += "u-boot-${MACHINE} u-boot-${MACHINE}-dev"
> > -PROVIDES += "${@'u-boot-tools' if d.getVar('U_BOOT_TOOLS_PACKAGE') == '1'
> > else ''}"
> > +PROVIDES += "u-boot-${MACHINE}"
> > +PROVIDES += "${@'u-boot-tools' \
> > +     if bb.utils.contains('U_BOOT_BUILD_PROFILES', 'tools', 1, 0, d) else ''}"
> >  PROVIDES += "${@('u-boot-config u-boot-' + d.getVar('MACHINE') + '-config') \
> > -    if d.getVar('U_BOOT_CONFIG_PACKAGE') == '1' else ''}"
> > +     if bb.utils.contains('U_BOOT_BUILD_PROFILES', 'config', 1, 0, d) else ''}"
> > +PROVIDES += "${@('u-boot-' + d.getVar('MACHINE') + '-dev') \
> > +     if bb.utils.contains('U_BOOT_BUILD_PROFILES', 'dev', 1, 0, d) else ''}"
> >
> >  inherit dpkg
> >
> > @@ -22,6 +25,20 @@ python() {
> >      if d.getVar('BUILD_DEPENDS'):
> >          bb.warn("u-boot-custom: Deprecated use of BUILD_DEPENDS, please
> > switch to DEBIAN_BUILD_DEPENDS")
> >          d.setVar('DEBIAN_BUILD_DEPENDS', d.getVar('BUILD_DEPENDS'))
> > +
> > +    if d.getVar('U_BOOT_TOOLS_PACKAGE') is not None:
> > +        bb.warn("u-boot-custom: Deprecated use of U_BOOT_TOOLS_PACKAGE,
> > please switch to U_BOOT_BUILD_PROFILES")
> > +        if d.getVar('U_BOOT_TOOLS_PACKAGE') == "1":
> > +            d.appendVar('U_BOOT_BUILD_PROFILES', " tools")
> > +        else:
> > +            d.setVar('U_BOOT_BUILD_PROFILES_remove', "tools")
> > +
> > +    if d.getVar('U_BOOT_CONFIG_PACKAGE') is not None:
> > +        bb.warn("u-boot-custom: Deprecated use of U_BOOT_CONFIG_PACKAGE,
> > please switch to U_BOOT_BUILD_PROFILES")
> > +        if d.getVar('U_BOOT_CONFIG_PACKAGE') == "1":
> > +            d.appendVar('U_BOOT_BUILD_PROFILES', " config")
> > +        else:
> > +            d.setVar('U_BOOT_BUILD_PROFILES_remove', "config")
> >  }
> >
> >  DEBIAN_BUILD_DEPENDS ?= "bc, bison, flex, device-tree-compiler, git"
> > @@ -29,8 +46,8 @@ DEBIAN_BUILD_DEPENDS ?= "bc, bison, flex, device-tree-
> > compiler, git"
> >  TEMPLATE_FILES = "debian/control.tmpl"
> >  TEMPLATE_VARS += "MACHINE DEBIAN_BUILD_DEPENDS"
> >
> > -U_BOOT_TOOLS_PACKAGE ?= "0"
> > -U_BOOT_CONFIG_PACKAGE ?= "0"
> > +
> > +U_BOOT_BUILD_PROFILES ?= "dev"
> >
> >  do_prepare_build() {
> >      cp -r ${WORKDIR}/debian ${S}/
> > @@ -40,31 +57,15 @@ do_prepare_build() {
> >      echo "${U_BOOT_BIN} /usr/lib/u-boot/${MACHINE}" > \
> >          ${S}/debian/u-boot-${MACHINE}.install
> >
> > -    echo "tools/env/libubootenv.a usr/lib" > \
> > -        ${S}/debian/u-boot-${MACHINE}-dev.install
> > -
> > -    if [ "${U_BOOT_TOOLS_PACKAGE}" = "1" ]; then
> > -        cat <<EOF >>${S}/debian/control
> > -
> > -Package: u-boot-tools
> > -Architecture: linux-any
> > -Depends: \${shlibs:Depends}, \${misc:Depends}
> > -Description: ${DESCRIPTION}, companion tools -EOF
> > +    if [ "${@bb.utils.contains('U_BOOT_BUILD_PROFILES', 'dev', 'yes', 'no', d)}" =
> > "yes" ];then
> > +        echo "tools/env/libubootenv.a usr/lib" > \
> > +            ${S}/debian/u-boot-${MACHINE}-dev.install
> >      fi
> >
> > -    if [ "${U_BOOT_CONFIG_PACKAGE}" = "1" ]; then
> > +    if [ "${@bb.utils.contains('U_BOOT_BUILD_PROFILES', 'config',
> > + 'yes', 'no', d)}" = "yes" ];then
> >          cp ${WORKDIR}/fw_env.config ${S}/ || \
> >              die "U_BOOT_CONFIG_PACKAGE requires a fw_env.config in SRC_URI"
> >
> > -        cat <<EOF >>${S}/debian/control
> > -
> > -Package: u-boot-${MACHINE}-config
> > -Provides: u-boot-config
> > -Architecture: ${DISTRO_ARCH}
> > -Description: ${DESCRIPTION}, environment configuration -EOF
> > -
> >          cat <<EOF >>${S}/debian/u-boot-${MACHINE}-config.install
> >  u-boot-initial-env /etc
> >  fw_env.config      /etc
> > @@ -75,4 +76,5 @@ EOF
> >  dpkg_runbuild_prepend() {
> >      export U_BOOT_CONFIG="${U_BOOT_CONFIG}"
> >      export U_BOOT_BIN="${U_BOOT_BIN}"
> > +    export DEB_BUILD_PROFILES="${U_BOOT_BUILD_PROFILES}"
>
> Can we wait with this until the DEB_BUILD_PROFILES patch series is merged.
> Then, you can simply define via bitbake: DEB_BUILD_PROFILES="${U_BOOT_BUILD_PROFILES}"
> Manually exporting will break either on the sbuilder series or the DEB_BUILD_PROFILES series as both have API changes.

Works for me. I will rebase once your changes are in.

Thanks,
Vijai Kumar K

>
> Best regards,
> Felix
>
> >  }
> > --
> > 2.25.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%2F20220201115713.3062835-2-
> > Vijaikumar_Kanagarajan%2540mentor.com&amp;data=04%7C01%7Cfelix.moes
> > sbauer%40siemens.com%7C7c8fc33935e249cbc16e08d9e57a0b6d%7C38ae3bc
> > d95794fd4addab42e1495d55a%7C1%7C0%7C637793135659965600%7CUnkno
> > wn%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1ha
> > WwiLCJXVCI6Mn0%3D%7C3000&amp;sdata=s%2FUtf%2FS8cSwq4Pi%2Bqjbs%2
> > F49aeewXBhaA7b3m38cWxgo%3D&amp;reserved=0.
>
> --
> 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/AM9PR10MB4869BCA3C85B3DBA0D50B3CE89269%40AM9PR10MB4869.EURPRD10.PROD.OUTLOOK.COM.