From e1de00cdf9ac0a853fa8d5de99eaf9584ecc0801 Mon Sep 17 00:00:00 2001
From: Francesco Pham <francesco.pham@huawei.com>
Date: Wed, 7 Sep 2022 10:37:00 +0200
Subject: [PATCH] libcoap: Fix gnutls/openssl/mbedtls PACKAGECONFIG conflicts
These were missing a comma so were being added as RRECOMMENDS.
Original patch is from Alex Kiernan <alex.kiernan@gmail.com>.
Upstream commit in meta-openembedded:
3589aa5debbf59e940588939dd913130e4cfd4cd
("libcoap: Fix gnutls/openssl/mbedtls PACKAGECONFIG conflicts")
Importing the patch because the recipe is not present in
kirkstone branch but only in master branch of meta-openembedded.
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Francesco Pham <francesco.pham@huawei.com>
---
.../recipes-devtools/libcoap/libcoap_4.3.0.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta-oniro-staging/recipes-devtools/libcoap/libcoap_4.3.0.bb b/meta-oniro-staging/recipes-devtools/libcoap/libcoap_4.3.0.bb
index aba81d12..4b467d21 100644
--- a/meta-oniro-staging/recipes-devtools/libcoap/libcoap_4.3.0.bb
+++ b/meta-oniro-staging/recipes-devtools/libcoap/libcoap_4.3.0.bb
@@ -23,10 +23,10 @@ PACKAGECONFIG ?= "\
${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \
"
PACKAGECONFIG[async] = "--enable-async,--disable-async"
-PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls,,openssl mbedtls"
+PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls,,,openssl mbedtls"
PACKAGECONFIG[manpages] = "--enable-documentation --enable-doxygen --enable-manpages,--disable-documentation,asciidoc-native doxygen-native graphviz-native"
-PACKAGECONFIG[mbedtls] = "--with-mbedtls,--without-mbedtls,mbedtls,,gnutls openssl"
-PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl,,gnutls mbedtls"
+PACKAGECONFIG[mbedtls] = "--with-mbedtls,--without-mbedtls,mbedtls,,,gnutls openssl"
+PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl,,,gnutls mbedtls"
PACKAGECONFIG[small-stack] = "--enable-small-stack,--disable-small-stack"
PACKAGECONFIG[tcp] = "--enable-tcp,--disable-tcp"
PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,cunit"
--
GitLab