[v2,2/2] u-boot: Move libssl-dev dependency to u-boot-custom

Message ID 20211105061521.2142204-2-Vijaikumar_Kanagarajan@mentor.com
State Superseded, archived
Headers show
Series [v2,1/2] meta-isar: u-boot: Update to 2021.10 | expand

Commit Message

Vijai Kumar K Nov. 4, 2021, 8:15 p.m. UTC
Move the libssl-dependency to u-boot-custom.inc.

u-boot 2021.10 or later needs libssl-dev to compile.

Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
---
 meta-isar/recipes-bsp/u-boot/u-boot-2021.10.inc | 2 --
 meta/recipes-bsp/u-boot/u-boot-custom.inc       | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

Comments

Jan Kiszka Nov. 4, 2021, 8:28 p.m. UTC | #1
On 05.11.21 07:15, Vijai Kumar K wrote:
> Move the libssl-dependency to u-boot-custom.inc.
> 
> u-boot 2021.10 or later needs libssl-dev to compile.
> 

I think this started even earlier. In meta-iot2050, e.g., we have this
for 2021.04 as well. But it would require some research to identify the
exact version.

> Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
> ---
>  meta-isar/recipes-bsp/u-boot/u-boot-2021.10.inc | 2 --
>  meta/recipes-bsp/u-boot/u-boot-custom.inc       | 2 +-
>  2 files changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/meta-isar/recipes-bsp/u-boot/u-boot-2021.10.inc b/meta-isar/recipes-bsp/u-boot/u-boot-2021.10.inc
> index 964ae6d..f3f822a 100644
> --- a/meta-isar/recipes-bsp/u-boot/u-boot-2021.10.inc
> +++ b/meta-isar/recipes-bsp/u-boot/u-boot-2021.10.inc
> @@ -5,8 +5,6 @@
>  
>  require recipes-bsp/u-boot/u-boot-custom.inc
>  
> -DEBIAN_BUILD_DEPENDS += ", libssl-dev"
> -
>  SRC_URI += " \
>      https://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \
>      "
> diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/recipes-bsp/u-boot/u-boot-custom.inc
> index 9984d8c..d51a296 100644
> --- a/meta/recipes-bsp/u-boot/u-boot-custom.inc
> +++ b/meta/recipes-bsp/u-boot/u-boot-custom.inc
> @@ -24,7 +24,7 @@ python() {
>          d.setVar('DEBIAN_BUILD_DEPENDS', d.getVar('BUILD_DEPENDS'))
>  }
>  
> -DEBIAN_BUILD_DEPENDS ?= "bc, bison, flex, device-tree-compiler, git"
> +DEBIAN_BUILD_DEPENDS ?= "bc, bison, flex, device-tree-compiler, git, libssl-dev"
>  
Just realizing: Is this a host or target dependency, i.e. is it (only)
needed for building packaged tools, or does U-Boot need that for host
tools? In the latter case, libssl-dev:native would be needed to ensure
the right package is installed in case of cross-builds.

Please check so that we are not leaving this issue half-done behind.

Jan

>  TEMPLATE_FILES = "debian/control.tmpl"
>  TEMPLATE_VARS += "MACHINE DEBIAN_BUILD_DEPENDS"
>
vijai kumar Nov. 4, 2021, 9:40 p.m. UTC | #2
On Fri, Nov 5, 2021 at 11:58 AM Jan Kiszka <jan.kiszka@siemens.com> wrote:
>
> On 05.11.21 07:15, Vijai Kumar K wrote:
> > Move the libssl-dependency to u-boot-custom.inc.
> >
> > u-boot 2021.10 or later needs libssl-dev to compile.
> >
>
> I think this started even earlier. In meta-iot2050, e.g., we have this
> for 2021.04 as well. But it would require some research to identify the
> exact version.
>
> > Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
> > ---
> >  meta-isar/recipes-bsp/u-boot/u-boot-2021.10.inc | 2 --
> >  meta/recipes-bsp/u-boot/u-boot-custom.inc       | 2 +-
> >  2 files changed, 1 insertion(+), 3 deletions(-)
> >
> > diff --git a/meta-isar/recipes-bsp/u-boot/u-boot-2021.10.inc b/meta-isar/recipes-bsp/u-boot/u-boot-2021.10.inc
> > index 964ae6d..f3f822a 100644
> > --- a/meta-isar/recipes-bsp/u-boot/u-boot-2021.10.inc
> > +++ b/meta-isar/recipes-bsp/u-boot/u-boot-2021.10.inc
> > @@ -5,8 +5,6 @@
> >
> >  require recipes-bsp/u-boot/u-boot-custom.inc
> >
> > -DEBIAN_BUILD_DEPENDS += ", libssl-dev"
> > -
> >  SRC_URI += " \
> >      https://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \
> >      "
> > diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/recipes-bsp/u-boot/u-boot-custom.inc
> > index 9984d8c..d51a296 100644
> > --- a/meta/recipes-bsp/u-boot/u-boot-custom.inc
> > +++ b/meta/recipes-bsp/u-boot/u-boot-custom.inc
> > @@ -24,7 +24,7 @@ python() {
> >          d.setVar('DEBIAN_BUILD_DEPENDS', d.getVar('BUILD_DEPENDS'))
> >  }
> >
> > -DEBIAN_BUILD_DEPENDS ?= "bc, bison, flex, device-tree-compiler, git"
> > +DEBIAN_BUILD_DEPENDS ?= "bc, bison, flex, device-tree-compiler, git, libssl-dev"
> >
> Just realizing: Is this a host or target dependency, i.e. is it (only)
> needed for building packaged tools, or does U-Boot need that for host
> tools? In the latter case, libssl-dev:native would be needed to ensure
> the right package is installed in case of cross-builds.
>
> Please check so that we are not leaving this issue half-done behind.

Yes. Onto both of them.

Thanks,
Vijai Kumar K

>
> Jan
>
> >  TEMPLATE_FILES = "debian/control.tmpl"
> >  TEMPLATE_VARS += "MACHINE DEBIAN_BUILD_DEPENDS"
> >
>
> --
> 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/7da7eb13-2b2b-cd59-14f9-e43d1808dd5d%40siemens.com.
vijai kumar Nov. 5, 2021, 2:16 a.m. UTC | #3
On Fri, Nov 5, 2021 at 1:10 PM vijai kumar
<vijaikumar.kanagarajan@gmail.com> wrote:
>
> On Fri, Nov 5, 2021 at 11:58 AM Jan Kiszka <jan.kiszka@siemens.com> wrote:
> >
> > On 05.11.21 07:15, Vijai Kumar K wrote:
> > > Move the libssl-dependency to u-boot-custom.inc.
> > >
> > > u-boot 2021.10 or later needs libssl-dev to compile.
> > >
> >
> > I think this started even earlier. In meta-iot2050, e.g., we have this
> > for 2021.04 as well. But it would require some research to identify the
> > exact version.
> >
> > > Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
> > > ---
> > >  meta-isar/recipes-bsp/u-boot/u-boot-2021.10.inc | 2 --
> > >  meta/recipes-bsp/u-boot/u-boot-custom.inc       | 2 +-
> > >  2 files changed, 1 insertion(+), 3 deletions(-)
> > >
> > > diff --git a/meta-isar/recipes-bsp/u-boot/u-boot-2021.10.inc b/meta-isar/recipes-bsp/u-boot/u-boot-2021.10.inc
> > > index 964ae6d..f3f822a 100644
> > > --- a/meta-isar/recipes-bsp/u-boot/u-boot-2021.10.inc
> > > +++ b/meta-isar/recipes-bsp/u-boot/u-boot-2021.10.inc
> > > @@ -5,8 +5,6 @@
> > >
> > >  require recipes-bsp/u-boot/u-boot-custom.inc
> > >
> > > -DEBIAN_BUILD_DEPENDS += ", libssl-dev"
> > > -
> > >  SRC_URI += " \
> > >      https://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \
> > >      "
> > > diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/recipes-bsp/u-boot/u-boot-custom.inc
> > > index 9984d8c..d51a296 100644
> > > --- a/meta/recipes-bsp/u-boot/u-boot-custom.inc
> > > +++ b/meta/recipes-bsp/u-boot/u-boot-custom.inc
> > > @@ -24,7 +24,7 @@ python() {
> > >          d.setVar('DEBIAN_BUILD_DEPENDS', d.getVar('BUILD_DEPENDS'))
> > >  }
> > >
> > > -DEBIAN_BUILD_DEPENDS ?= "bc, bison, flex, device-tree-compiler, git"
> > > +DEBIAN_BUILD_DEPENDS ?= "bc, bison, flex, device-tree-compiler, git, libssl-dev"
> > >
> > Just realizing: Is this a host or target dependency, i.e. is it (only)
> > needed for building packaged tools, or does U-Boot need that for host
> > tools? In the latter case, libssl-dev:native would be needed to ensure
> > the right package is installed in case of cross-builds.
> >
> > Please check so that we are not leaving this issue half-done behind.
>
> Yes. Onto both of them.

Looks like we need both libssl-dev and libssl-dev:native afterall.
Will send a v3.

Thanks,
Vijai Kumar K

>
> Thanks,
> Vijai Kumar K
>
> >
> > Jan
> >
> > >  TEMPLATE_FILES = "debian/control.tmpl"
> > >  TEMPLATE_VARS += "MACHINE DEBIAN_BUILD_DEPENDS"
> > >
> >
> > --
> > 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/7da7eb13-2b2b-cd59-14f9-e43d1808dd5d%40siemens.com.

Patch

diff --git a/meta-isar/recipes-bsp/u-boot/u-boot-2021.10.inc b/meta-isar/recipes-bsp/u-boot/u-boot-2021.10.inc
index 964ae6d..f3f822a 100644
--- a/meta-isar/recipes-bsp/u-boot/u-boot-2021.10.inc
+++ b/meta-isar/recipes-bsp/u-boot/u-boot-2021.10.inc
@@ -5,8 +5,6 @@ 
 
 require recipes-bsp/u-boot/u-boot-custom.inc
 
-DEBIAN_BUILD_DEPENDS += ", libssl-dev"
-
 SRC_URI += " \
     https://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \
     "
diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/recipes-bsp/u-boot/u-boot-custom.inc
index 9984d8c..d51a296 100644
--- a/meta/recipes-bsp/u-boot/u-boot-custom.inc
+++ b/meta/recipes-bsp/u-boot/u-boot-custom.inc
@@ -24,7 +24,7 @@  python() {
         d.setVar('DEBIAN_BUILD_DEPENDS', d.getVar('BUILD_DEPENDS'))
 }
 
-DEBIAN_BUILD_DEPENDS ?= "bc, bison, flex, device-tree-compiler, git"
+DEBIAN_BUILD_DEPENDS ?= "bc, bison, flex, device-tree-compiler, git, libssl-dev"
 
 TEMPLATE_FILES = "debian/control.tmpl"
 TEMPLATE_VARS += "MACHINE DEBIAN_BUILD_DEPENDS"