[meta-oe][PATCH 1/2] nss: Remove mcpu to avoid march conflicts

[meta-oe][PATCH 1/2] nss: Remove mcpu to avoid march conflicts

[Khem Raj]

Some files are compiled with armv8-a+crypto and when using cortex-a55
the deduced march is armv8.2-a which then conflicts

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-oe/recipes-support/nss/nss_3.51.1.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta-oe/recipes-support/nss/nss_3.51.1.bb b/meta-oe/recipes-support/nss/nss_3.51.1.bb
index fba80ce2ab..36e6cd8fc5 100644
--- a/meta-oe/recipes-support/nss/nss_3.51.1.bb
+++ b/meta-oe/recipes-support/nss/nss_3.51.1.bb
@@ -47,6 +47,10 @@ inherit siteinfo
 TD = "${S}/tentative-dist"
 TDS = "${S}/tentative-dist-staging"
 
+# cortex-a55 is ARMv8.2-a based but libatomic explicitly asks for -march=armv8.1-a
+# which caused -march conflicts in gcc
+TUNE_CCARGS_remove = "-mcpu=cortex-a55+crc -mcpu=cortex-a55 -mcpu=cortex-a55+crc+crypto"
+
 TARGET_CC_ARCH += "${LDFLAGS}"
 
 do_configure_prepend_libc-musl () {
-- 
2.26.2

[meta-oe][PATCH 2/2] rasdaemon: Include limits.h

[Khem Raj]

Fixes a build problem found with musl

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Beniamin Sandu <beniaminsandu@gmail.com>
---
 .../0001-Fix-system-header-includes.patch     | 44 +++++++++++++++++++
 .../rasdaemon/rasdaemon_0.6.5.bb              |  1 +
 2 files changed, 45 insertions(+)
 create mode 100644 meta-oe/recipes-support/rasdaemon/files/0001-Fix-system-header-includes.patch

diff --git a/meta-oe/recipes-support/rasdaemon/files/0001-Fix-system-header-includes.patch b/meta-oe/recipes-support/rasdaemon/files/0001-Fix-system-header-includes.patch
new file mode 100644
index 0000000000..0164321312
--- /dev/null
+++ b/meta-oe/recipes-support/rasdaemon/files/0001-Fix-system-header-includes.patch
@@ -0,0 +1,44 @@
+From 18786db1ad03716267927d983c83275469a1478a Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 8 May 2020 12:27:19 -0700
+Subject: [PATCH] Fix system header includes
+
+Use poll.h instead of sys/poll.h
+Fixes
+warning: #warning redirecting incorrect #include <sys/poll.h> to <poll.h> [-Wcpp]
+
+Include limits.h for PATH_MAX
+
+Fixes
+ras-events.c:359:16: error: 'PATH_MAX' undeclared (first use in this function)
+  359 |  char pipe_raw[PATH_MAX];
+      |                ^~~~~~~~
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ ras-events.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/ras-events.c b/ras-events.c
+index 511c93d..400e740 100644
+--- a/ras-events.c
++++ b/ras-events.c
+@@ -18,13 +18,14 @@
+ #include <dirent.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#include <limits.h>
++#include <poll.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+-#include <sys/poll.h>
+ #include <signal.h>
+ #include <sys/signalfd.h>
+ #include "libtrace/kbuffer.h"
+-- 
+2.26.2
+
diff --git a/meta-oe/recipes-support/rasdaemon/rasdaemon_0.6.5.bb b/meta-oe/recipes-support/rasdaemon/rasdaemon_0.6.5.bb
index 33b0d17d65..93f624882d 100644
--- a/meta-oe/recipes-support/rasdaemon/rasdaemon_0.6.5.bb
+++ b/meta-oe/recipes-support/rasdaemon/rasdaemon_0.6.5.bb
@@ -4,6 +4,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d3070efe0afa3dc41608bd82c00bb0dc"
 
 SRC_URI = "git://git.infradead.org/users/mchehab/rasdaemon.git;branch=master \
+        file://0001-Fix-system-header-includes.patch \
 	file://rasdaemon.service \
 	file://init"
 
-- 
2.26.2