[PATCH] Revert "musl: Add TEMP_FAILURE_RETRY from glibc"

[PATCH] Revert "musl: Add TEMP_FAILURE_RETRY from glibc"

[Khem Raj]

This reverts commit 0c68c621d3b8690e3a346170006f75b032511a8a.

It should be upstreamed first

Secondly, musl and glibc are under different licenses and importing
code from one to other could taint it.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...0001-unistd.h-Add-TEMP_FAILURE_RETRY.patch | 36 -------------------
 meta/recipes-core/musl/musl_git.bb            |  1 -
 2 files changed, 37 deletions(-)
 delete mode 100644 meta/recipes-core/musl/musl/0001-unistd.h-Add-TEMP_FAILURE_RETRY.patch

diff --git a/meta/recipes-core/musl/musl/0001-unistd.h-Add-TEMP_FAILURE_RETRY.patch b/meta/recipes-core/musl/musl/0001-unistd.h-Add-TEMP_FAILURE_RETRY.patch
deleted file mode 100644
index 4d48d61651..0000000000
--- a/meta/recipes-core/musl/musl/0001-unistd.h-Add-TEMP_FAILURE_RETRY.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 19cbebc3fa33c6a1a71a6036da4d67c98f859f06 Mon Sep 17 00:00:00 2001
-From: Adrian Bunk <bunk@stusta.de>
-Date: Wed, 15 May 2019 16:08:33 +0300
-Subject: unistd.h: Add TEMP_FAILURE_RETRY
-
-Signed-off-by: Adrian Bunk <bunk@stusta.de>
-Upstream-Status: Inappropriate [oe-specific]
----
- include/unistd.h | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/include/unistd.h b/include/unistd.h
-index 9485da7a..8a75af57 100644
---- a/include/unistd.h
-+++ b/include/unistd.h
-@@ -460,6 +460,17 @@ int eaccess(const char *, int);
- #define _CS_V6_ENV	1148
- #define _CS_V7_ENV	1149
- 
-+#ifdef _GNU_SOURCE
-+#ifndef TEMP_FAILURE_RETRY
-+# define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__                                                              \
-+    ({ long int __result;                                                     \
-+       do __result = (long int) (expression);                                 \
-+       while (__result == -1L && errno == EINTR);                             \
-+       __result; }))
-+#endif
-+#endif
-+
- #ifdef __cplusplus
- }
- #endif
--- 
-2.20.1
-
diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb
index 2b433aed8c..1e324804e1 100644
--- a/meta/recipes-core/musl/musl_git.bb
+++ b/meta/recipes-core/musl/musl_git.bb
@@ -15,7 +15,6 @@ PV = "${BASEVER}+git${SRCPV}"
 SRC_URI = "git://git.musl-libc.org/musl \
            file://0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch \
            file://0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch \
-           file://0001-unistd.h-Add-TEMP_FAILURE_RETRY.patch \
           "
 
 S = "${WORKDIR}/git"
-- 
2.21.0

Re: [PATCH] Revert "musl: Add TEMP_FAILURE_RETRY from glibc"

[Adrian Bunk]

On Thu, May 23, 2019 at 07:58:19AM -0700, Khem Raj wrote:
>...
> Secondly, musl and glibc are under different licenses and importing
> code from one to other could taint it.
>...

How many LOC are considered the legal limit in OE for that?

Many of the musl support patches (e.g. [1]) contain more LOC from glibc 
headers,[2] so if these are considered a problem there might be more
legal review ahead.

cu
Adrian

[1] meta/recipes-extended/pam/libpam/0001-Add-support-for-defining-missing-funcitonality.patch
[2] https://sourceware.org/git/?p=glibc.git;a=blame;f=string/string.h;hb=0a54e4010fe0085cd36deaff9442a7e88de3270d#l131

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Re: [PATCH] Revert "musl: Add TEMP_FAILURE_RETRY from glibc"

[Khem Raj]

On Thu, May 23, 2019 at 9:06 AM Adrian Bunk <bunk@stusta.de> wrote:
>
> On Thu, May 23, 2019 at 07:58:19AM -0700, Khem Raj wrote:
> >...
> > Secondly, musl and glibc are under different licenses and importing
> > code from one to other could taint it.
> >...
>
> How many LOC are considered the legal limit in OE for that?
>

Just make it easy where it can. OE does not guarantee any of that.

> Many of the musl support patches (e.g. [1]) contain more LOC from glibc
> headers,[2] so if these are considered a problem there might be more
> legal review ahead.
>

Yes I am aware.

> cu
> Adrian
>
> [1] meta/recipes-extended/pam/libpam/0001-Add-support-for-defining-missing-funcitonality.patch
> [2] https://sourceware.org/git/?p=glibc.git;a=blame;f=string/string.h;hb=0a54e4010fe0085cd36deaff9442a7e88de3270d#l131
>
> --
>
>        "Is there not promise of rain?" Ling Tan asked suddenly out
>         of the darkness. There had been need of rain for many days.
>        "Only a promise," Lao Er said.
>                                        Pearl S. Buck - Dragon Seed
>