RE: [PATCH 2/2] Add support for build dependencies in linux-module

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

> -----Original Message-----
> From: Schild, Henning (T CED SES-DE) <henning.schild@siemens.com>
> Sent: Thursday, July 7, 2022 5:57 PM
> To: Moessbauer, Felix (T CED SES-DE) <felix.moessbauer@siemens.com>
> Cc: isar-users@googlegroups.com; Kiszka, Jan (T CED)
> <jan.kiszka@siemens.com>
> Subject: Re: [PATCH 2/2] Add support for build dependencies in linux-module
> 
> Am Thu,  7 Jul 2022 17:46:34 +0200
> schrieb Felix Moessbauer <felix.moessbauer@siemens.com>:
> 
> > This patch adds support to add additional build dependencies when
> > building a linux-module by using DEBIAN_BUILD_DEPENDS.
> >
> > Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
> > ---
> >  meta/recipes-kernel/linux-module/files/debian/control.tmpl | 2 +-
> >  meta/recipes-kernel/linux-module/module.inc                | 3 ++-
> >  2 files changed, 3 insertions(+), 2 deletions(-)
> >
> > diff --git
> > a/meta/recipes-kernel/linux-module/files/debian/control.tmpl
> > b/meta/recipes-kernel/linux-module/files/debian/control.tmpl index
> > d3f4dfe9..67b08244 100644 ---
> > a/meta/recipes-kernel/linux-module/files/debian/control.tmpl +++
> > b/meta/recipes-kernel/linux-module/files/debian/control.tmpl @@ -2,7
> > +2,7 @@ Source: ${PN} Section: kernel Priority: optional
> >  Standards-Version: 3.9.6
> > -Build-Depends: ${KERNEL_HEADERS_PKG}
> > +Build-Depends: ${DEBIAN_BUILD_DEPENDS}
> >  Maintainer: ISAR project <isar-users@googlegroups.com>
> >
> >  Package: ${PN}
> > diff --git a/meta/recipes-kernel/linux-module/module.inc
> > b/meta/recipes-kernel/linux-module/module.inc index 97eff294..a5c4336a
> > 100644 --- a/meta/recipes-kernel/linux-module/module.inc +++
> > b/meta/recipes-kernel/linux-module/module.inc @@ -16,6 +16,7 @@ PN .=
> > "-${KERNEL_NAME}" KERNEL_IMAGE_PKG ??= "linux-image-
> ${KERNEL_NAME}"
> >  KERNEL_HEADERS_PKG ??= "linux-headers-${KERNEL_NAME}"
> >  DEPENDS += "${KERNEL_HEADERS_PKG}"
> > +DEBIAN_BUILD_DEPENDS = "${KERNEL_HEADERS_PKG}"
> >
> >  SRC_URI += "file://debian/"
> >
> > @@ -26,7 +27,7 @@ inherit dpkg
> >  TEMPLATE_FILES = "debian/control.tmpl \
> >                    debian/changelog.tmpl \
> >                    debian/rules.tmpl"
> > -TEMPLATE_VARS += "KERNEL_NAME KERNEL_TYPE KERNEL_IMAGE_PKG
> > KERNEL_HEADERS_PKG PN" +TEMPLATE_VARS += "KERNEL_NAME
> KERNEL_TYPE
> > KERNEL_IMAGE_PKG KERNEL_HEADERS_PKG DEBIAN_BUILD_DEPENDS PN"
> 
> In general such lists are way easier to maintain and look at diffs as multiline. i.e.
> 
> TEMPLATE_VARS += "\
> 	FOO\
> 	BAR\
> 	BLA\
> "

True, but I don't like these cosmetic changes as well.

> 
> You want to not just add the new but likely also drop the old right?

No, it is still used in the debian/rules.
This is fine, as the values do not necessarily carry the same value.

Felix

> 
> Henning
> 
> >  do_prepare_build[dirs] += "${S}"
> >  do_prepare_build() {