| Message ID | 20230629182244.3533996-1-denis@denix.org |
|---|---|
| State | Accepted |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [master] arago-prefs: pin down mbedtls version for open62541 | expand |
On 6/29/2023 1:22 PM, Denys Dmytriyenko wrote: > From: Denys Dmytriyenko <denys@konsulko.com> > > Our patched version of open62541 uses entropy_poll.h header from mbedtls > that is no longer being exported by version 3.x, pin to version 2.x for > now. Competing patches... which one will win? > Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> > --- > meta-arago-distro/conf/distro/include/arago-prefs.inc | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/meta-arago-distro/conf/distro/include/arago-prefs.inc b/meta-arago-distro/conf/distro/include/arago-prefs.inc > index 34c3c539..60d7838c 100644 > --- a/meta-arago-distro/conf/distro/include/arago-prefs.inc > +++ b/meta-arago-distro/conf/distro/include/arago-prefs.inc > @@ -10,6 +10,10 @@ PREFERRED_PROVIDER_virtual/kernel:append = "${ARAGO_KERNEL_SUFFIX}" > > PREFERRED_PROVIDER_jpeg = "libjpeg-turbo" > > +# open62541 requires entropy_poll.h which is not provided by mbedtls 3.x > +PREFERRED_VERSION_mbedtls = "2.%" > +PREFERRED_VERSION_nativesdk-mbedtls = "2.%" > + > # Setting PREFERRED_VERSIONS due to selecting a specific version of a library or > # application that does not have a GPLv3 license > PREFERRED_VERSION_crda = "3.18"
On Thu, Jun 29, 2023 at 01:26:10PM -0500, Ryan Eatmon wrote: > > > On 6/29/2023 1:22 PM, Denys Dmytriyenko wrote: > >From: Denys Dmytriyenko <denys@konsulko.com> > > > >Our patched version of open62541 uses entropy_poll.h header from mbedtls > >that is no longer being exported by version 3.x, pin to version 2.x for > >now. > > > Competing patches... which one will win? Yeah, I saw your patches and since I've been carrying my change locally for several days, decided to send it out for completeness. Mine is very low-key and least invasive, but may not be the best one long-term... > >Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> > >--- > > meta-arago-distro/conf/distro/include/arago-prefs.inc | 4 ++++ > > 1 file changed, 4 insertions(+) > > > >diff --git a/meta-arago-distro/conf/distro/include/arago-prefs.inc b/meta-arago-distro/conf/distro/include/arago-prefs.inc > >index 34c3c539..60d7838c 100644 > >--- a/meta-arago-distro/conf/distro/include/arago-prefs.inc > >+++ b/meta-arago-distro/conf/distro/include/arago-prefs.inc > >@@ -10,6 +10,10 @@ PREFERRED_PROVIDER_virtual/kernel:append = "${ARAGO_KERNEL_SUFFIX}" > > PREFERRED_PROVIDER_jpeg = "libjpeg-turbo" > >+# open62541 requires entropy_poll.h which is not provided by mbedtls 3.x > >+PREFERRED_VERSION_mbedtls = "2.%" > >+PREFERRED_VERSION_nativesdk-mbedtls = "2.%" > >+ > > # Setting PREFERRED_VERSIONS due to selecting a specific version of a library or > > # application that does not have a GPLv3 license > > PREFERRED_VERSION_crda = "3.18"
You patch gets to live on Kirkstone... they backported the mbedtls change to the kirkstone branch and broke our builds. My patch works for master because there is a newer version of open 62541 on master, but fails for kirkstone. So your patch is on deck... On 6/29/2023 1:22 PM, Denys Dmytriyenko wrote: > From: Denys Dmytriyenko <denys@konsulko.com> > > Our patched version of open62541 uses entropy_poll.h header from mbedtls > that is no longer being exported by version 3.x, pin to version 2.x for > now. > > Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> > --- > meta-arago-distro/conf/distro/include/arago-prefs.inc | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/meta-arago-distro/conf/distro/include/arago-prefs.inc b/meta-arago-distro/conf/distro/include/arago-prefs.inc > index 34c3c539..60d7838c 100644 > --- a/meta-arago-distro/conf/distro/include/arago-prefs.inc > +++ b/meta-arago-distro/conf/distro/include/arago-prefs.inc > @@ -10,6 +10,10 @@ PREFERRED_PROVIDER_virtual/kernel:append = "${ARAGO_KERNEL_SUFFIX}" > > PREFERRED_PROVIDER_jpeg = "libjpeg-turbo" > > +# open62541 requires entropy_poll.h which is not provided by mbedtls 3.x > +PREFERRED_VERSION_mbedtls = "2.%" > +PREFERRED_VERSION_nativesdk-mbedtls = "2.%" > + > # Setting PREFERRED_VERSIONS due to selecting a specific version of a library or > # application that does not have a GPLv3 license > PREFERRED_VERSION_crda = "3.18"
diff --git a/meta-arago-distro/conf/distro/include/arago-prefs.inc b/meta-arago-distro/conf/distro/include/arago-prefs.inc index 34c3c539..60d7838c 100644 --- a/meta-arago-distro/conf/distro/include/arago-prefs.inc +++ b/meta-arago-distro/conf/distro/include/arago-prefs.inc @@ -10,6 +10,10 @@ PREFERRED_PROVIDER_virtual/kernel:append = "${ARAGO_KERNEL_SUFFIX}" PREFERRED_PROVIDER_jpeg = "libjpeg-turbo" +# open62541 requires entropy_poll.h which is not provided by mbedtls 3.x +PREFERRED_VERSION_mbedtls = "2.%" +PREFERRED_VERSION_nativesdk-mbedtls = "2.%" + # Setting PREFERRED_VERSIONS due to selecting a specific version of a library or # application that does not have a GPLv3 license PREFERRED_VERSION_crda = "3.18"