[PATCH 1/3] libxcrypt: Switch to disable obsolete APIs

[PATCH 1/3] libxcrypt: Switch to disable obsolete APIs

[Richard Purdie]

Since we have a fair amount of control of what we build in OE we can disable the obsolete
APIs which is what most distros are doing at this point.

This causes the library version to bump from 1 to 2.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-core/libxcrypt/libxcrypt_4.4.6.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.6.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.4.6.bb
index 637c0e6ffbd..893f5e73791 100644
--- a/meta/recipes-core/libxcrypt/libxcrypt_4.4.6.bb
+++ b/meta/recipes-core/libxcrypt/libxcrypt_4.4.6.bb
@@ -29,4 +29,7 @@ BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
 TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir} -Wno-error=missing-attributes"
 CPPFLAGS_append_class-nativesdk = " -Wno-error=missing-attributes"
 
+API = "--disable-obsolete-api"
+EXTRA_OECONF += "${API}"
+
 BBCLASSEXTEND = "nativesdk"
-- 
2.20.1

[PATCH 2/3] libxcrypt-compat: Add recipe to build the obsolete APIs

[Richard Purdie]

Add a recipe which is able to build the obsolete APIs. This is mainly
to support uninative which needs to have both the new and obsolete APIs
available to support the different host combinations.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../libxcrypt/libxcrypt-compat_4.4.6.bb          | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.6.bb

diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.6.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.6.bb
new file mode 100644
index 00000000000..810c707e881
--- /dev/null
+++ b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.6.bb
@@ -0,0 +1,16 @@
+#
+# This provides libcrypto.so.1 which contains obsolete APIs, needed for uninative in particular
+#
+
+require libxcrypt_${PV}.bb
+
+PROVIDES = ""
+
+API = "--enable-obsolete-api"
+
+do_install_append () {
+	rm -rf ${D}${includedir}
+	rm -rf ${D}${libdir}/pkgconfig
+	rm -rf ${D}${datadir}
+}
+
-- 
2.20.1

[PATCH 3/3] uninative-tarball: Add libxcrypt-compat

[Richard Purdie]

This avoids sstate/uninative relocation issues where a binary was built against
a system with libcrypt.so.1 or libcrypt.so.2 and then run on the opposite by
ensuring both libraries are in uninative.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-core/meta/uninative-tarball.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-core/meta/uninative-tarball.bb b/meta/recipes-core/meta/uninative-tarball.bb
index 25635fc2f50..39638eb8c55 100644
--- a/meta/recipes-core/meta/uninative-tarball.bb
+++ b/meta/recipes-core/meta/uninative-tarball.bb
@@ -16,6 +16,7 @@ TOOLCHAIN_HOST_TASK = "\
     nativesdk-glibc-gconv-libjis \
     nativesdk-patchelf \
     nativesdk-libxcrypt \
+    nativesdk-libxcrypt-compat \
     nativesdk-libnss-nis \
     "
 
-- 
2.20.1

Re: [PATCH 3/3] uninative-tarball: Add libxcrypt-compat

[akuster808]

On 6/19/19 6:56 AM, Richard Purdie wrote:
> This avoids sstate/uninative relocation issues where a binary was built against
> a system with libcrypt.so.1 or libcrypt.so.2 and then run on the opposite by
> ensuring both libraries are in uninative.
Does this affect stable branches?
- armin
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>  meta/recipes-core/meta/uninative-tarball.bb | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/meta/recipes-core/meta/uninative-tarball.bb b/meta/recipes-core/meta/uninative-tarball.bb
> index 25635fc2f50..39638eb8c55 100644
> --- a/meta/recipes-core/meta/uninative-tarball.bb
> +++ b/meta/recipes-core/meta/uninative-tarball.bb
> @@ -16,6 +16,7 @@ TOOLCHAIN_HOST_TASK = "\
>      nativesdk-glibc-gconv-libjis \
>      nativesdk-patchelf \
>      nativesdk-libxcrypt \
> +    nativesdk-libxcrypt-compat \
>      nativesdk-libnss-nis \
>      "
>  

Re: [PATCH 3/3] uninative-tarball: Add libxcrypt-compat

[richard.purdie]

On Wed, 2019-06-19 at 07:45 -0700, akuster808 wrote:
> 
> On 6/19/19 6:56 AM, Richard Purdie wrote:
> > This avoids sstate/uninative relocation issues where a binary was
> > built against
> > a system with libcrypt.so.1 or libcrypt.so.2 and then run on the
> > opposite by
> > ensuring both libraries are in uninative.
> Does this affect stable branches?

Yes, we'll need to upgrade to the new uninative release, assuming these
patches test successfully, merge and we make a new release with these
tweaks in.

I was going to send you email about this.

I've cc'd Vineela+Tracy so they know too as I'd planned to give them a
headsup.

[Context is autobuilder failures with this issue which I root caused,
SWAT hasn't filed the bug yet so we're ahead of them!]

Cheers,

Richard