From: vijai kumar <vijaikumar.kanagarajan@gmail.com>
To: Jan Kiszka <jan.kiszka@siemens.com>
Cc: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>,
isar-users <isar-users@googlegroups.com>
Subject: Re: [RFC PATCH 1/2] u-boot: Switch to use DEB_BUILD_PROFILES
Date: Tue, 16 Nov 2021 14:12:48 +0530 [thread overview]
Message-ID: <CALLGG_+jwmidk_ENd7CgTMxsGgGbEDJYR9ecy4f16g=NaxNZDw@mail.gmail.com> (raw)
In-Reply-To: <287571ee-909f-b7b2-7a7e-27a4495281a5@siemens.com>
On Mon, Nov 15, 2021 at 10:14 PM Jan Kiszka <jan.kiszka@siemens.com> wrote:
>
> On 15.11.21 17:06, Vijai Kumar K wrote:
> > Use DEB_BUILD_PROFILES to select packages to build.
> >
>
> Nice feature.
>
> > This patch drops the U_BOOT_TOOLS_PACKAGE variable and introduces
> > U_BOOT_BUILD_PROFILES through which we can enable particular
> > packages like u-boot-tools and u-boot-dev.
> >
> > Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
> > ---
> > .../u-boot/u-boot-de0-nano-soc_2021.10.bb | 3 +-
> > .../u-boot/u-boot-stm32mp15x_2021.10.bb | 2 ++
> > .../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 | 29 +++++--------------
> > 5 files changed, 32 insertions(+), 24 deletions(-)
> >
> > diff --git a/meta-isar/recipes-bsp/u-boot/u-boot-de0-nano-soc_2021.10.bb b/meta-isar/recipes-bsp/u-boot/u-boot-de0-nano-soc_2021.10.bb
> > index dcb76c5..1340362 100644
> > --- a/meta-isar/recipes-bsp/u-boot/u-boot-de0-nano-soc_2021.10.bb
> > +++ b/meta-isar/recipes-bsp/u-boot/u-boot-de0-nano-soc_2021.10.bb
> > @@ -6,4 +6,5 @@
> > require u-boot-${PV}.inc
> >
> > # Just for testing purposes, distro package would be recent enough
> > -U_BOOT_TOOLS_PACKAGE = "1"
> > +U_BOOT_BUILD_PROFILES += "tools"
> > +U_BOOT_BUILD_PROFILES += "dev"
> > diff --git a/meta-isar/recipes-bsp/u-boot/u-boot-stm32mp15x_2021.10.bb b/meta-isar/recipes-bsp/u-boot/u-boot-stm32mp15x_2021.10.bb
> > index 6d95643..ead6d38 100644
> > --- a/meta-isar/recipes-bsp/u-boot/u-boot-stm32mp15x_2021.10.bb
> > +++ b/meta-isar/recipes-bsp/u-boot/u-boot-stm32mp15x_2021.10.bb
> > @@ -4,3 +4,5 @@
> > # SPDX-License-Identifier: MIT
> >
> > require u-boot-${PV}.inc
> > +
> > +U_BOOT_BUILD_PROFILES += "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 57d4f36..bc92552 100644
> > --- a/meta/recipes-bsp/u-boot/u-boot-custom.inc
> > +++ b/meta/recipes-bsp/u-boot/u-boot-custom.inc
> > @@ -31,8 +31,8 @@ DEBIAN_BUILD_DEPENDS += "${@', libssl-dev' if d.getVar('ISAR_CROSS_COMPILE') ==
> > 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 ?= ""
>
> Must be "dev" - we were building the dev package by default before, no?
> Otherwise, it would be a RECIPE-API-worth change, and it would need
> argumentation why we need to break the API.
Yes. Will enable that by default here.
>
> >
> > do_prepare_build() {
> > cp -r ${WORKDIR}/debian ${S}/
> > @@ -42,31 +42,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
>
> Doesn't that profile feature allow to copy that unconditionally?
Not sure about that. Will check and bypass this if possible.
>
> > 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
> > @@ -77,4 +61,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}"
> > }
> >
>
> Jan
>
> --
> Siemens AG, T RDA IOT
> Corporate Competence Center Embedded Linux
>
> --
> 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/287571ee-909f-b7b2-7a7e-27a4495281a5%40siemens.com.
next prev parent reply other threads:[~2021-11-16 8:42 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-15 16:06 [RFC PATCH 0/2] U-boot refactor Vijai Kumar K
2021-11-15 16:06 ` [RFC PATCH 1/2] u-boot: Switch to use DEB_BUILD_PROFILES Vijai Kumar K
2021-11-15 16:44 ` Jan Kiszka
2021-11-16 8:42 ` vijai kumar [this message]
2021-11-16 15:02 ` Gylstorff Quirin
2021-11-17 5:52 ` vijai kumar
2021-11-15 16:06 ` [RFC PATCH 2/2] meta/u-boot: Include libssl-dev only when building tools Vijai Kumar K
2021-11-15 16:46 ` Jan Kiszka
2021-11-16 8:44 ` vijai kumar
2021-11-15 16:10 ` [RFC PATCH 0/2] U-boot refactor vijai kumar
2021-11-16 9:51 ` [PATCH v2 " Vijai Kumar K
2021-11-16 9:51 ` [PATCH v2 1/2] u-boot: Switch to use DEB_BUILD_PROFILES Vijai Kumar K
2021-11-16 15:40 ` Jan Kiszka
2021-11-17 5:56 ` vijai kumar
2021-11-16 9:51 ` [PATCH v2 2/2] meta/u-boot: Include libssl-dev only when building tools Vijai Kumar K
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CALLGG_+jwmidk_ENd7CgTMxsGgGbEDJYR9ecy4f16g=NaxNZDw@mail.gmail.com' \
--to=vijaikumar.kanagarajan@gmail.com \
--cc=Vijaikumar_Kanagarajan@mentor.com \
--cc=isar-users@googlegroups.com \
--cc=jan.kiszka@siemens.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox