date:20190518

Re: [OE-core] [PATCH] python-numpy: Avoid installing copy of f2py script

2019-05-18 Thread Khem Raj





On 5/17/19 4:49 PM, Alejandro Enedino Hernandez Samaniego wrote:

Both python-numpy and python3-numpy try to install the file:

${D}/${bindir}/f2py

which causes an error during do_rootfs since the package manager complains 
about that.

The numpy packages create basically copies of f2py script with the following 
names:
f2py (on both)
f2py2 (on python 2)
f2py2.7 (on python 2)
f2py3 (on python 3)
f2py3.7 (on python 3)

Remove the copy of f2py from python-numpy in favor of using the one from python3
to avoid installation issues at do_rootfs().



what if one does not install py3 ?


Signed-off-by: Alejandro Enedino Hernandez Samaniego 
---
  meta/recipes-devtools/python-numpy/python-numpy_1.16.3.bb | 4 
  1 file changed, 4 insertions(+)

diff --git a/meta/recipes-devtools/python-numpy/python-numpy_1.16.3.bb 
b/meta/recipes-devtools/python-numpy/python-numpy_1.16.3.bb
index 5013789..a1133da 100644
--- a/meta/recipes-devtools/python-numpy/python-numpy_1.16.3.bb
+++ b/meta/recipes-devtools/python-numpy/python-numpy_1.16.3.bb
@@ -4,3 +4,7 @@ require python-numpy.inc
  RDEPENDS_${PN}_class-target_append = " \
  ${PYTHON_PN}-subprocess \
  "
+
+do_install_append(){
+rm ${D}/${bindir}/f2py
+}


--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] gdb: Upgrade from 8.2.1 to 8.3

2019-05-18 Thread Khem Raj




On 5/14/19 11:24 AM, Randy MacLeod wrote:

On 5/14/19 1:36 PM, Richard Purdie wrote:

On Mon, 2019-05-13 at 22:53 +, Alistair Francis wrote:

Signed-off-by: Alistair Francis 
---
If there are issues with the patch the branch is avaliable here:
https://github.com/alistair23/openembedded-core/tree/alistair/gdb-8.3


Seems there is a problem in oe-selftest:

https://autobuilder.yoctoproject.org/typhoon/#/builders/86/builds/174/steps/7/logs/step2d 



"oe-selftest -r package.PackageTests.test_gdb_hardlink_debug" should
reproduce and it seemed to happen on more than one host.


I have some off-list notes, show below, for a bug that I haven't
gotten to yet.

Alistair,

Could you adjust the oeqa match criteria based on the info below?

../Randy


The oe-selftest:
    https://bugzilla.yoctoproject.org/show_bug.cgi?id=13123
is failing because the check at:
    meta/lib/oeqa/selftest/cases/package.py:
    elif "Breakpoint 1, main () at hello.c:4" in l:
is too precise. (This wasn't obvious to me for quite a
while based on the defect report!)

Anyway, at times, the test would pass for me other times
it would not as you may have noticed. For interactive tests, gdb
always functions properly but the breakpoint doesn't always
result in the *exact* string:
    "Breakpoint 1, main () at hello.c:4"
sometimes (with glibc-dev, iirc) it's:
    "Breakpoint 1, 0x0804905e in main () at hello.c:4"
and sometimes it's just:
    "Breakpoint 1, 0x0804905e: file hello.c, line 4"



perhaps its better to check output of

i b 1

instead of relying on output of setting the breakpoint.


so unless Khem or someone knows how to ensure
100% consistent behaviour, perhaps we should search for:

    "Breakpoint 1, .* hello.c.*4"   ( I'm not sure of the proper regex.)
since that will confirm that a breakpoint was hit at the proper file/line.



Cheers,

Richard





--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] systemd: Some upstreamable musl patches have been upstreamed

2019-05-18 Thread Khem Raj


thanks for doing this work. This looks ok.

On 5/17/19 11:51 PM, Adrian Bunk wrote:

Signed-off-by: Adrian Bunk 
---
  ...cy-ULONG_LONG_MAX-with-the-C99-ULLON.patch | 50 +++
  ...udev-event.c-must-include-sys-wait.h.patch | 35 +
  ...G_LONG_MAX-definition-in-case-of-mus.patch | 27 --
  ...-sys-wait.h-to-avoid-compile-failure.patch | 33 
  .../0023-socket-util.h-include-string.h.patch | 20 
  ...s-utilh-add-missing-sys-stat-include.patch | 16 +++---
  meta/recipes-core/systemd/systemd_242.bb  |  4 +-
  7 files changed, 105 insertions(+), 80 deletions(-)
  create mode 100644 
meta/recipes-core/systemd/systemd/0001-Replace-the-legacy-ULONG_LONG_MAX-with-the-C99-ULLON.patch
  create mode 100644 
meta/recipes-core/systemd/systemd/0001-src-udev-udev-event.c-must-include-sys-wait.h.patch
  delete mode 100644 
meta/recipes-core/systemd/systemd/0012-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch
  delete mode 100644 
meta/recipes-core/systemd/systemd/0022-include-sys-wait.h-to-avoid-compile-failure.patch

diff --git 
a/meta/recipes-core/systemd/systemd/0001-Replace-the-legacy-ULONG_LONG_MAX-with-the-C99-ULLON.patch
 
b/meta/recipes-core/systemd/systemd/0001-Replace-the-legacy-ULONG_LONG_MAX-with-the-C99-ULLON.patch
new file mode 100644
index 00..6f192a2ad2
--- /dev/null
+++ 
b/meta/recipes-core/systemd/systemd/0001-Replace-the-legacy-ULONG_LONG_MAX-with-the-C99-ULLON.patch
@@ -0,0 +1,50 @@
+From f491dfdc88ddbba36a24a75b2063aff027461b83 Mon Sep 17 00:00:00 2001
+From: Adrian Bunk 
+Date: Thu, 16 May 2019 22:20:07 +0300
+Subject: Replace the legacy ULONG_LONG_MAX with the C99 ULLONG_MAX
+
+Upstream-Status: Backport
+Signed-off-by: Adrian Bunk 
+---
+ src/journal-remote/journal-remote-main.c | 4 ++--
+ src/shutdown/shutdown.c  | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/journal-remote/journal-remote-main.c 
b/src/journal-remote/journal-remote-main.c
+index 2321a91e7b..d32c51c3ce 100644
+--- a/src/journal-remote/journal-remote-main.c
 b/src/journal-remote/journal-remote-main.c
+@@ -528,7 +528,7 @@ static int dispatch_http_event(sd_event_source *event,
+void *userdata) {
+ MHDDaemonWrapper *d = userdata;
+ int r;
+-MHD_UNSIGNED_LONG_LONG timeout = ULONG_LONG_MAX;
++MHD_UNSIGNED_LONG_LONG timeout = ULLONG_MAX;
+
+ assert(d);
+
+@@ -538,7 +538,7 @@ static int dispatch_http_event(sd_event_source *event,
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+"MHD_run failed!");
+ if (MHD_get_timeout(d->daemon, ) == MHD_NO)
+-timeout = ULONG_LONG_MAX;
++timeout = ULLONG_MAX;
+
+ r = sd_event_source_set_time(d->timer_event, timeout);
+ if (r < 0) {
+diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c
+index 35b2c2aa46..9623fe9ea2 100644
+--- a/src/shutdown/shutdown.c
 b/src/shutdown/shutdown.c
+@@ -212,7 +212,7 @@ static int sync_making_progress(unsigned long long 
*prev_dirty) {
+ }
+
+ static void sync_with_progress(void) {
+-unsigned long long dirty = ULONG_LONG_MAX;
++unsigned long long dirty = ULLONG_MAX;
+ unsigned checks;
+ pid_t pid;
+ int r;
+--
+2.20.1
+
diff --git 
a/meta/recipes-core/systemd/systemd/0001-src-udev-udev-event.c-must-include-sys-wait.h.patch
 
b/meta/recipes-core/systemd/systemd/0001-src-udev-udev-event.c-must-include-sys-wait.h.patch
new file mode 100644
index 00..565deba1d0
--- /dev/null
+++ 
b/meta/recipes-core/systemd/systemd/0001-src-udev-udev-event.c-must-include-sys-wait.h.patch
@@ -0,0 +1,35 @@
+From 010f917cf222d2c7205584056fe0e4c581a2e1b1 Mon Sep 17 00:00:00 2001
+From: Adrian Bunk 
+Date: Thu, 16 May 2019 22:09:46 +0300
+Subject: src/udev/udev-event.c must #include 
+
+Fixes the following build failure with musl:
+../git/src/udev/udev-event.c: In function 'spawn_wait':
+../git/src/udev/udev-event.c:600:53: error: 'WEXITED' undeclared (first use in 
this function); did you mean 'WIFEXITED'?
+ r = sd_event_add_child(e, NULL, spawn->pid, WEXITED, 
on_spawn_sigchld, spawn);
+ ^~~
+
+This looks like a bug in udev-event.c that could also have broken
+the compilation after some future glibc header reshuffle.
+
+Upstream-Status: Backport
+Signed-off-by: Adrian Bunk 
+---
+ src/udev/udev-event.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
+index cab1b5ac0c..a0a7ac0f9e 100644
+--- a/src/udev/udev-event.c
 b/src/udev/udev-event.c
+@@ -7,6 +7,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+
+ #include "sd-event.h"
+--
+2.20.1
+
diff --git 
a/meta/recipes-core/systemd/systemd/0012-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch

[OE-core] [PATCH] virglrenderer: fix compiling failure with `-fvisibility=default'

2019-05-18 Thread Hongxu Jia

Extern global variable `util_cpu_caps' to multiple C source files is
not a good habit, it caused linking failure when making a shard object
in some cross compiling circumstance
...
|ld: gallium/auxiliary/.libs/libgallium.a(u_cpu_detect.o): relocation
R_386_GOTOFF against undefined symbol `util_cpu_caps' can not be used
when making a shared object
|ld: final link failed: bad value
...

Covert global variable to static and assign it only in one C source file,
provide get function for other C source files

Signed-off-by: Hongxu Jia 
---
 ...util_cpu_caps-can-not-be-used-when-making.patch | 97 ++
 .../virglrenderer/virglrenderer_0.7.0.bb   |  1 +
 2 files changed, 98 insertions(+)
 create mode 100644 
meta/recipes-graphics/virglrenderer/virglrenderer/0001-fix-symbol-util_cpu_caps-can-not-be-used-when-making.patch

diff --git 
a/meta/recipes-graphics/virglrenderer/virglrenderer/0001-fix-symbol-util_cpu_caps-can-not-be-used-when-making.patch
 
b/meta/recipes-graphics/virglrenderer/virglrenderer/0001-fix-symbol-util_cpu_caps-can-not-be-used-when-making.patch
new file mode 100644
index 000..e5dc8f9
--- /dev/null
+++ 
b/meta/recipes-graphics/virglrenderer/virglrenderer/0001-fix-symbol-util_cpu_caps-can-not-be-used-when-making.patch
@@ -0,0 +1,97 @@
+From e991050fec102a5fde766226c7f49444c3860c49 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia 
+Date: Sun, 19 May 2019 00:12:51 -0400
+Subject: [PATCH] fix symbol `util_cpu_caps' can not be used when making a
+ shared object
+
+Extern global variable `util_cpu_caps' to multiple C source files is
+not a good habit, it caused linking failure when making a shard object
+in some cross compiling circumstance
+...
+|ld: gallium/auxiliary/.libs/libgallium.a(u_cpu_detect.o): relocation
+R_386_GOTOFF against undefined symbol `util_cpu_caps' can not be used
+when making a shared object
+|ld: final link failed: bad value
+...
+
+Covert global variable to static and assign it only in one C source file,
+provide get function for other C source files
+
+Upstream-Status: Submitted [virglrenderer-de...@lists.freedesktop.org]
+
+Signed-off-by: Hongxu Jia 
+---
+ src/gallium/auxiliary/util/u_cpu_detect.c | 6 +-
+ src/gallium/auxiliary/util/u_cpu_detect.h | 3 +--
+ src/gallium/auxiliary/util/u_math.c   | 8 
+ 3 files changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/src/gallium/auxiliary/util/u_cpu_detect.c 
b/src/gallium/auxiliary/util/u_cpu_detect.c
+index 0b4b83a..be0cedd 100644
+--- a/src/gallium/auxiliary/util/u_cpu_detect.c
 b/src/gallium/auxiliary/util/u_cpu_detect.c
+@@ -78,7 +78,11 @@ DEBUG_GET_ONCE_BOOL_OPTION(dump_cpu, "GALLIUM_DUMP_CPU", 
FALSE)
+ #endif
+ 
+ 
+-struct util_cpu_caps util_cpu_caps;
++static struct util_cpu_caps util_cpu_caps;
++struct util_cpu_caps* get_util_cpu_caps(void)
++{
++return _cpu_caps;
++}
+ 
+ #if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64)
+ static int has_cpuid(void);
+diff --git a/src/gallium/auxiliary/util/u_cpu_detect.h 
b/src/gallium/auxiliary/util/u_cpu_detect.h
+index 01f3896..58134ab 100644
+--- a/src/gallium/auxiliary/util/u_cpu_detect.h
 b/src/gallium/auxiliary/util/u_cpu_detect.h
+@@ -73,8 +73,7 @@ struct util_cpu_caps {
+unsigned has_daz:1;
+ };
+ 
+-extern struct util_cpu_caps
+-util_cpu_caps;
++struct util_cpu_caps* get_util_cpu_caps(void);
+ 
+ void util_cpu_detect(void);
+ 
+diff --git a/src/gallium/auxiliary/util/u_math.c 
b/src/gallium/auxiliary/util/u_math.c
+index e574153..c08ed3b 100644
+--- a/src/gallium/auxiliary/util/u_math.c
 b/src/gallium/auxiliary/util/u_math.c
+@@ -90,7 +90,7 @@ util_fpstate_get(void)
+unsigned mxcsr = 0;
+ 
+ #if defined(PIPE_ARCH_SSE)
+-   if (util_cpu_caps.has_sse) {
++   if (get_util_cpu_caps()->has_sse) {
+   mxcsr = _mm_getcsr();
+}
+ #endif
+@@ -108,10 +108,10 @@ unsigned
+ util_fpstate_set_denorms_to_zero(unsigned current_mxcsr)
+ {
+ #if defined(PIPE_ARCH_SSE)
+-   if (util_cpu_caps.has_sse) {
++   if (get_util_cpu_caps()->has_sse) {
+   /* Enable flush to zero mode */
+   current_mxcsr |= _MM_FLUSH_ZERO_MASK;
+-  if (util_cpu_caps.has_daz) {
++  if (get_util_cpu_caps()->has_daz) {
+  /* Enable denormals are zero mode */
+  current_mxcsr |= _MM_DENORMALS_ZERO_MASK;
+   }
+@@ -130,7 +130,7 @@ void
+ util_fpstate_set(unsigned mxcsr)
+ {
+ #if defined(PIPE_ARCH_SSE)
+-   if (util_cpu_caps.has_sse) {
++   if (get_util_cpu_caps()->has_sse) {
+   _mm_setcsr(mxcsr);
+}
+ #endif
+-- 
+2.8.1
+
diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer_0.7.0.bb 
b/meta/recipes-graphics/virglrenderer/virglrenderer_0.7.0.bb
index 225a0b8..441c692 100644
--- a/meta/recipes-graphics/virglrenderer/virglrenderer_0.7.0.bb
+++ b/meta/recipes-graphics/virglrenderer/virglrenderer_0.7.0.bb
@@ -9,6 +9,7 @@ SRCREV = "402c228861c9893f64cffbbcb4cb23044b8c721c"
 SRC_URI = "git://anongit.freedesktop.org/virglrenderer \
file://0001-vtest-add-missing-includes.patch \

Re: [OE-core] [PATCH] nss-myhostname: Stop trying to build for musl

2019-05-18 Thread Khem Raj





On 5/18/19 10:21 AM, Adrian Bunk wrote:

There's no point in building an NSS module for a C library
that doesn't support NSS.



this patch is ok



Signed-off-by: Adrian Bunk 
---
  ...-Check-for-nss.h-presense-before-use.patch | 53 ---
  .../nss-myhostname/nss-myhostname_0.3.bb  |  3 +-
  2 files changed, 2 insertions(+), 54 deletions(-)
  delete mode 100644 
meta/recipes-support/nss-myhostname/nss-myhostname/0001-nss-myhostname-Check-for-nss.h-presense-before-use.patch

diff --git 
a/meta/recipes-support/nss-myhostname/nss-myhostname/0001-nss-myhostname-Check-for-nss.h-presense-before-use.patch
 
b/meta/recipes-support/nss-myhostname/nss-myhostname/0001-nss-myhostname-Check-for-nss.h-presense-before-use.patch
deleted file mode 100644
index 82f25743af..00
--- 
a/meta/recipes-support/nss-myhostname/nss-myhostname/0001-nss-myhostname-Check-for-nss.h-presense-before-use.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From d1345871b992f9a055c968963967e728da1a7ffb Mon Sep 17 00:00:00 2001
-From: Khem Raj 
-Date: Sat, 30 Jan 2016 20:29:06 +
-Subject: [PATCH] nss-myhostname: Check for nss.h presense before use
-
-We do not have nss.h on musl e.g. and configury is already checking for
-nss.h presence, use this to define needed data structures if nss.h is
-missing on a given libc implementation on a platform
-
-include stdint.h for uint32_h definition
-
-Signed-off-by: Khem Raj 

-Upstream-Status: Pending
-
- nss-myhostname.c | 20 
- 1 file changed, 20 insertions(+)
-
-diff --git a/nss-myhostname.c b/nss-myhostname.c
-index 293166c..6f287f5 100644
 a/nss-myhostname.c
-+++ b/nss-myhostname.c
-@@ -21,7 +21,27 @@
- ***/
-
- #include 
-+#include 
-+#ifdef HAVE_NSS_H
- #include 
-+#else
-+enum nss_status {
-+NSS_STATUS_TRYAGAIN = -2,
-+NSS_STATUS_UNAVAIL,
-+NSS_STATUS_NOTFOUND,
-+NSS_STATUS_SUCCESS,
-+NSS_STATUS_RETURN
-+};
-+/* Data structure used for the 'gethostbyname4_r' function.  */
-+struct gaih_addrtuple
-+  {
-+struct gaih_addrtuple *next;
-+char *name;
-+int family;
-+uint32_t addr[4];
-+uint32_t scopeid;
-+  };
-+#endif
- #include 
- #include 
- #include 
---
-2.7.0
-
diff --git a/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb 
b/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb
index de5b7cf598..244d9e204e 100644
--- a/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb
+++ b/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb
@@ -7,7 +7,6 @@ LICENSE = "LGPLv2.1"
  LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1"
  
  SRC_URI = "http://0pointer.de/lennart/projects/nss-myhostname/nss-myhostname-${PV}.tar.gz \

-   
file://0001-nss-myhostname-Check-for-nss.h-presense-before-use.patch \
 "
  
  SRC_URI[md5sum] = "d4ab9ac36c053ab8fb836db1cbd4a48f"

@@ -15,6 +14,8 @@ SRC_URI[sha256sum] = 
"2ba744ea8d578d1c57c85884e94a3042ee17843a5294434d3a7f6c4d67
  
  inherit autotools distro_features_check
  
+COMPATIBLE_HOST_libc-musl = 'null'

+
  # The systemd has its own copy of nss-myhostname
  CONFLICT_DISTRO_FEATURES = "systemd"
  


--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] libnss-mdns: Stop trying to build for musl

2019-05-18 Thread Khem Raj





On 5/18/19 10:21 AM, Adrian Bunk wrote:

There's no point in building an NSS module for a C library
that doesn't support NSS.



Fundamentally this change looks ok however
have you tried using avahi after this change ?


Signed-off-by: Adrian Bunk 
---
  .../libnss-mdns/0001-check-for-nss.h.patch| 56 ---
  .../libnss-mdns/libnss-mdns_0.10.bb   |  3 +-
  2 files changed, 2 insertions(+), 57 deletions(-)
  delete mode 100644 
meta/recipes-connectivity/libnss-mdns/libnss-mdns/0001-check-for-nss.h.patch

diff --git 
a/meta/recipes-connectivity/libnss-mdns/libnss-mdns/0001-check-for-nss.h.patch 
b/meta/recipes-connectivity/libnss-mdns/libnss-mdns/0001-check-for-nss.h.patch
deleted file mode 100644
index f63eb90cdc..00
--- 
a/meta/recipes-connectivity/libnss-mdns/libnss-mdns/0001-check-for-nss.h.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From bdf01a581d58eb5340e9238d143dbcac9db5b11c Mon Sep 17 00:00:00 2001
-From: Khem Raj 
-Date: Sat, 30 Jan 2016 19:29:45 +
-Subject: [PATCH] check for nss.h
-
-nss.h may not available on all libc implementations, e.g. musl does not
-have this header, this patch detects nss.h presence and defines the data
-types that are required if nss.h is missing on platform
-
-Signed-off-by: Khem Raj 

-Upstream-Status: Pending
-
- configure.ac |  2 +-
- src/nss.c| 11 +++
- 2 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index aa66bc6..ce19b07 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -71,7 +71,7 @@ AC_PROG_LIBTOOL
-
- # Checks for header files.
- AC_HEADER_STDC
--AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h netdb.h netinet/in.h 
stdlib.h string.h sys/socket.h sys/time.h unistd.h nss.h sys/ioctl.h])
-+AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h netdb.h netinet/in.h 
stdlib.h string.h sys/socket.h sys/time.h unistd.h nss.h sys/ioctl.h nss.h])
-
- # Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
-diff --git a/src/nss.c b/src/nss.c
-index e48e315..406733b 100644
 a/src/nss.c
-+++ b/src/nss.c
-@@ -29,7 +29,18 @@
- #include 
- #include 
- #include 
-+#ifdef HAVE_NSS_H
- #include 
-+#else
-+enum nss_status {
-+NSS_STATUS_TRYAGAIN = -2,
-+NSS_STATUS_UNAVAIL,
-+NSS_STATUS_NOTFOUND,
-+NSS_STATUS_SUCCESS,
-+NSS_STATUS_RETURN
-+};
-+#endif
-+
- #include 
- #include 
-
---
-2.7.0
-
diff --git a/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb 
b/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb
index d0eb2768d1..953505971a 100644
--- a/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb
+++ b/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb
@@ -9,7 +9,6 @@ DEPENDS = "avahi"
  PR = "r7"
  
  SRC_URI = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${PV}.tar.gz \

-   file://0001-check-for-nss.h.patch \
 "
  
  SRC_URI[md5sum] = "03938f17646efbb50aa70ba5f99f51d7"

@@ -21,6 +20,8 @@ localstatedir = "/"
  
  inherit autotools
  
+COMPATIBLE_HOST_libc-musl = 'null'

+
  EXTRA_OECONF = "--libdir=${base_libdir} --disable-lynx --enable-avahi"
  
  # suppress warning, but don't bother with autonamer



--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 31/37] bash-completion: upgrade 2.8 -> 2.9

2019-05-18 Thread Khem Raj





On 5/17/19 11:11 AM, Alexander Kanavin wrote:

Signed-off-by: Alexander Kanavin 
---
  .../{bash-completion_2.8.bb => bash-completion_2.9.bb} | 7 ++-
  1 file changed, 2 insertions(+), 5 deletions(-)
  rename meta/recipes-support/bash-completion/{bash-completion_2.8.bb => 
bash-completion_2.9.bb} (82%)

diff --git a/meta/recipes-support/bash-completion/bash-completion_2.8.bb 
b/meta/recipes-support/bash-completion/bash-completion_2.9.bb
similarity index 82%
rename from meta/recipes-support/bash-completion/bash-completion_2.8.bb
rename to meta/recipes-support/bash-completion/bash-completion_2.9.bb
index 85064343e30..ce66ba5a2a8 100644
--- a/meta/recipes-support/bash-completion/bash-completion_2.8.bb
+++ b/meta/recipes-support/bash-completion/bash-completion_2.9.bb
@@ -9,8 +9,8 @@ SECTION = "console/utils"
  
  SRC_URI = "https://github.com/scop/bash-completion/releases/download/${PV}/${BPN}-${PV}.tar.xz;
  
-SRC_URI[md5sum] = "201b6ae62f7d5fb5b1b25e34427db919"

-SRC_URI[sha256sum] = 
"c01f5570f5698a0dda8dc9cfb2a83744daa1ec54758373a6e349bd903375f54d"
+SRC_URI[md5sum] = "60139333b25c4d54ad40323b701be130"
+SRC_URI[sha256sum] = 
"d48fe378e731062f479c5f8802ffa9d3c40a275a19e6e0f6f6cc4b90fa12b2f5"
  UPSTREAM_CHECK_REGEX = "bash-completion-(?P(?!2008).+)\.tar"
  UPSTREAM_CHECK_URI = "https://github.com/scop/bash-completion/releases;
  
@@ -25,9 +25,6 @@ do_install_append() {
  
  	# Delete files already provided by util-linux

local i
-   for i in mount umount; do
-   rm ${D}${datadir}/${BPN}/completions/$i
-   done


why is this deleted ?


  }
  
  RDEPENDS_${PN} = "bash"



--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 11/37] go: update 1.12.1->1.12.5

2019-05-18 Thread Khem Raj





On 5/17/19 11:25 AM, akuster808 wrote:



On 5/17/19 11:11 AM, Alexander Kanavin wrote:

Signed-off-by: Alexander Kanavin 
---
  meta/recipes-devtools/go/go-1.12.inc | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-devtools/go/go-1.12.inc 
b/meta/recipes-devtools/go/go-1.12.inc
index 0cf0a63ff65..7c4cac1fc25 100644
--- a/meta/recipes-devtools/go/go-1.12.inc
+++ b/meta/recipes-devtools/go/go-1.12.inc

any indication on testing?


I think we dont have extensive unit testing or ptest except go 
helloworld, maybe we should have a ptest to run it on emulator


1.11 ia kept for users to migrate to 1.12, maybe we can remove it now.



any reason why 1.11 can't be dropped?

- armin

@@ -1,7 +1,7 @@
  require go-common.inc
  
  GO_BASEVERSION = "1.12"

-GO_MINOR = ".1"
+GO_MINOR = ".5"
  PV .= "${GO_MINOR}"
  FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:"
  
@@ -19,5 +19,5 @@ SRC_URI += "\

  "
  SRC_URI_append_libc-musl = " 
file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch"
  
-SRC_URI[main.md5sum] = "09fe592343465560b4b8431d870b3df3"

-SRC_URI[main.sha256sum] = 
"0be127684df4b842a64e58093154f9d15422f1405f1fcff4b2c36ffc6a15818a"
+SRC_URI[main.md5sum] = "cb6f594d22dd79af4fff9779607b1b47"
+SRC_URI[main.sha256sum] = 
"2aa5f088cbb332e73fc3def546800616b38d3bfe6b8713b8a6404060f22503e8"



--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] vim: Rework things so vim adds features not vim-tiny removes

2019-05-18 Thread Tom Rini

On Sat, May 18, 2019 at 03:03:27PM -0400, Tom Rini wrote:
> On Sat, May 18, 2019 at 08:57:02PM +0200, Martin Jansa wrote:
> > Thanks Tom for quick update.
> > 
> > ALTERNATIVE_TARGET[xxd] = "${bindir}/xxd"
> > ALTERNATIVE_LINK_NAME[xxd] = "${bindir}/xxd"
> > looks strange, IIRC TARGET and LINK_NAME should always point to different
> > filepath, it was added in meta-oe commit:
> > 
> > commit 897c10b7c17c138a85bdeb36cf72e7201daf0e0e
> > Author: Dan McGregor 
> > Date:   Thu Oct 18 09:46:27 2018 -0600
> > 
> > vim: alternatify xxd
> > 
> > toybox also provides xxd.
> > 
> > but I wonder what u-a does (or is supposed to do in this scenario). Maybe
> > u-a bbclass automatically adds .${BPN} suffix to TARGET and renames the
> > installed file?
> 
> I'll double check, but also toybox doesn't have anything for xxd today,
> so I'll add that into my build and come up with something sane for both
> if needed, thanks!

OK, so busybox, toybox and vim all provide "xxd" and busybox/toybox
setup u-a with their normal method.  With what vim has (today and also
with this patch) we end up with /usr/bin/xxd.vim, which is what we want.
I inspected the ipk for that, and then putting all 3 in
core-image-minimal looks sane too.

-- 
Tom


signature.asc
Description: PGP signature
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH V2 1/2] u-boot: clean up some redundant code

2019-05-18 Thread liu . ming50

From: Ming Liu 

- Merge some DEPENDS lines.
- Drop some unnecessary 'cd ${DEPLOYDIR}' and 'rm -f'.

Signed-off-by: Ming Liu 
---
 meta/recipes-bsp/u-boot/u-boot.inc | 25 -
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/meta/recipes-bsp/u-boot/u-boot.inc 
b/meta/recipes-bsp/u-boot/u-boot.inc
index 9a754fd..e5af762 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -5,11 +5,9 @@ B = "${WORKDIR}/build"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-DEPENDS += "kern-tools-native"
-
 inherit uboot-config uboot-extlinux-config uboot-sign deploy cml1
 
-DEPENDS += "swig-native python-native"
+DEPENDS += "kern-tools-native swig-native python-native"
 
 EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc 
${TOOLCHAIN_OPTIONS}" V=1'
 EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}"'
@@ -227,6 +225,7 @@ do_install () {
 FILES_${PN} = "/boot ${sysconfdir} ${datadir}"
 
 do_deploy () {
+install -d ${DEPLOYDIR}
 if [ -n "${UBOOT_CONFIG}" ]
 then
 for config in ${UBOOT_MACHINE}; do
@@ -235,25 +234,20 @@ do_deploy () {
 j=$(expr $j + 1);
 if [ $j -eq $i ]
 then
-install -d ${DEPLOYDIR}
 install -m 644 
${B}/${config}/u-boot-${type}.${UBOOT_SUFFIX} 
${DEPLOYDIR}/u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX}
-cd ${DEPLOYDIR}
-ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} 
${UBOOT_SYMLINK}-${type}
-ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} 
${UBOOT_SYMLINK}
-ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} 
${UBOOT_BINARY}-${type}
-ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} 
${UBOOT_BINARY}
+ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} 
${DEPLOYDIR}/${UBOOT_SYMLINK}-${type}
+ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} 
${DEPLOYDIR}/${UBOOT_SYMLINK}
+ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} 
${DEPLOYDIR}/${UBOOT_BINARY}-${type}
+ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} 
${DEPLOYDIR}/${UBOOT_BINARY}
 fi
 done
 unset  j
 done
 unset  i
 else
-install -d ${DEPLOYDIR}
 install -m 644 ${B}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
-cd ${DEPLOYDIR}
-rm -f ${UBOOT_BINARY} ${UBOOT_SYMLINK}
-ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK}
-ln -sf ${UBOOT_IMAGE} ${UBOOT_BINARY}
+ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_SYMLINK}
+ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_BINARY}
 fi
 
 if [ -n "${UBOOT_ELF}" ]
@@ -295,7 +289,6 @@ do_deploy () {
 if [ $j -eq $i ]
 then
 install -m 644 ${B}/${config}/${SPL_BINARY} 
${DEPLOYDIR}/${SPL_IMAGE}-${type}-${PV}-${PR}
-rm -f ${DEPLOYDIR}/${SPL_BINARYNAME} 
${DEPLOYDIR}/${SPL_SYMLINK}-${type}
 ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} 
${DEPLOYDIR}/${SPL_BINARYNAME}-${type}
 ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} 
${DEPLOYDIR}/${SPL_BINARYNAME}
 ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} 
${DEPLOYDIR}/${SPL_SYMLINK}-${type}
@@ -307,7 +300,6 @@ do_deploy () {
 unset  i
 else
 install -m 644 ${B}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE}
-rm -f ${DEPLOYDIR}/${SPL_BINARYNAME} ${DEPLOYDIR}/${SPL_SYMLINK}
 ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_BINARYNAME}
 ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_SYMLINK}
 fi
@@ -317,7 +309,6 @@ do_deploy () {
 if [ -n "${UBOOT_ENV}" ]
 then
 install -m 644 ${WORKDIR}/${UBOOT_ENV_BINARY} 
${DEPLOYDIR}/${UBOOT_ENV_IMAGE}
-rm -f ${DEPLOYDIR}/${UBOOT_ENV_BINARY} 
${DEPLOYDIR}/${UBOOT_ENV_SYMLINK}
 ln -sf ${UBOOT_ENV_IMAGE} ${DEPLOYDIR}/${UBOOT_ENV_BINARY}
 ln -sf ${UBOOT_ENV_IMAGE} ${DEPLOYDIR}/${UBOOT_ENV_SYMLINK}
 fi
-- 
2.7.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH V2 0/2] meta: drop IMAGE_FSTYPES from UBOOT_CONFIG

2019-05-18 Thread liu . ming50

From: Ming Liu 

Instead, introduce a new item 'env' into UBOOT_CONFIG.

Ming Liu (2):
  u-boot: clean up some redundant code
  meta: drop IMAGE_FSTYPES from UBOOT_CONFIG

 meta/classes/uboot-config.bbclass  | 25 +---
 meta/conf/documentation.conf   |  2 +-
 meta/recipes-bsp/u-boot/u-boot.inc | 47 --
 3 files changed, 42 insertions(+), 32 deletions(-)

-- 
2.7.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH V2 2/2] meta: drop IMAGE_FSTYPES from UBOOT_CONFIG

2019-05-18 Thread liu . ming50

From: Ming Liu 

Currently, in most BSP layers, the uboot-config.bbclass is not being
inherited in machine conf, so the IMAGE_FSTYPES item would not take
effect since it's a image specific variable, So we can drop it from
UBOOT_CONFIG.

Instead, we introduce a new item 'env', it could be used to deploy
environment files to '/boot' directory and also to deploy directory.

To give a example, now the UBOOT_CONFIG could be set like this:
```
UBOOT_CONFIG ??= "emmc rawnand"
UBOOT_CONFIG[emmc] = "imx7_emmc_defconfig,uEnv-emmc.txt,u-boot.imx"
UBOOT_CONFIG[nand] = "imx7_defconfig,uEnv-nand.txt,u-boot-nand.imx"
```

It would not conflict with the current UBOOT_ENV variable, the later
has higher priority to override environment setting in UBOOT_CONFIG.

Also drop some trivial debug code in this patch.

Signed-off-by: Ming Liu 
---
 meta/classes/uboot-config.bbclass  | 25 +++--
 meta/conf/documentation.conf   |  2 +-
 meta/recipes-bsp/u-boot/u-boot.inc | 22 ++
 3 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/meta/classes/uboot-config.bbclass 
b/meta/classes/uboot-config.bbclass
index 89ff970..af609fc 100644
--- a/meta/classes/uboot-config.bbclass
+++ b/meta/classes/uboot-config.bbclass
@@ -3,7 +3,7 @@
 # The format to specify it, in the machine, is:
 #
 # UBOOT_CONFIG ??= 
-# UBOOT_CONFIG[foo] = "config,images,binary"
+# UBOOT_CONFIG[foo] = "config,env,binary"
 #
 # or
 #
@@ -15,23 +15,24 @@ UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}"
 
 python () {
 ubootmachine = d.getVar("UBOOT_MACHINE")
-ubootconfigflags = d.getVarFlags('UBOOT_CONFIG')
 ubootbinary = d.getVar('UBOOT_BINARY')
 ubootbinaries = d.getVar('UBOOT_BINARIES')
+ubootenvs = d.getVar('UBOOT_ENVS')
+ubootconfig = (d.getVar('UBOOT_CONFIG') or "").split()
+ubootconfigflags = d.getVarFlags('UBOOT_CONFIG') or {}
+
 # The "doc" varflag is special, we don't want to see it here
 ubootconfigflags.pop('doc', None)
-ubootconfig = (d.getVar('UBOOT_CONFIG') or "").split()
 
 if not ubootmachine and not ubootconfig:
-PN = d.getVar("PN")
-FILE = os.path.basename(d.getVar("FILE"))
-bb.debug(1, "To build %s, see %s for instructions on \
- setting up your machine config" % (PN, FILE))
 raise bb.parse.SkipRecipe("Either UBOOT_MACHINE or UBOOT_CONFIG must 
be set in the %s machine configuration." % d.getVar("MACHINE"))
 
 if ubootmachine and ubootconfig:
 raise bb.parse.SkipRecipe("You cannot use UBOOT_MACHINE and 
UBOOT_CONFIG at the same time.")
 
+if ubootconfigflags and ubootenvs:
+raise bb.parse.SkipRecipe("You cannot use UBOOT_ENVS as it is internal 
to uboot_config.bbclass.")
+
 if ubootconfigflags and ubootbinaries:
 raise bb.parse.SkipRecipe("You cannot use UBOOT_BINARIES as it is 
internal to uboot_config.bbclass.")
 
@@ -40,18 +41,14 @@ python () {
 for f, v in ubootconfigflags.items():
 if config == f: 
 items = v.split(',')
-if items[0] and len(items) > 3:
-raise bb.parse.SkipRecipe('Only config,images,binary 
can be specified!')
+if len(items) == 0 or len(items) > 3:
+raise bb.parse.SkipRecipe('Only config,env,binary can 
be specified!')
 d.appendVar('UBOOT_MACHINE', ' ' + items[0])
-# IMAGE_FSTYPES appending
 if len(items) > 1 and items[1]:
-bb.debug(1, "Appending '%s' to IMAGE_FSTYPES." % 
items[1])
-d.appendVar('IMAGE_FSTYPES', ' ' + items[1])
+d.appendVar('UBOOT_ENVS', ' ' + items[1])
 if len(items) > 2 and items[2]:
-bb.debug(1, "Appending '%s' to UBOOT_BINARIES." % 
items[2])
 d.appendVar('UBOOT_BINARIES', ' ' + items[2])
 else:
-bb.debug(1, "Appending '%s' to UBOOT_BINARIES." % 
ubootbinary)
 d.appendVar('UBOOT_BINARIES', ' ' + ubootbinary)
 break
 }
diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf
index 550df20..5da7eb8 100644
--- a/meta/conf/documentation.conf
+++ b/meta/conf/documentation.conf
@@ -439,7 +439,7 @@ TUNEVALID[doc] = "Descriptions, stored as flags, of valid 
tuning features."
 
 #U
 
-UBOOT_CONFIG[doc] = "Configures the UBOOT_MACHINE and can also define 
IMAGE_FSTYPES for individual cases."
+UBOOT_CONFIG[doc] = "Configures the UBOOT_MACHINE and can also define 
UBOOT_ENVS, UBOOT_BINARIES for individual cases."
 UBOOT_ENTRYPOINT[doc] = "Specifies the entry point for the U-Boot image."
 UBOOT_LOADADDRESS[doc] = "Specifies the load address for the U-Boot image."
 UBOOT_LOCALVERSION[doc] = "Appends a string to the name of the local version 
of the U-Boot image."
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc

[OE-core] [PATCH] alsa-utils: replace hard-coded alsa-utils with PN

2019-05-18 Thread liu . ming50

From: Ming Liu 

This is mandatory to support multilib build, and also to avoid being
redundant with plenty of hard-coded alsa-utils references.

Signed-off-by: Ming Liu 
---
 meta/recipes-multimedia/alsa/alsa-utils_1.1.8.bb | 96 
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.1.8.bb 
b/meta/recipes-multimedia/alsa/alsa-utils_1.1.8.bb
index 96d54e5..ef98891 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.1.8.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.1.8.bb
@@ -20,7 +20,7 @@ PACKAGECONFIG[udev] = "--with-udev-rules-dir=`pkg-config 
--variable=udevdir udev
 PACKAGECONFIG[manpages] = "--enable-xmlto, --disable-xmlto, xmlto-native 
docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
 
 # alsa-utils specified in SRC_URI due to alsa-utils-scripts recipe
-SRC_URI = 
"https://www.alsa-project.org/files/pub/utils/alsa-utils-${PV}.tar.bz2;
+SRC_URI = "https://www.alsa-project.org/files/pub/utils/${BPN}-${PV}.tar.bz2;
 SRC_URI[md5sum] = "54d6f9b483144823d0fc0c26e8cea028"
 SRC_URI[sha256sum] = 
"fd9bf528922b3829a91913b89a1858c58a0b24271a7b5f529923aa9ea12fa4cf"
 
@@ -36,59 +36,59 @@ inherit autotools gettext pkgconfig manpages
 # ipk depends on them.
 
 ALSA_UTILS_PKGS = "\
- ${@bb.utils.contains('PACKAGECONFIG', 'bat', 
'alsa-utils-alsabat', '', d)} \
- alsa-utils-alsamixer \
- alsa-utils-alsatplg \
- alsa-utils-midi \
- alsa-utils-aplay \
- alsa-utils-amixer \
- alsa-utils-aconnect \
- alsa-utils-iecset \
- alsa-utils-speakertest \
- alsa-utils-aseqnet \
- alsa-utils-aseqdump \
- alsa-utils-alsactl \
- alsa-utils-alsaloop \
- alsa-utils-alsaucm \
+ ${@bb.utils.contains('PACKAGECONFIG', 'bat', '${PN}-alsabat', '', 
d)} \
+ ${PN}-alsamixer \
+ ${PN}-alsatplg \
+ ${PN}-midi \
+ ${PN}-aplay \
+ ${PN}-amixer \
+ ${PN}-aconnect \
+ ${PN}-iecset \
+ ${PN}-speakertest \
+ ${PN}-aseqnet \
+ ${PN}-aseqdump \
+ ${PN}-alsactl \
+ ${PN}-alsaloop \
+ ${PN}-alsaucm \
 "
 
 PACKAGES += "${ALSA_UTILS_PKGS}"
 RDEPENDS_${PN} += "${ALSA_UTILS_PKGS}"
 
 FILES_${PN} = ""
-FILES_alsa-utils-alsabat = "${bindir}/alsabat"
-FILES_alsa-utils-alsatplg= "${bindir}/alsatplg"
-FILES_alsa-utils-aplay   = "${bindir}/aplay ${bindir}/arecord 
${bindir}/axfer"
-FILES_alsa-utils-amixer  = "${bindir}/amixer"
-FILES_alsa-utils-alsamixer   = "${bindir}/alsamixer"
-FILES_alsa-utils-speakertest = "${bindir}/speaker-test ${datadir}/sounds/alsa/ 
${datadir}/alsa/speaker-test/"
-FILES_alsa-utils-midi= "${bindir}/aplaymidi ${bindir}/arecordmidi 
${bindir}/amidi"
-FILES_alsa-utils-aconnect= "${bindir}/aconnect"
-FILES_alsa-utils-aseqnet = "${bindir}/aseqnet"
-FILES_alsa-utils-iecset  = "${bindir}/iecset"
-FILES_alsa-utils-alsactl = "${sbindir}/alsactl 
*/udev/rules.d/90-alsa-restore.rules */*/udev/rules.d/90-alsa-restore.rules 
${systemd_unitdir} ${localstatedir}/lib/alsa ${datadir}/alsa/init/"
-FILES_alsa-utils-aseqdump= "${bindir}/aseqdump"
-FILES_alsa-utils-alsaloop= "${bindir}/alsaloop"
-FILES_alsa-utils-alsaucm = "${bindir}/alsaucm 
*/udev/rules.d/89-alsa-ucm.rules */*/udev/rules.d/89-alsa-ucm.rules"
-
-SUMMARY_alsa-utils-alsabat  = "Command-line sound tester for ALSA sound 
card driver"
-SUMMARY_alsa-utils-alsatplg = "Converts topology text files into binary 
format for kernel"
-SUMMARY_alsa-utils-aplay= "Play (and record) sound files using ALSA"
-SUMMARY_alsa-utils-amixer   = "Command-line control for ALSA mixer and 
settings"
-SUMMARY_alsa-utils-alsamixer= "ncurses-based control for ALSA mixer and 
settings"
-SUMMARY_alsa-utils-speakertest  = "ALSA surround speaker test utility"
-SUMMARY_alsa-utils-midi = "Miscellaneous MIDI utilities for ALSA"
-SUMMARY_alsa-utils-aconnect = "ALSA sequencer connection manager"
-SUMMARY_alsa-utils-aseqnet  = "Network client/server for ALSA sequencer"
-SUMMARY_alsa-utils-iecset   = "ALSA utility for setting/showing IEC958 
(S/PDIF) status bits"
-SUMMARY_alsa-utils-alsactl  = "Saves/restores ALSA-settings in 
/etc/asound.state"
-SUMMARY_alsa-utils-aseqdump = "Shows the events received at an ALSA 
sequencer port"
-SUMMARY_alsa-utils-alsaloop = "ALSA PCM loopback utility"
-SUMMARY_alsa-utils-alsaucm  = "ALSA Use Case Manager"
-
-RRECOMMENDS_alsa-utils-alsactl = "alsa-states"
-
-ALLOW_EMPTY_alsa-utils = "1"
+FILES_${PN}-alsabat = "${bindir}/alsabat"
+FILES_${PN}-alsatplg= "${bindir}/alsatplg"
+FILES_${PN}-aplay   = "${bindir}/aplay ${bindir}/arecord ${bindir}/axfer"
+FILES_${PN}-amixer  = "${bindir}/amixer"
+FILES_${PN}-alsamixer   = "${bindir}/alsamixer"

Re: [OE-core] [PATCH] vim: Rework things so vim adds features not vim-tiny removes

2019-05-18 Thread Tom Rini

On Sat, May 18, 2019 at 08:57:02PM +0200, Martin Jansa wrote:
> Thanks Tom for quick update.
> 
> ALTERNATIVE_TARGET[xxd] = "${bindir}/xxd"
> ALTERNATIVE_LINK_NAME[xxd] = "${bindir}/xxd"
> looks strange, IIRC TARGET and LINK_NAME should always point to different
> filepath, it was added in meta-oe commit:
> 
> commit 897c10b7c17c138a85bdeb36cf72e7201daf0e0e
> Author: Dan McGregor 
> Date:   Thu Oct 18 09:46:27 2018 -0600
> 
> vim: alternatify xxd
> 
> toybox also provides xxd.
> 
> but I wonder what u-a does (or is supposed to do in this scenario). Maybe
> u-a bbclass automatically adds .${BPN} suffix to TARGET and renames the
> installed file?

I'll double check, but also toybox doesn't have anything for xxd today,
so I'll add that into my build and come up with something sane for both
if needed, thanks!

> 
> On Sat, May 18, 2019 at 8:34 PM Tom Rini  wrote:
> 
> > Now that we have a common inc file for both vim and vim-tiny move a few
> > bits of logic out of vim.inc and in to vim_$VER.bb so that vim adds
> > things rather than vim-tiny removes them.
> >
> > Suggested-by: Martin Jansa 
> > Signed-off-by: Tom Rini 
> > ---
> >  meta/recipes-support/vim/vim-tiny_8.1.1240.bb | 3 ---
> >  meta/recipes-support/vim/vim.inc  | 8 +---
> >  meta/recipes-support/vim/vim_8.1.1240.bb  | 9 +
> >  3 files changed, 10 insertions(+), 10 deletions(-)
> >
> > diff --git a/meta/recipes-support/vim/vim-tiny_8.1.1240.bb
> > b/meta/recipes-support/vim/vim-tiny_8.1.1240.bb
> > index 139e626e..e4c26d23f69d 100644
> > --- a/meta/recipes-support/vim/vim-tiny_8.1.1240.bb
> > +++ b/meta/recipes-support/vim/vim-tiny_8.1.1240.bb
> > @@ -2,9 +2,6 @@ require vim.inc
> >
> >  SUMMARY += " (with tiny features)"
> >
> > -PROVIDES_remove = "xxd"
> > -ALTERNATIVE_${PN}_remove = "xxd"
> > -
> >  PACKAGECONFIG += "tiny"
> >
> >  do_install() {
> > diff --git a/meta/recipes-support/vim/vim.inc
> > b/meta/recipes-support/vim/vim.inc
> > index f5c74684bfa7..433f23344826 100644
> > --- a/meta/recipes-support/vim/vim.inc
> > +++ b/meta/recipes-support/vim/vim.inc
> > @@ -1,7 +1,6 @@
> >  SUMMARY = "Vi IMproved - enhanced vi editor"
> >  SECTION = "console/utils"
> >
> > -PROVIDES = "xxd"
> >  DEPENDS = "ncurses gettext-native"
> >  # vimdiff doesn't like busybox diff
> >  RSUGGESTS_${PN} = "diffutils"
> > @@ -52,7 +51,6 @@ PACKAGECONFIG += " \
> >  ${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)} \
> >  ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtkgui', '', d)} \
> >  "
> > -PACKAGECONFIG_class-native = ""
> >
> >  PACKAGECONFIG[gtkgui] = "--enable-gui=gtk2,--enable-gui=no,gtk+,"
> >  PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl,"
> > @@ -130,12 +128,8 @@ RDEPENDS_${BPN} = "ncurses-terminfo-base"
> >  # Recommend that runtime data is installed along with vim
> >  RRECOMMENDS_${BPN} = "${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc
> > ${PN}-common"
> >
> > -ALTERNATIVE_${PN} = "vi vim xxd"
> > +ALTERNATIVE_${PN} = "vi vim"
> >  ALTERNATIVE_PRIORITY = "100"
> >  ALTERNATIVE_TARGET = "${bindir}/${BPN}.${BPN}"
> >  ALTERNATIVE_LINK_NAME[vi] = "${base_bindir}/vi"
> >  ALTERNATIVE_LINK_NAME[vim] = "${bindir}/vim"
> > -ALTERNATIVE_TARGET[xxd] = "${bindir}/xxd"
> > -ALTERNATIVE_LINK_NAME[xxd] = "${bindir}/xxd"
> > -
> > -BBCLASSEXTEND = "native"
> > diff --git a/meta/recipes-support/vim/vim_8.1.1240.bb
> > b/meta/recipes-support/vim/vim_8.1.1240.bb
> > index bcc0b77f..60946a181f42 100644
> > --- a/meta/recipes-support/vim/vim_8.1.1240.bb
> > +++ b/meta/recipes-support/vim/vim_8.1.1240.bb
> > @@ -1 +1,10 @@
> >  require vim.inc
> > +
> > +PROVIDES = "xxd"
> > +
> > +PACKAGECONFIG_class-native = ""
> > +BBCLASSEXTEND = "native"
> > +
> > +ALTERNATIVE_${PN}_append = " xxd"
> > +ALTERNATIVE_TARGET[xxd] = "${bindir}/xxd"
> > +ALTERNATIVE_LINK_NAME[xxd] = "${bindir}/xxd"
> > --
> > 2.7.4
> >
> > --
> > ___
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
> >

> -- 
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core


-- 
Tom


signature.asc
Description: PGP signature
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] vim: Rework things so vim adds features not vim-tiny removes

2019-05-18 Thread Martin Jansa

Thanks Tom for quick update.

ALTERNATIVE_TARGET[xxd] = "${bindir}/xxd"
ALTERNATIVE_LINK_NAME[xxd] = "${bindir}/xxd"
looks strange, IIRC TARGET and LINK_NAME should always point to different
filepath, it was added in meta-oe commit:

commit 897c10b7c17c138a85bdeb36cf72e7201daf0e0e
Author: Dan McGregor 
Date:   Thu Oct 18 09:46:27 2018 -0600

vim: alternatify xxd

toybox also provides xxd.

but I wonder what u-a does (or is supposed to do in this scenario). Maybe
u-a bbclass automatically adds .${BPN} suffix to TARGET and renames the
installed file?

On Sat, May 18, 2019 at 8:34 PM Tom Rini  wrote:

> Now that we have a common inc file for both vim and vim-tiny move a few
> bits of logic out of vim.inc and in to vim_$VER.bb so that vim adds
> things rather than vim-tiny removes them.
>
> Suggested-by: Martin Jansa 
> Signed-off-by: Tom Rini 
> ---
>  meta/recipes-support/vim/vim-tiny_8.1.1240.bb | 3 ---
>  meta/recipes-support/vim/vim.inc  | 8 +---
>  meta/recipes-support/vim/vim_8.1.1240.bb  | 9 +
>  3 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/meta/recipes-support/vim/vim-tiny_8.1.1240.bb
> b/meta/recipes-support/vim/vim-tiny_8.1.1240.bb
> index 139e626e..e4c26d23f69d 100644
> --- a/meta/recipes-support/vim/vim-tiny_8.1.1240.bb
> +++ b/meta/recipes-support/vim/vim-tiny_8.1.1240.bb
> @@ -2,9 +2,6 @@ require vim.inc
>
>  SUMMARY += " (with tiny features)"
>
> -PROVIDES_remove = "xxd"
> -ALTERNATIVE_${PN}_remove = "xxd"
> -
>  PACKAGECONFIG += "tiny"
>
>  do_install() {
> diff --git a/meta/recipes-support/vim/vim.inc
> b/meta/recipes-support/vim/vim.inc
> index f5c74684bfa7..433f23344826 100644
> --- a/meta/recipes-support/vim/vim.inc
> +++ b/meta/recipes-support/vim/vim.inc
> @@ -1,7 +1,6 @@
>  SUMMARY = "Vi IMproved - enhanced vi editor"
>  SECTION = "console/utils"
>
> -PROVIDES = "xxd"
>  DEPENDS = "ncurses gettext-native"
>  # vimdiff doesn't like busybox diff
>  RSUGGESTS_${PN} = "diffutils"
> @@ -52,7 +51,6 @@ PACKAGECONFIG += " \
>  ${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)} \
>  ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtkgui', '', d)} \
>  "
> -PACKAGECONFIG_class-native = ""
>
>  PACKAGECONFIG[gtkgui] = "--enable-gui=gtk2,--enable-gui=no,gtk+,"
>  PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl,"
> @@ -130,12 +128,8 @@ RDEPENDS_${BPN} = "ncurses-terminfo-base"
>  # Recommend that runtime data is installed along with vim
>  RRECOMMENDS_${BPN} = "${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc
> ${PN}-common"
>
> -ALTERNATIVE_${PN} = "vi vim xxd"
> +ALTERNATIVE_${PN} = "vi vim"
>  ALTERNATIVE_PRIORITY = "100"
>  ALTERNATIVE_TARGET = "${bindir}/${BPN}.${BPN}"
>  ALTERNATIVE_LINK_NAME[vi] = "${base_bindir}/vi"
>  ALTERNATIVE_LINK_NAME[vim] = "${bindir}/vim"
> -ALTERNATIVE_TARGET[xxd] = "${bindir}/xxd"
> -ALTERNATIVE_LINK_NAME[xxd] = "${bindir}/xxd"
> -
> -BBCLASSEXTEND = "native"
> diff --git a/meta/recipes-support/vim/vim_8.1.1240.bb
> b/meta/recipes-support/vim/vim_8.1.1240.bb
> index bcc0b77f..60946a181f42 100644
> --- a/meta/recipes-support/vim/vim_8.1.1240.bb
> +++ b/meta/recipes-support/vim/vim_8.1.1240.bb
> @@ -1 +1,10 @@
>  require vim.inc
> +
> +PROVIDES = "xxd"
> +
> +PACKAGECONFIG_class-native = ""
> +BBCLASSEXTEND = "native"
> +
> +ALTERNATIVE_${PN}_append = " xxd"
> +ALTERNATIVE_TARGET[xxd] = "${bindir}/xxd"
> +ALTERNATIVE_LINK_NAME[xxd] = "${bindir}/xxd"
> --
> 2.7.4
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] vim: Rework things so vim adds features not vim-tiny removes

2019-05-18 Thread Tom Rini

Now that we have a common inc file for both vim and vim-tiny move a few
bits of logic out of vim.inc and in to vim_$VER.bb so that vim adds
things rather than vim-tiny removes them.

Suggested-by: Martin Jansa 
Signed-off-by: Tom Rini 
---
 meta/recipes-support/vim/vim-tiny_8.1.1240.bb | 3 ---
 meta/recipes-support/vim/vim.inc  | 8 +---
 meta/recipes-support/vim/vim_8.1.1240.bb  | 9 +
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/meta/recipes-support/vim/vim-tiny_8.1.1240.bb 
b/meta/recipes-support/vim/vim-tiny_8.1.1240.bb
index 139e626e..e4c26d23f69d 100644
--- a/meta/recipes-support/vim/vim-tiny_8.1.1240.bb
+++ b/meta/recipes-support/vim/vim-tiny_8.1.1240.bb
@@ -2,9 +2,6 @@ require vim.inc
 
 SUMMARY += " (with tiny features)"
 
-PROVIDES_remove = "xxd"
-ALTERNATIVE_${PN}_remove = "xxd"
-
 PACKAGECONFIG += "tiny"
 
 do_install() {
diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc
index f5c74684bfa7..433f23344826 100644
--- a/meta/recipes-support/vim/vim.inc
+++ b/meta/recipes-support/vim/vim.inc
@@ -1,7 +1,6 @@
 SUMMARY = "Vi IMproved - enhanced vi editor"
 SECTION = "console/utils"
 
-PROVIDES = "xxd"
 DEPENDS = "ncurses gettext-native"
 # vimdiff doesn't like busybox diff
 RSUGGESTS_${PN} = "diffutils"
@@ -52,7 +51,6 @@ PACKAGECONFIG += " \
 ${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)} \
 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtkgui', '', d)} \
 "
-PACKAGECONFIG_class-native = ""
 
 PACKAGECONFIG[gtkgui] = "--enable-gui=gtk2,--enable-gui=no,gtk+,"
 PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl,"
@@ -130,12 +128,8 @@ RDEPENDS_${BPN} = "ncurses-terminfo-base"
 # Recommend that runtime data is installed along with vim
 RRECOMMENDS_${BPN} = "${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc 
${PN}-common"
 
-ALTERNATIVE_${PN} = "vi vim xxd"
+ALTERNATIVE_${PN} = "vi vim"
 ALTERNATIVE_PRIORITY = "100"
 ALTERNATIVE_TARGET = "${bindir}/${BPN}.${BPN}"
 ALTERNATIVE_LINK_NAME[vi] = "${base_bindir}/vi"
 ALTERNATIVE_LINK_NAME[vim] = "${bindir}/vim"
-ALTERNATIVE_TARGET[xxd] = "${bindir}/xxd"
-ALTERNATIVE_LINK_NAME[xxd] = "${bindir}/xxd"
-
-BBCLASSEXTEND = "native"
diff --git a/meta/recipes-support/vim/vim_8.1.1240.bb 
b/meta/recipes-support/vim/vim_8.1.1240.bb
index bcc0b77f..60946a181f42 100644
--- a/meta/recipes-support/vim/vim_8.1.1240.bb
+++ b/meta/recipes-support/vim/vim_8.1.1240.bb
@@ -1 +1,10 @@
 require vim.inc
+
+PROVIDES = "xxd"
+
+PACKAGECONFIG_class-native = ""
+BBCLASSEXTEND = "native"
+
+ALTERNATIVE_${PN}_append = " xxd"
+ALTERNATIVE_TARGET[xxd] = "${bindir}/xxd"
+ALTERNATIVE_LINK_NAME[xxd] = "${bindir}/xxd"
-- 
2.7.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] socat: Remove workaround for musl issue now fixed upstream

2019-05-18 Thread Adrian Bunk

Signed-off-by: Adrian Bunk 
---
 ...NETDB_INTERNAL-to-1-if-not-available.patch | 32 ---
 .../socat/socat_1.7.3.3.bb|  1 -
 2 files changed, 33 deletions(-)
 delete mode 100644 
meta/recipes-connectivity/socat/socat/0001-define-NETDB_INTERNAL-to-1-if-not-available.patch

diff --git 
a/meta/recipes-connectivity/socat/socat/0001-define-NETDB_INTERNAL-to-1-if-not-available.patch
 
b/meta/recipes-connectivity/socat/socat/0001-define-NETDB_INTERNAL-to-1-if-not-available.patch
deleted file mode 100644
index 4bbd36766d..00
--- 
a/meta/recipes-connectivity/socat/socat/0001-define-NETDB_INTERNAL-to-1-if-not-available.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From e6a7d96fa3675bdd3f4d7a3d7682381789eef22f Mon Sep 17 00:00:00 2001
-From: Khem Raj 
-Date: Mon, 15 Feb 2016 20:25:34 +
-Subject: [PATCH] define NETDB_INTERNAL to -1 if not available
-
-helps build with musl
-
-Signed-off-by: Khem Raj 

-Upstream-Status: Pending
-
- compat.h | 4 
- 1 file changed, 4 insertions(+)
-
-diff --git a/compat.h b/compat.h
-index c8bee4d..bfb013a 100644
 a/compat.h
-+++ b/compat.h
-@@ -666,6 +666,10 @@ typedef int sig_atomic_t;
- #  define NETDB_INTERNAL h_NETDB_INTERNAL
- #endif
- 
-+#if !defined(NETDB_INTERNAL)
-+#  define NETDB_INTERNAL (-1)
-+#endif
-+
- #ifndef INET_ADDRSTRLEN
- #  define INET_ADDRSTRLEN sizeof(struct sockaddr_in)
- #endif
--- 
-2.7.1
-
diff --git a/meta/recipes-connectivity/socat/socat_1.7.3.3.bb 
b/meta/recipes-connectivity/socat/socat_1.7.3.3.bb
index 7a889a3801..067f7c6444 100644
--- a/meta/recipes-connectivity/socat/socat_1.7.3.3.bb
+++ b/meta/recipes-connectivity/socat/socat_1.7.3.3.bb
@@ -12,7 +12,6 @@ LIC_FILES_CHKSUM = 
"file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 
file://README;beginline=257;endline=287;md5=338c05eadd013872abb1d6e198e10a3f"
 
 SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \
-   file://0001-define-NETDB_INTERNAL-to-1-if-not-available.patch \
 "
 
 SRC_URI[md5sum] = "b2a032a47b8b89a18485697fa975154f"
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] nss-myhostname: Stop trying to build for musl

2019-05-18 Thread Adrian Bunk

There's no point in building an NSS module for a C library
that doesn't support NSS.

Signed-off-by: Adrian Bunk 
---
 ...-Check-for-nss.h-presense-before-use.patch | 53 ---
 .../nss-myhostname/nss-myhostname_0.3.bb  |  3 +-
 2 files changed, 2 insertions(+), 54 deletions(-)
 delete mode 100644 
meta/recipes-support/nss-myhostname/nss-myhostname/0001-nss-myhostname-Check-for-nss.h-presense-before-use.patch

diff --git 
a/meta/recipes-support/nss-myhostname/nss-myhostname/0001-nss-myhostname-Check-for-nss.h-presense-before-use.patch
 
b/meta/recipes-support/nss-myhostname/nss-myhostname/0001-nss-myhostname-Check-for-nss.h-presense-before-use.patch
deleted file mode 100644
index 82f25743af..00
--- 
a/meta/recipes-support/nss-myhostname/nss-myhostname/0001-nss-myhostname-Check-for-nss.h-presense-before-use.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From d1345871b992f9a055c968963967e728da1a7ffb Mon Sep 17 00:00:00 2001
-From: Khem Raj 
-Date: Sat, 30 Jan 2016 20:29:06 +
-Subject: [PATCH] nss-myhostname: Check for nss.h presense before use
-
-We do not have nss.h on musl e.g. and configury is already checking for
-nss.h presence, use this to define needed data structures if nss.h is
-missing on a given libc implementation on a platform
-
-include stdint.h for uint32_h definition
-
-Signed-off-by: Khem Raj 

-Upstream-Status: Pending
-
- nss-myhostname.c | 20 
- 1 file changed, 20 insertions(+)
-
-diff --git a/nss-myhostname.c b/nss-myhostname.c
-index 293166c..6f287f5 100644
 a/nss-myhostname.c
-+++ b/nss-myhostname.c
-@@ -21,7 +21,27 @@
- ***/
- 
- #include 
-+#include 
-+#ifdef HAVE_NSS_H
- #include 
-+#else
-+enum nss_status {
-+NSS_STATUS_TRYAGAIN = -2,
-+NSS_STATUS_UNAVAIL,
-+NSS_STATUS_NOTFOUND,
-+NSS_STATUS_SUCCESS,
-+NSS_STATUS_RETURN
-+};
-+/* Data structure used for the 'gethostbyname4_r' function.  */
-+struct gaih_addrtuple
-+  {
-+struct gaih_addrtuple *next;
-+char *name;
-+int family;
-+uint32_t addr[4];
-+uint32_t scopeid;
-+  };
-+#endif
- #include 
- #include 
- #include 
--- 
-2.7.0
-
diff --git a/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb 
b/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb
index de5b7cf598..244d9e204e 100644
--- a/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb
+++ b/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb
@@ -7,7 +7,6 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1"
 
 SRC_URI = 
"http://0pointer.de/lennart/projects/nss-myhostname/nss-myhostname-${PV}.tar.gz 
\
-   
file://0001-nss-myhostname-Check-for-nss.h-presense-before-use.patch \
"
 
 SRC_URI[md5sum] = "d4ab9ac36c053ab8fb836db1cbd4a48f"
@@ -15,6 +14,8 @@ SRC_URI[sha256sum] = 
"2ba744ea8d578d1c57c85884e94a3042ee17843a5294434d3a7f6c4d67
 
 inherit autotools distro_features_check
 
+COMPATIBLE_HOST_libc-musl = 'null'
+
 # The systemd has its own copy of nss-myhostname
 CONFLICT_DISTRO_FEATURES = "systemd"
 
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] libnss-mdns: Stop trying to build for musl

2019-05-18 Thread Adrian Bunk

There's no point in building an NSS module for a C library
that doesn't support NSS.

Signed-off-by: Adrian Bunk 
---
 .../libnss-mdns/0001-check-for-nss.h.patch| 56 ---
 .../libnss-mdns/libnss-mdns_0.10.bb   |  3 +-
 2 files changed, 2 insertions(+), 57 deletions(-)
 delete mode 100644 
meta/recipes-connectivity/libnss-mdns/libnss-mdns/0001-check-for-nss.h.patch

diff --git 
a/meta/recipes-connectivity/libnss-mdns/libnss-mdns/0001-check-for-nss.h.patch 
b/meta/recipes-connectivity/libnss-mdns/libnss-mdns/0001-check-for-nss.h.patch
deleted file mode 100644
index f63eb90cdc..00
--- 
a/meta/recipes-connectivity/libnss-mdns/libnss-mdns/0001-check-for-nss.h.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From bdf01a581d58eb5340e9238d143dbcac9db5b11c Mon Sep 17 00:00:00 2001
-From: Khem Raj 
-Date: Sat, 30 Jan 2016 19:29:45 +
-Subject: [PATCH] check for nss.h
-
-nss.h may not available on all libc implementations, e.g. musl does not
-have this header, this patch detects nss.h presence and defines the data
-types that are required if nss.h is missing on platform
-
-Signed-off-by: Khem Raj 

-Upstream-Status: Pending
-
- configure.ac |  2 +-
- src/nss.c| 11 +++
- 2 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index aa66bc6..ce19b07 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -71,7 +71,7 @@ AC_PROG_LIBTOOL
- 
- # Checks for header files.
- AC_HEADER_STDC
--AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h netdb.h netinet/in.h 
stdlib.h string.h sys/socket.h sys/time.h unistd.h nss.h sys/ioctl.h])
-+AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h netdb.h netinet/in.h 
stdlib.h string.h sys/socket.h sys/time.h unistd.h nss.h sys/ioctl.h nss.h])
- 
- # Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
-diff --git a/src/nss.c b/src/nss.c
-index e48e315..406733b 100644
 a/src/nss.c
-+++ b/src/nss.c
-@@ -29,7 +29,18 @@
- #include 
- #include 
- #include 
-+#ifdef HAVE_NSS_H
- #include 
-+#else
-+enum nss_status {
-+NSS_STATUS_TRYAGAIN = -2,
-+NSS_STATUS_UNAVAIL,
-+NSS_STATUS_NOTFOUND,
-+NSS_STATUS_SUCCESS,
-+NSS_STATUS_RETURN
-+};
-+#endif
-+
- #include 
- #include 
- 
--- 
-2.7.0
-
diff --git a/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb 
b/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb
index d0eb2768d1..953505971a 100644
--- a/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb
+++ b/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb
@@ -9,7 +9,6 @@ DEPENDS = "avahi"
 PR = "r7"
 
 SRC_URI = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${PV}.tar.gz \
-   file://0001-check-for-nss.h.patch \
"
 
 SRC_URI[md5sum] = "03938f17646efbb50aa70ba5f99f51d7"
@@ -21,6 +20,8 @@ localstatedir = "/"
 
 inherit autotools
 
+COMPATIBLE_HOST_libc-musl = 'null'
+
 EXTRA_OECONF = "--libdir=${base_libdir} --disable-lynx --enable-avahi"
 
 # suppress warning, but don't bother with autonamer
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] python-numpy: Avoid installing copy of f2py script

2019-05-18 Thread Alejandro Enedino Hernandez Samaniego

Both python-numpy and python3-numpy try to install the file:

${D}/${bindir}/f2py

which causes an error during do_rootfs since the package manager complains 
about that.

The numpy packages create basically copies of f2py script with the following 
names:
f2py (on both)
f2py2 (on python 2)
f2py2.7 (on python 2)
f2py3 (on python 3)
f2py3.7 (on python 3)

Remove the copy of f2py from python-numpy in favor of using the one from python3
to avoid installation issues at do_rootfs().

Signed-off-by: Alejandro Enedino Hernandez Samaniego 
---
 meta/recipes-devtools/python-numpy/python-numpy_1.16.3.bb | 4 
 1 file changed, 4 insertions(+)

diff --git a/meta/recipes-devtools/python-numpy/python-numpy_1.16.3.bb 
b/meta/recipes-devtools/python-numpy/python-numpy_1.16.3.bb
index 5013789..a1133da 100644
--- a/meta/recipes-devtools/python-numpy/python-numpy_1.16.3.bb
+++ b/meta/recipes-devtools/python-numpy/python-numpy_1.16.3.bb
@@ -4,3 +4,7 @@ require python-numpy.inc
 RDEPENDS_${PN}_class-target_append = " \
 ${PYTHON_PN}-subprocess \
 "
+
+do_install_append(){
+rm ${D}/${bindir}/f2py
+}
-- 
2.7.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] vim: split the common part into vim.inc

2019-05-18 Thread Alexander Kanavin

There is no hard rule here, maybe a follow up is simpler.

Alex

> On 18 May 2019, at 13.35, Tom Rini  wrote:
> 
>> On Fri, May 17, 2019 at 04:34:14PM +0200, Alexander Kanavin wrote:
>> 
>> This is up to the recipe maintainer (Tom) to do; I only want to ensure
>> AUH does not choke on the recipe.
> 
> What's proper etiquette here?  Shall I grab, v2 and include Martin's
> suggestions, or follow-up and Suggested-by them?  Thanks!
> 
>> 
>> Alex
>> 
>>> On Fri, 17 May 2019 at 16:29, Martin Jansa  wrote:
>>> 
>>> Actually the BBCLASSEXTEND = "native" as well, as we don't need both vim 
>>> recipes to provide xxd-native.
>>> 
 On Fri, May 17, 2019 at 4:27 PM Martin Jansa  
 wrote:
 
 To simplify meta/recipes-support/vim/vim-tiny_8.1.1240.bb which currently 
 has:
 
 PROVIDES_remove = "xxd"
 ALTERNATIVE_${PN}_remove = "xxd"
 
 Can you move xxd from the .inc file and put it only in vim_8.1.1240.bb?
 
 
> On Fri, May 17, 2019 at 3:53 PM Alexander Kanavin 
>  wrote:
> 
> Previously vim-tiny would include the vim recipe wholesale;
> this meant that they had to be upgraded in a single transaction
> which devtool cannot cope with. This thwarted the latest AUH
> run in particular.
> 
> Signed-off-by: Alexander Kanavin 
> ---
> meta/recipes-support/vim/vim-tiny_8.1.1240.bb |   2 +-
> meta/recipes-support/vim/vim.inc  | 141 +
> meta/recipes-support/vim/vim_8.1.1240.bb  | 142 +-
> 3 files changed, 143 insertions(+), 142 deletions(-)
> create mode 100644 meta/recipes-support/vim/vim.inc
> 
> diff --git a/meta/recipes-support/vim/vim-tiny_8.1.1240.bb 
> b/meta/recipes-support/vim/vim-tiny_8.1.1240.bb
> index 74464833adb..139e626e444 100644
> --- a/meta/recipes-support/vim/vim-tiny_8.1.1240.bb
> +++ b/meta/recipes-support/vim/vim-tiny_8.1.1240.bb
> @@ -1,4 +1,4 @@
> -require vim_${PV}.bb
> +require vim.inc
> 
> SUMMARY += " (with tiny features)"
> 
> diff --git a/meta/recipes-support/vim/vim.inc 
> b/meta/recipes-support/vim/vim.inc
> new file mode 100644
> index 000..f5c74684bfa
> --- /dev/null
> +++ b/meta/recipes-support/vim/vim.inc
> @@ -0,0 +1,141 @@
> +SUMMARY = "Vi IMproved - enhanced vi editor"
> +SECTION = "console/utils"
> +
> +PROVIDES = "xxd"
> +DEPENDS = "ncurses gettext-native"
> +# vimdiff doesn't like busybox diff
> +RSUGGESTS_${PN} = "diffutils"
> +LICENSE = "vim"
> +LIC_FILES_CHKSUM = 
> "file://runtime/doc/uganda.txt;endline=287;md5=f1f82b42360005c70b8c19b0ef493f72"
> +
> +SRC_URI = "git://github.com/vim/vim.git \
> +   file://disable_acl_header_check.patch \
> +   file://vim-add-knob-whether-elf.h-are-checked.patch \
> +   file://0001-src-Makefile-improve-reproducibility.patch \
> +"
> +SRCREV = "d96dbd6f95ea22f609042cc9c6272f14a21ff1a5"
> +
> +S = "${WORKDIR}/git"
> +
> +VIMDIR = 
> "vim${@d.getVar('PV').split('.')[0]}${@d.getVar('PV').split('.')[1]}"
> +
> +inherit autotools-brokensep update-alternatives
> +
> +CLEANBROKEN = "1"
> +
> +# vim configure.in contains functions which got 'dropped' by 
> autotools.bbclass
> +do_configure () {
> +cd src
> +rm -f auto/*
> +touch auto/config.mk
> +aclocal
> +autoconf
> +cd ..
> +oe_runconf
> +touch src/auto/configure
> +touch src/auto/config.mk src/auto/config.h
> +}
> +
> +do_compile() {
> +# We do not support fully / correctly the following locales.  
> Attempting
> +# to use these with msgfmt in order to update the ".desktop" files 
> exposes
> +# this problem and leads to the compile failing.
> +for LOCALE in cs fr ko pl sk zh_CN zh_TW;do
> +echo -n > src/po/${LOCALE}.po
> +done
> +autotools_do_compile
> +}
> +
> +#Available PACKAGECONFIG options are gtkgui, acl, x11, tiny
> +PACKAGECONFIG ??= ""
> +PACKAGECONFIG += " \
> +${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)} \
> +${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtkgui', '', d)} 
> \
> +"
> +PACKAGECONFIG_class-native = ""
> +
> +PACKAGECONFIG[gtkgui] = "--enable-gui=gtk2,--enable-gui=no,gtk+,"
> +PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl,"
> +PACKAGECONFIG[x11] = "--with-x,--without-x,xt,"
> +PACKAGECONFIG[tiny] = "--with-features=tiny,--with-features=big,,"
> +PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,"
> +PACKAGECONFIG[elfutils] = "--enable-elf-check,,elfutils,"
> +
> +EXTRA_OECONF = " \
> +--disable-gpm \
> +--disable-gtktest \
> +--disable-xim \
> +--disable-netbeans \
> +--with-tlib=ncurses

Re: [OE-core] [PATCH v2] insane: add sanity checks to SRC_URI

2019-05-18 Thread Adrian Bunk

On Fri, May 17, 2019 at 04:37:43PM -0700, Ross Burton wrote:
> The SRC_URI almost definitely shouldn't be using ${PN}, and GitHub */archive/*
> tarballs are dynamically generated so the checksums will change over time.
>...

It might be worth mentioning that this is for archive, not releases.

GitHub release tarballs are stable, and they are preferable to commit ids.

cu
Adrian

-- 

   "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

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] vim: split the common part into vim.inc

2019-05-18 Thread Tom Rini

On Fri, May 17, 2019 at 04:34:14PM +0200, Alexander Kanavin wrote:

> This is up to the recipe maintainer (Tom) to do; I only want to ensure
> AUH does not choke on the recipe.

What's proper etiquette here?  Shall I grab, v2 and include Martin's
suggestions, or follow-up and Suggested-by them?  Thanks!

> 
> Alex
> 
> On Fri, 17 May 2019 at 16:29, Martin Jansa  wrote:
> >
> > Actually the BBCLASSEXTEND = "native" as well, as we don't need both vim 
> > recipes to provide xxd-native.
> >
> > On Fri, May 17, 2019 at 4:27 PM Martin Jansa  wrote:
> >>
> >> To simplify meta/recipes-support/vim/vim-tiny_8.1.1240.bb which currently 
> >> has:
> >>
> >> PROVIDES_remove = "xxd"
> >> ALTERNATIVE_${PN}_remove = "xxd"
> >>
> >> Can you move xxd from the .inc file and put it only in vim_8.1.1240.bb?
> >>
> >>
> >> On Fri, May 17, 2019 at 3:53 PM Alexander Kanavin  
> >> wrote:
> >>>
> >>> Previously vim-tiny would include the vim recipe wholesale;
> >>> this meant that they had to be upgraded in a single transaction
> >>> which devtool cannot cope with. This thwarted the latest AUH
> >>> run in particular.
> >>>
> >>> Signed-off-by: Alexander Kanavin 
> >>> ---
> >>>  meta/recipes-support/vim/vim-tiny_8.1.1240.bb |   2 +-
> >>>  meta/recipes-support/vim/vim.inc  | 141 +
> >>>  meta/recipes-support/vim/vim_8.1.1240.bb  | 142 +-
> >>>  3 files changed, 143 insertions(+), 142 deletions(-)
> >>>  create mode 100644 meta/recipes-support/vim/vim.inc
> >>>
> >>> diff --git a/meta/recipes-support/vim/vim-tiny_8.1.1240.bb 
> >>> b/meta/recipes-support/vim/vim-tiny_8.1.1240.bb
> >>> index 74464833adb..139e626e444 100644
> >>> --- a/meta/recipes-support/vim/vim-tiny_8.1.1240.bb
> >>> +++ b/meta/recipes-support/vim/vim-tiny_8.1.1240.bb
> >>> @@ -1,4 +1,4 @@
> >>> -require vim_${PV}.bb
> >>> +require vim.inc
> >>>
> >>>  SUMMARY += " (with tiny features)"
> >>>
> >>> diff --git a/meta/recipes-support/vim/vim.inc 
> >>> b/meta/recipes-support/vim/vim.inc
> >>> new file mode 100644
> >>> index 000..f5c74684bfa
> >>> --- /dev/null
> >>> +++ b/meta/recipes-support/vim/vim.inc
> >>> @@ -0,0 +1,141 @@
> >>> +SUMMARY = "Vi IMproved - enhanced vi editor"
> >>> +SECTION = "console/utils"
> >>> +
> >>> +PROVIDES = "xxd"
> >>> +DEPENDS = "ncurses gettext-native"
> >>> +# vimdiff doesn't like busybox diff
> >>> +RSUGGESTS_${PN} = "diffutils"
> >>> +LICENSE = "vim"
> >>> +LIC_FILES_CHKSUM = 
> >>> "file://runtime/doc/uganda.txt;endline=287;md5=f1f82b42360005c70b8c19b0ef493f72"
> >>> +
> >>> +SRC_URI = "git://github.com/vim/vim.git \
> >>> +   file://disable_acl_header_check.patch \
> >>> +   file://vim-add-knob-whether-elf.h-are-checked.patch \
> >>> +   file://0001-src-Makefile-improve-reproducibility.patch \
> >>> +"
> >>> +SRCREV = "d96dbd6f95ea22f609042cc9c6272f14a21ff1a5"
> >>> +
> >>> +S = "${WORKDIR}/git"
> >>> +
> >>> +VIMDIR = 
> >>> "vim${@d.getVar('PV').split('.')[0]}${@d.getVar('PV').split('.')[1]}"
> >>> +
> >>> +inherit autotools-brokensep update-alternatives
> >>> +
> >>> +CLEANBROKEN = "1"
> >>> +
> >>> +# vim configure.in contains functions which got 'dropped' by 
> >>> autotools.bbclass
> >>> +do_configure () {
> >>> +cd src
> >>> +rm -f auto/*
> >>> +touch auto/config.mk
> >>> +aclocal
> >>> +autoconf
> >>> +cd ..
> >>> +oe_runconf
> >>> +touch src/auto/configure
> >>> +touch src/auto/config.mk src/auto/config.h
> >>> +}
> >>> +
> >>> +do_compile() {
> >>> +# We do not support fully / correctly the following locales.  
> >>> Attempting
> >>> +# to use these with msgfmt in order to update the ".desktop" files 
> >>> exposes
> >>> +# this problem and leads to the compile failing.
> >>> +for LOCALE in cs fr ko pl sk zh_CN zh_TW;do
> >>> +echo -n > src/po/${LOCALE}.po
> >>> +done
> >>> +autotools_do_compile
> >>> +}
> >>> +
> >>> +#Available PACKAGECONFIG options are gtkgui, acl, x11, tiny
> >>> +PACKAGECONFIG ??= ""
> >>> +PACKAGECONFIG += " \
> >>> +${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)} \
> >>> +${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtkgui', '', d)} 
> >>> \
> >>> +"
> >>> +PACKAGECONFIG_class-native = ""
> >>> +
> >>> +PACKAGECONFIG[gtkgui] = "--enable-gui=gtk2,--enable-gui=no,gtk+,"
> >>> +PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl,"
> >>> +PACKAGECONFIG[x11] = "--with-x,--without-x,xt,"
> >>> +PACKAGECONFIG[tiny] = "--with-features=tiny,--with-features=big,,"
> >>> +PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,"
> >>> +PACKAGECONFIG[elfutils] = "--enable-elf-check,,elfutils,"
> >>> +
> >>> +EXTRA_OECONF = " \
> >>> +--disable-gpm \
> >>> +--disable-gtktest \
> >>> +--disable-xim \
> >>> +--disable-netbeans \
> >>> +--with-tlib=ncurses \
> >>> +ac_cv_small_wchar_t=no \
> >>> +vim_cv_getcwd_broken=no \
> >>> +vim_cv_memmove_handles_overlap=yes \
> >>> +

[OE-core] [PATCH] python-numpy: Avoid installing copy of f2py script

2019-05-18 Thread Alejandro Enedino Hernandez Samaniego

Both python-numpy and python3-numpy try to install the file:

${D}/${bindir}/f2py

which causes an error during do_rootfs since the package manager complains 
about that.

The numpy packages create basically copies of f2py script with the following 
names:
f2py (on both)
f2py2 (on python 2)
f2py2.7 (on python 2)
f2py3 (on python 3)
f2py3.7 (on python 3)

Remove the copy of f2py from python-numpy in favor of using the one from python3
to avoid installation issues at do_rootfs().

Signed-off-by: Alejandro Enedino Hernandez Samaniego 
---
 meta/recipes-devtools/python-numpy/python-numpy_1.16.3.bb | 4 
 1 file changed, 4 insertions(+)

diff --git a/meta/recipes-devtools/python-numpy/python-numpy_1.16.3.bb 
b/meta/recipes-devtools/python-numpy/python-numpy_1.16.3.bb
index 5013789..a1133da 100644
--- a/meta/recipes-devtools/python-numpy/python-numpy_1.16.3.bb
+++ b/meta/recipes-devtools/python-numpy/python-numpy_1.16.3.bb
@@ -4,3 +4,7 @@ require python-numpy.inc
 RDEPENDS_${PN}_class-target_append = " \
 ${PYTHON_PN}-subprocess \
 "
+
+do_install_append(){
+rm ${D}/${bindir}/f2py
+}
-- 
2.7.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] icu: Remove workaround for musl issue fixed upstream 2 years ago

2019-05-18 Thread Adrian Bunk

Signed-off-by: Adrian Bunk 
---
 meta/recipes-support/icu/icu.inc | 7 ---
 1 file changed, 7 deletions(-)

diff --git a/meta/recipes-support/icu/icu.inc b/meta/recipes-support/icu/icu.inc
index e20085fbf5..6d9728903d 100644
--- a/meta/recipes-support/icu/icu.inc
+++ b/meta/recipes-support/icu/icu.inc
@@ -35,13 +35,6 @@ TARGET_CXXFLAGS_append = 
"${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', '
 
 ASNEEDED = ""
 
-# strtod_l() is not supported by musl; also xlocale.h is missing
-# It is not possible to disable its use via configure switches or env vars
-# so monkey patching is needed.
-do_configure_prepend_libc-musl () {
-sed -i -e 's,DU_HAVE_STRTOD_L=1,DU_HAVE_STRTOD_L=0,' ${S}/configure.ac
-}
-
 do_compile_prepend_class-target () {
# Make sure certain build host references do not end up being compiled
# in the image. This only affects libicutu and icu-dbg
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 33/37] gst-examples: upgrade to latest revision

2019-05-18 Thread Alexander Kanavin

On Fri, 17 May 2019 at 23:43, Adrian Bunk  wrote:
> > -SRCREV = "2b3fc175c252cd5a537e4b2864b572a8372473d6"
> > +SRCREV = "3f51023aca06d28ccfb1d5383d99ca7fbfb287c8"
> >  PV = "0.0.1+git${SRCPV}"
> >  UPSTREAM_CHECK_COMMITS = "1"
>
> Upstream git contains a tagged 1.16.0 release.

Right, this is the first time they tagged a release. Then discard this
patch; gst-examples should be updated together with the rest of
gstreamer from now on. UPSTREAM_CHECK_COMMITS should be dropped.

Alex
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] systemd: Some upstreamable musl patches have been upstreamed

2019-05-18 Thread Adrian Bunk

Signed-off-by: Adrian Bunk 
---
 ...cy-ULONG_LONG_MAX-with-the-C99-ULLON.patch | 50 +++
 ...udev-event.c-must-include-sys-wait.h.patch | 35 +
 ...G_LONG_MAX-definition-in-case-of-mus.patch | 27 --
 ...-sys-wait.h-to-avoid-compile-failure.patch | 33 
 .../0023-socket-util.h-include-string.h.patch | 20 
 ...s-utilh-add-missing-sys-stat-include.patch | 16 +++---
 meta/recipes-core/systemd/systemd_242.bb  |  4 +-
 7 files changed, 105 insertions(+), 80 deletions(-)
 create mode 100644 
meta/recipes-core/systemd/systemd/0001-Replace-the-legacy-ULONG_LONG_MAX-with-the-C99-ULLON.patch
 create mode 100644 
meta/recipes-core/systemd/systemd/0001-src-udev-udev-event.c-must-include-sys-wait.h.patch
 delete mode 100644 
meta/recipes-core/systemd/systemd/0012-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch
 delete mode 100644 
meta/recipes-core/systemd/systemd/0022-include-sys-wait.h-to-avoid-compile-failure.patch

diff --git 
a/meta/recipes-core/systemd/systemd/0001-Replace-the-legacy-ULONG_LONG_MAX-with-the-C99-ULLON.patch
 
b/meta/recipes-core/systemd/systemd/0001-Replace-the-legacy-ULONG_LONG_MAX-with-the-C99-ULLON.patch
new file mode 100644
index 00..6f192a2ad2
--- /dev/null
+++ 
b/meta/recipes-core/systemd/systemd/0001-Replace-the-legacy-ULONG_LONG_MAX-with-the-C99-ULLON.patch
@@ -0,0 +1,50 @@
+From f491dfdc88ddbba36a24a75b2063aff027461b83 Mon Sep 17 00:00:00 2001
+From: Adrian Bunk 
+Date: Thu, 16 May 2019 22:20:07 +0300
+Subject: Replace the legacy ULONG_LONG_MAX with the C99 ULLONG_MAX
+
+Upstream-Status: Backport
+Signed-off-by: Adrian Bunk 
+---
+ src/journal-remote/journal-remote-main.c | 4 ++--
+ src/shutdown/shutdown.c  | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/journal-remote/journal-remote-main.c 
b/src/journal-remote/journal-remote-main.c
+index 2321a91e7b..d32c51c3ce 100644
+--- a/src/journal-remote/journal-remote-main.c
 b/src/journal-remote/journal-remote-main.c
+@@ -528,7 +528,7 @@ static int dispatch_http_event(sd_event_source *event,
+void *userdata) {
+ MHDDaemonWrapper *d = userdata;
+ int r;
+-MHD_UNSIGNED_LONG_LONG timeout = ULONG_LONG_MAX;
++MHD_UNSIGNED_LONG_LONG timeout = ULLONG_MAX;
+ 
+ assert(d);
+ 
+@@ -538,7 +538,7 @@ static int dispatch_http_event(sd_event_source *event,
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+"MHD_run failed!");
+ if (MHD_get_timeout(d->daemon, ) == MHD_NO)
+-timeout = ULONG_LONG_MAX;
++timeout = ULLONG_MAX;
+ 
+ r = sd_event_source_set_time(d->timer_event, timeout);
+ if (r < 0) {
+diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c
+index 35b2c2aa46..9623fe9ea2 100644
+--- a/src/shutdown/shutdown.c
 b/src/shutdown/shutdown.c
+@@ -212,7 +212,7 @@ static int sync_making_progress(unsigned long long 
*prev_dirty) {
+ }
+ 
+ static void sync_with_progress(void) {
+-unsigned long long dirty = ULONG_LONG_MAX;
++unsigned long long dirty = ULLONG_MAX;
+ unsigned checks;
+ pid_t pid;
+ int r;
+-- 
+2.20.1
+
diff --git 
a/meta/recipes-core/systemd/systemd/0001-src-udev-udev-event.c-must-include-sys-wait.h.patch
 
b/meta/recipes-core/systemd/systemd/0001-src-udev-udev-event.c-must-include-sys-wait.h.patch
new file mode 100644
index 00..565deba1d0
--- /dev/null
+++ 
b/meta/recipes-core/systemd/systemd/0001-src-udev-udev-event.c-must-include-sys-wait.h.patch
@@ -0,0 +1,35 @@
+From 010f917cf222d2c7205584056fe0e4c581a2e1b1 Mon Sep 17 00:00:00 2001
+From: Adrian Bunk 
+Date: Thu, 16 May 2019 22:09:46 +0300
+Subject: src/udev/udev-event.c must #include 
+
+Fixes the following build failure with musl:
+../git/src/udev/udev-event.c: In function 'spawn_wait':
+../git/src/udev/udev-event.c:600:53: error: 'WEXITED' undeclared (first use in 
this function); did you mean 'WIFEXITED'?
+ r = sd_event_add_child(e, NULL, spawn->pid, WEXITED, 
on_spawn_sigchld, spawn);
+ ^~~
+
+This looks like a bug in udev-event.c that could also have broken
+the compilation after some future glibc header reshuffle.
+
+Upstream-Status: Backport
+Signed-off-by: Adrian Bunk 
+---
+ src/udev/udev-event.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
+index cab1b5ac0c..a0a7ac0f9e 100644
+--- a/src/udev/udev-event.c
 b/src/udev/udev-event.c
+@@ -7,6 +7,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ 
+ #include "sd-event.h"
+-- 
+2.20.1
+
diff --git 
a/meta/recipes-core/systemd/systemd/0012-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch
 
b/meta/recipes-core/systemd/systemd/0012-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch
deleted file mode 100644
index

Re: [OE-core] [PATCH] python-numpy: Avoid installing copy of f2py script

Re: [OE-core] [PATCH] gdb: Upgrade from 8.2.1 to 8.3

Re: [OE-core] [PATCH] systemd: Some upstreamable musl patches have been upstreamed

[OE-core] [PATCH] virglrenderer: fix compiling failure with `-fvisibility=default'

Re: [OE-core] [PATCH] nss-myhostname: Stop trying to build for musl

Re: [OE-core] [PATCH] libnss-mdns: Stop trying to build for musl

Re: [OE-core] [PATCH 31/37] bash-completion: upgrade 2.8 -> 2.9

Re: [OE-core] [PATCH 11/37] go: update 1.12.1->1.12.5

Re: [OE-core] [PATCH] vim: Rework things so vim adds features not vim-tiny removes

[OE-core] [PATCH V2 1/2] u-boot: clean up some redundant code

[OE-core] [PATCH V2 0/2] meta: drop IMAGE_FSTYPES from UBOOT_CONFIG

[OE-core] [PATCH V2 2/2] meta: drop IMAGE_FSTYPES from UBOOT_CONFIG

[OE-core] [PATCH] alsa-utils: replace hard-coded alsa-utils with PN

Re: [OE-core] [PATCH] vim: Rework things so vim adds features not vim-tiny removes

Re: [OE-core] [PATCH] vim: Rework things so vim adds features not vim-tiny removes

[OE-core] [PATCH] vim: Rework things so vim adds features not vim-tiny removes

[OE-core] [PATCH] socat: Remove workaround for musl issue now fixed upstream

[OE-core] [PATCH] nss-myhostname: Stop trying to build for musl

[OE-core] [PATCH] libnss-mdns: Stop trying to build for musl

[OE-core] [PATCH] python-numpy: Avoid installing copy of f2py script

Re: [OE-core] [PATCH] vim: split the common part into vim.inc

Re: [OE-core] [PATCH v2] insane: add sanity checks to SRC_URI

Re: [OE-core] [PATCH] vim: split the common part into vim.inc

[OE-core] [PATCH] python-numpy: Avoid installing copy of f2py script

[OE-core] [PATCH] icu: Remove workaround for musl issue fixed upstream 2 years ago

Re: [OE-core] [PATCH 33/37] gst-examples: upgrade to latest revision

[OE-core] [PATCH] systemd: Some upstreamable musl patches have been upstreamed

27 matches

Site Navigation

Mail list logo

Footer information