Sorry. Please ignore this patch. I will send V2. //Yi On 8/3/21 12:57 PM, Yi Zhao wrote: > Backport a patch to fix the compile error and refresh the patches to fix > the patch-fuzz warning. > > Fixes: > tmp/work/core2-64-poky-linux/audit/2.8.5-r0/recipe-sysroot-native/usr/bin/x86_64-poky-linux/../../libexec/x86_64-poky-linux/gcc/x86_64-poky-linux/11.1.1/ld: > ausearch-checkpt.o:/usr/src/debug/audit/2.8.5-r0/build/src/../../git/src/ausearch-common.h:53: multiple definition of `event_node_list'; > ausearch.o:/usr/src/debug/audit/2.8.5-r0/build/src/../../git/src/ausearch-common.h:53: first defined here > > Signed-off-by: Yi Zhao > --- > ...ue-functions-for-strndupa-rawmemchr.patch} | 6 +- > ...-Fixed-swig-host-contamination-issue.patch | 57 +++++++++++++++++++ > ...ns-need-to-be-external-when-building.patch | 30 ++++++++++ > meta-oe/recipes-security/audit/audit_2.8.5.bb | 9 +-- > 4 files changed, 95 insertions(+), 7 deletions(-) > rename meta-oe/recipes-security/audit/audit/{Add-substitue-functions-for-strndupa-rawmemchr.patch => 0001-Add-substitue-functions-for-strndupa-rawmemchr.patch} (97%) > create mode 100644 meta-oe/recipes-security/audit/audit/0002-Fixed-swig-host-contamination-issue.patch > create mode 100644 meta-oe/recipes-security/audit/audit/0003-Header-definitions-need-to-be-external-when-building.patch > > diff --git a/meta-oe/recipes-security/audit/audit/Add-substitue-functions-for-strndupa-rawmemchr.patch b/meta-oe/recipes-security/audit/audit/0001-Add-substitue-functions-for-strndupa-rawmemchr.patch > similarity index 97% > rename from meta-oe/recipes-security/audit/audit/Add-substitue-functions-for-strndupa-rawmemchr.patch > rename to meta-oe/recipes-security/audit/audit/0001-Add-substitue-functions-for-strndupa-rawmemchr.patch > index bb6c61e80..ed1c0e2b5 100644 > --- a/meta-oe/recipes-security/audit/audit/Add-substitue-functions-for-strndupa-rawmemchr.patch > +++ b/meta-oe/recipes-security/audit/audit/0001-Add-substitue-functions-for-strndupa-rawmemchr.patch > @@ -1,4 +1,4 @@ > -From bdcdc3dff4469aac88e718bd15958d5ed4b9392a Mon Sep 17 00:00:00 2001 > +From d5a4b800a696b8b8d2c0f0bad098b1a8ff94333f Mon Sep 17 00:00:00 2001 > From: Steve Grubb > Date: Tue, 26 Feb 2019 18:33:33 -0500 > Subject: [PATCH] Add substitue functions for strndupa & rawmemchr > @@ -68,7 +68,7 @@ index 51c4a5e..67b7b77 100644 > break; > *ptr = ' '; > diff --git a/configure.ac b/configure.ac > -index 54bdbf1..aef07fb 100644 > +index 6e345f1..6f3007e 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -1,7 +1,7 @@ > @@ -129,5 +129,5 @@ index 5d17a72..758c33e 100644 > * This function will look at the line and pick out pieces of it. > */ > -- > -2.7.4 > +2.17.1 > > diff --git a/meta-oe/recipes-security/audit/audit/0002-Fixed-swig-host-contamination-issue.patch b/meta-oe/recipes-security/audit/audit/0002-Fixed-swig-host-contamination-issue.patch > new file mode 100644 > index 000000000..4a1b97997 > --- /dev/null > +++ b/meta-oe/recipes-security/audit/audit/0002-Fixed-swig-host-contamination-issue.patch > @@ -0,0 +1,57 @@ > +From 3467abce1f3cfc96f9bdace7c09d95218cbcaeb1 Mon Sep 17 00:00:00 2001 > +From: Li xin > +Date: Sun, 19 Jul 2015 02:42:58 +0900 > +Subject: [PATCH] audit: Fixed swig host contamination issue > + > +The audit build uses swig to generate a python wrapper. > +Unfortunately, the swig info file references host include > +directories. Some of these were previously noticed and > +eliminated, but the one fixed here was not. > + > +Upstream-Status: Inappropriate [embedded specific] > + > +Signed-off-by: Anders Hedlund > +Signed-off-by: Joe Slater > +Signed-off-by: Yi Zhao > +--- > + bindings/swig/python3/Makefile.am | 3 ++- > + bindings/swig/src/auditswig.i | 2 +- > + 2 files changed, 3 insertions(+), 2 deletions(-) > + > +diff --git a/bindings/swig/python3/Makefile.am b/bindings/swig/python3/Makefile.am > +index 9938418..fa46aac 100644 > +--- a/bindings/swig/python3/Makefile.am > ++++ b/bindings/swig/python3/Makefile.am > +@@ -22,6 +22,7 @@ > + CONFIG_CLEAN_FILES = *.loT *.rej *.orig > + AM_CFLAGS = -fPIC -DPIC -fno-strict-aliasing $(PYTHON3_CFLAGS) > + AM_CPPFLAGS = -I. -I$(top_builddir) -I${top_srcdir}/lib $(PYTHON3_INCLUDES) > ++STDINC ?= /usr/include > + LIBS = $(top_builddir)/lib/libaudit.la > + SWIG_FLAGS = -python -py3 -modern > + SWIG_INCLUDES = -I. -I$(top_builddir) -I${top_srcdir}/lib $(PYTHON3_INCLUDES) > +@@ -37,7 +38,7 @@ _audit_la_DEPENDENCIES =${top_srcdir}/lib/libaudit.h ${top_builddir}/lib/libaudi > + _audit_la_LIBADD = ${top_builddir}/lib/libaudit.la > + nodist__audit_la_SOURCES = audit_wrap.c > + audit.py audit_wrap.c: ${srcdir}/../src/auditswig.i > +- swig -o audit_wrap.c ${SWIG_FLAGS} ${SWIG_INCLUDES} ${srcdir}/../src/auditswig.i > ++ swig -o audit_wrap.c ${SWIG_FLAGS} ${SWIG_INCLUDES} -I$(STDINC) ${srcdir}/../src/auditswig.i > + > + CLEANFILES = audit.py* audit_wrap.c *~ > + > +diff --git a/bindings/swig/src/auditswig.i b/bindings/swig/src/auditswig.i > +index 7ebb373..424fb68 100644 > +--- a/bindings/swig/src/auditswig.i > ++++ b/bindings/swig/src/auditswig.i > +@@ -39,7 +39,7 @@ signed > + #define __attribute(X) /*nothing*/ > + typedef unsigned __u32; > + typedef unsigned uid_t; > +-%include "/usr/include/linux/audit.h" > ++%include "linux/audit.h" > + #define __extension__ /*nothing*/ > + #include > + %include "../lib/libaudit.h" > +-- > +2.17.1 > + > diff --git a/meta-oe/recipes-security/audit/audit/0003-Header-definitions-need-to-be-external-when-building.patch b/meta-oe/recipes-security/audit/audit/0003-Header-definitions-need-to-be-external-when-building.patch > new file mode 100644 > index 000000000..f209e560b > --- /dev/null > +++ b/meta-oe/recipes-security/audit/audit/0003-Header-definitions-need-to-be-external-when-building.patch > @@ -0,0 +1,30 @@ > +From 2938f46d318df4a09565db837b60bafd0300f858 Mon Sep 17 00:00:00 2001 > +From: Steve Grubb > +Date: Fri, 10 Jan 2020 21:13:50 -0500 > +Subject: [PATCH] Header definitions need to be external when building with > + -fno-common (which is default in GCC 10) - Tony Jones > + > +Upstream-Status: Backport > +[https://github.com/linux-audit/audit-userspace/commit/017e6c6ab95df55f34e339d2139def83e5dada1f] > + > +Signed-off-by: Alex Kiernan > +--- > + src/ausearch-common.h | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/src/ausearch-common.h b/src/ausearch-common.h > +index 6669203..3040547 100644 > +--- a/src/ausearch-common.h > ++++ b/src/ausearch-common.h > +@@ -50,7 +50,7 @@ extern pid_t event_pid; > + extern int event_exact_match; > + extern uid_t event_uid, event_euid, event_loginuid; > + extern const char *event_tuid, *event_teuid, *event_tauid; > +-slist *event_node_list; > ++extern slist *event_node_list; > + extern const char *event_comm; > + extern const char *event_filename; > + extern const char *event_hostname; > +-- > +2.17.1 > + > diff --git a/meta-oe/recipes-security/audit/audit_2.8.5.bb b/meta-oe/recipes-security/audit/audit_2.8.5.bb > index ee3b3b5e0..ec04a0444 100644 > --- a/meta-oe/recipes-security/audit/audit_2.8.5.bb > +++ b/meta-oe/recipes-security/audit/audit_2.8.5.bb > @@ -8,8 +8,9 @@ LICENSE = "GPLv2+ & LGPLv2+" > LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" > > SRC_URI = "git://github.com/linux-audit/${BPN}-userspace.git;branch=2.8_maintenance \ > - file://Add-substitue-functions-for-strndupa-rawmemchr.patch \ > - file://Fixed-swig-host-contamination-issue.patch \ > + file://0001-Add-substitue-functions-for-strndupa-rawmemchr.patch \ > + file://0002-Fixed-swig-host-contamination-issue.patch \ > + file://0003-Header-definitions-need-to-be-external-when-building.patch \ > file://auditd \ > file://auditd.service \ > file://audit-volatile.conf \ > @@ -39,9 +40,9 @@ EXTRA_OECONF += "--without-prelude \ > --without-python \ > --without-golang \ > --disable-zos-remote \ > + --with-arm=yes \ > + --with-aarch64=yes \ > " > -EXTRA_OECONF_append_arm = " --with-arm=yes" > -EXTRA_OECONF_append_aarch64 = " --with-aarch64=yes" > > EXTRA_OEMAKE += "PYLIBVER='python${PYTHON_BASEVERSION}' \ > PYINC='${STAGING_INCDIR}/$(PYLIBVER)' \ > > >