All of lore.kernel.org
 help / color / mirror / Atom feed
* [meta-oe][PATCH] libssh: add gcrypt to PACKAGECONFIG
@ 2021-04-07 21:23 Valentin Longchamp
  2021-04-07 22:55 ` [oe] " Khem Raj
  0 siblings, 1 reply; 4+ messages in thread
From: Valentin Longchamp @ 2021-04-07 21:23 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Valentin Longchamp

This would allow to build it without libgcrypt (relying instead on
libcrypto).

Enable it by default to keep the recipe behaving the same wihtout a
configuration change.

Signed-off-by: Valentin Longchamp <valentin@longchamp.me>
---
 meta-oe/recipes-support/libssh/libssh_0.8.9.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-oe/recipes-support/libssh/libssh_0.8.9.bb b/meta-oe/recipes-support/libssh/libssh_0.8.9.bb
index 39ed8a8fb..2aff2c878 100644
--- a/meta-oe/recipes-support/libssh/libssh_0.8.9.bb
+++ b/meta-oe/recipes-support/libssh/libssh_0.8.9.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=dabb4958b830e5df11d2b0ed8ea255a0"
 
-DEPENDS = "zlib openssl libgcrypt"
+DEPENDS = "zlib openssl"
 
 SRC_URI = "git://git.libssh.org/projects/libssh.git;branch=stable-0.8"
 SRCREV = "04685a74df9ce1db1bc116a83a0da78b4f4fa1f8"
@@ -13,13 +13,13 @@ S = "${WORKDIR}/git"
 
 inherit cmake
 
-PACKAGECONFIG ??=""
+PACKAGECONFIG ??= "gcrypt"
 PACKAGECONFIG[gssapi] = "-DWITH_GSSAPI=1, -DWITH_GSSAPI=0, krb5, "
+PACKAGECONFIG[gcrypt] = "-DWITH_GCRYPT=1, -DWITH_GCRYPT=0, libgcrypt, "
 
 ARM_INSTRUCTION_SET_armv5 = "arm"
 
 EXTRA_OECMAKE = " \
-    -DWITH_GCRYPT=1 \
     -DWITH_PCAP=1 \
     -DWITH_SFTP=1 \
     -DWITH_ZLIB=1 \
-- 
2.27.0


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [oe] [meta-oe][PATCH] libssh: add gcrypt to PACKAGECONFIG
  2021-04-07 21:23 [meta-oe][PATCH] libssh: add gcrypt to PACKAGECONFIG Valentin Longchamp
@ 2021-04-07 22:55 ` Khem Raj
  2021-04-08  6:24   ` Valentin Longchamp
  0 siblings, 1 reply; 4+ messages in thread
From: Khem Raj @ 2021-04-07 22:55 UTC (permalink / raw)
  To: Valentin Longchamp, openembedded-devel

the last patch you send it  already in see
https://git.openembedded.org/meta-openembedded/commit/?id=86eb692a4e96b77857a4160a12625fc694812d52

if there are change on top of v1 then please rebase and send them seprately.

if you wan to send a reminder just reply to original patch

On 4/7/21 2:23 PM, Valentin Longchamp wrote:
> This would allow to build it without libgcrypt (relying instead on
> libcrypto).
> 
> Enable it by default to keep the recipe behaving the same wihtout a
> configuration change.
> 
> Signed-off-by: Valentin Longchamp <valentin@longchamp.me>
> ---
>   meta-oe/recipes-support/libssh/libssh_0.8.9.bb | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/meta-oe/recipes-support/libssh/libssh_0.8.9.bb b/meta-oe/recipes-support/libssh/libssh_0.8.9.bb
> index 39ed8a8fb..2aff2c878 100644
> --- a/meta-oe/recipes-support/libssh/libssh_0.8.9.bb
> +++ b/meta-oe/recipes-support/libssh/libssh_0.8.9.bb
> @@ -4,7 +4,7 @@ SECTION = "libs"
>   LICENSE = "LGPLv2.1"
>   LIC_FILES_CHKSUM = "file://COPYING;md5=dabb4958b830e5df11d2b0ed8ea255a0"
>   
> -DEPENDS = "zlib openssl libgcrypt"
> +DEPENDS = "zlib openssl"
>   
>   SRC_URI = "git://git.libssh.org/projects/libssh.git;branch=stable-0.8"
>   SRCREV = "04685a74df9ce1db1bc116a83a0da78b4f4fa1f8"
> @@ -13,13 +13,13 @@ S = "${WORKDIR}/git"
>   
>   inherit cmake
>   
> -PACKAGECONFIG ??=""
> +PACKAGECONFIG ??= "gcrypt"
>   PACKAGECONFIG[gssapi] = "-DWITH_GSSAPI=1, -DWITH_GSSAPI=0, krb5, "
> +PACKAGECONFIG[gcrypt] = "-DWITH_GCRYPT=1, -DWITH_GCRYPT=0, libgcrypt, "
>   
>   ARM_INSTRUCTION_SET_armv5 = "arm"
>   
>   EXTRA_OECMAKE = " \
> -    -DWITH_GCRYPT=1 \
>       -DWITH_PCAP=1 \
>       -DWITH_SFTP=1 \
>       -DWITH_ZLIB=1 \
> 
> 
> 
> 
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [oe] [meta-oe][PATCH] libssh: add gcrypt to PACKAGECONFIG
  2021-04-07 22:55 ` [oe] " Khem Raj
@ 2021-04-08  6:24   ` Valentin Longchamp
  0 siblings, 0 replies; 4+ messages in thread
From: Valentin Longchamp @ 2021-04-08  6:24 UTC (permalink / raw)
  To: Khem Raj, openembedded-devel

[-- Attachment #1: Type: text/plain, Size: 2343 bytes --]

Oops. I had a quick look yesterday coming back from vacation and couldn't
find the patch on patchwork. I assumed something went wrong with the first
message, but you've just been too fast.

Sorry about that, please ignore this patch. Thanks for all

Le jeu. 8 avr. 2021 à 00:55, Khem Raj <raj.khem@gmail.com> a écrit :

> the last patch you send it  already in see
>
> https://git.openembedded.org/meta-openembedded/commit/?id=86eb692a4e96b77857a4160a12625fc694812d52
>
> if there are change on top of v1 then please rebase and send them
> seprately.
>
> if you wan to send a reminder just reply to original patch
>
> On 4/7/21 2:23 PM, Valentin Longchamp wrote:
> > This would allow to build it without libgcrypt (relying instead on
> > libcrypto).
> >
> > Enable it by default to keep the recipe behaving the same wihtout a
> > configuration change.
> >
> > Signed-off-by: Valentin Longchamp <valentin@longchamp.me>
> > ---
> >   meta-oe/recipes-support/libssh/libssh_0.8.9.bb | 6 +++---
> >   1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/meta-oe/recipes-support/libssh/libssh_0.8.9.bb
> b/meta-oe/recipes-support/libssh/libssh_0.8.9.bb
> > index 39ed8a8fb..2aff2c878 100644
> > --- a/meta-oe/recipes-support/libssh/libssh_0.8.9.bb
> > +++ b/meta-oe/recipes-support/libssh/libssh_0.8.9.bb
> > @@ -4,7 +4,7 @@ SECTION = "libs"
> >   LICENSE = "LGPLv2.1"
> >   LIC_FILES_CHKSUM =
> "file://COPYING;md5=dabb4958b830e5df11d2b0ed8ea255a0"
> >
> > -DEPENDS = "zlib openssl libgcrypt"
> > +DEPENDS = "zlib openssl"
> >
> >   SRC_URI = "git://git.libssh.org/projects/libssh.git;branch=stable-0.8"
> >   SRCREV = "04685a74df9ce1db1bc116a83a0da78b4f4fa1f8"
> > @@ -13,13 +13,13 @@ S = "${WORKDIR}/git"
> >
> >   inherit cmake
> >
> > -PACKAGECONFIG ??=""
> > +PACKAGECONFIG ??= "gcrypt"
> >   PACKAGECONFIG[gssapi] = "-DWITH_GSSAPI=1, -DWITH_GSSAPI=0, krb5, "
> > +PACKAGECONFIG[gcrypt] = "-DWITH_GCRYPT=1, -DWITH_GCRYPT=0, libgcrypt, "
> >
> >   ARM_INSTRUCTION_SET_armv5 = "arm"
> >
> >   EXTRA_OECMAKE = " \
> > -    -DWITH_GCRYPT=1 \
> >       -DWITH_PCAP=1 \
> >       -DWITH_SFTP=1 \
> >       -DWITH_ZLIB=1 \
> >
> >
> >
> > 
> >
>


-- 
Valentin Longchamp
Rue de la Carrière 30, CH-1700 Fribourg
valentin@longchamp.me
Mobile: +41 79 569 25 75

[-- Attachment #2: Type: text/html, Size: 3893 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [meta-oe][PATCH] libssh: add gcrypt to PACKAGECONFIG
@ 2021-03-30 15:21 Valentin Longchamp
  0 siblings, 0 replies; 4+ messages in thread
From: Valentin Longchamp @ 2021-03-30 15:21 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Valentin Longchamp

This would allow to build it without libgcrypt (relying instead on
libcrypto).

Enable it by default to keep the recipe behaving the same wihtout a
configuration change.

Signed-off-by: Valentin Longchamp <valentin@longchamp.me>
---
 meta-oe/recipes-support/libssh/libssh_0.8.9.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-oe/recipes-support/libssh/libssh_0.8.9.bb b/meta-oe/recipes-support/libssh/libssh_0.8.9.bb
index 39ed8a8fb..2aff2c878 100644
--- a/meta-oe/recipes-support/libssh/libssh_0.8.9.bb
+++ b/meta-oe/recipes-support/libssh/libssh_0.8.9.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=dabb4958b830e5df11d2b0ed8ea255a0"
 
-DEPENDS = "zlib openssl libgcrypt"
+DEPENDS = "zlib openssl"
 
 SRC_URI = "git://git.libssh.org/projects/libssh.git;branch=stable-0.8"
 SRCREV = "04685a74df9ce1db1bc116a83a0da78b4f4fa1f8"
@@ -13,13 +13,13 @@ S = "${WORKDIR}/git"
 
 inherit cmake
 
-PACKAGECONFIG ??=""
+PACKAGECONFIG ??= "gcrypt"
 PACKAGECONFIG[gssapi] = "-DWITH_GSSAPI=1, -DWITH_GSSAPI=0, krb5, "
+PACKAGECONFIG[gcrypt] = "-DWITH_GCRYPT=1, -DWITH_GCRYPT=0, libgcrypt, "
 
 ARM_INSTRUCTION_SET_armv5 = "arm"
 
 EXTRA_OECMAKE = " \
-    -DWITH_GCRYPT=1 \
     -DWITH_PCAP=1 \
     -DWITH_SFTP=1 \
     -DWITH_ZLIB=1 \
-- 
2.27.0


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-04-08  6:24 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-07 21:23 [meta-oe][PATCH] libssh: add gcrypt to PACKAGECONFIG Valentin Longchamp
2021-04-07 22:55 ` [oe] " Khem Raj
2021-04-08  6:24   ` Valentin Longchamp
  -- strict thread matches above, loose matches on Subject: below --
2021-03-30 15:21 Valentin Longchamp

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.