On Fri, Sep 23, 2016 at 05:58:53PM +0200, [email protected] wrote: > From: Ming Liu <[email protected]> > > - struct timeval is defined in sys/time.h with a musl libc. > - include fcntl.h without the conditional checking.
Please rebase,retest and resend if needed with newer version as well: OE @ ~/meta-openembedded $ pwam 132237 2016-09-26 08:35:27 URL:https://patchwork.openembedded.org/patch/132237/mbox/ [3351] -> "pw-am-132237.patch" [1] Applying: rsyslog: fix building with musl libc .git/rebase-apply/patch:40: trailing whitespace. .git/rebase-apply/patch:69: trailing whitespace. .git/rebase-apply/patch:71: trailing whitespace. .git/rebase-apply/patch:72: trailing whitespace. -- .git/rebase-apply/patch:74: new blank line at EOF. + error: meta-oe/recipes-extended/rsyslog/rsyslog_7.6.1.bb: does not exist in index Patch failed at 0001 rsyslog: fix building with musl libc The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". OE @ ~/meta-openembedded $ git log --pretty=fuller meta-oe/recipes-extended/rsyslog/ commit b2d3dacc5e56de23195a98929cb21e5abf1e2812 Author: Wenzong Fan <[email protected]> AuthorDate: Tue Sep 20 01:57:25 2016 -0400 Commit: Martin Jansa <[email protected]> CommitDate: Mon Sep 26 08:29:13 2016 +0200 rsyslog: upgrade to 7.6.7 > > Signed-off-by: Ming Liu <[email protected]> > --- > .../rsyslog/rsyslog/fix_build_with_musl.patch | 62 > ++++++++++++++++++++++ > meta-oe/recipes-extended/rsyslog/rsyslog_7.6.1.bb | 2 + > 2 files changed, 64 insertions(+) > create mode 100644 > meta-oe/recipes-extended/rsyslog/rsyslog/fix_build_with_musl.patch > > diff --git > a/meta-oe/recipes-extended/rsyslog/rsyslog/fix_build_with_musl.patch > b/meta-oe/recipes-extended/rsyslog/rsyslog/fix_build_with_musl.patch > new file mode 100644 > index 0000000..206ef97 > --- /dev/null > +++ b/meta-oe/recipes-extended/rsyslog/rsyslog/fix_build_with_musl.patch > @@ -0,0 +1,62 @@ > +From 51464a1c3522d738f340bef05ed7c68123b66aa5 Mon Sep 17 00:00:00 2001 > +From: Peter Liu <[email protected]> > +Date: Fri, 23 Sep 2016 17:35:42 +0200 > +Subject: [PATCH] fix building with musl libc > + > +- struct timeval is defined in sys/time.h with a musl libc. > +- include fcntl.h without the conditional checking. > + > +Upstream-Status: Pending > + > +Signed-off-by: Peter Liu <[email protected]> > +--- > + tests/msleep.c | 2 +- > + tools/omfile.c | 4 +--- > + tools/pidfile.c | 2 -- > + 3 files changed, 2 insertions(+), 6 deletions(-) > + > +diff --git a/tests/msleep.c b/tests/msleep.c > +index 36fa01b..ca818be 100644 > +--- a/tests/msleep.c > ++++ b/tests/msleep.c > +@@ -26,7 +26,7 @@ > + #include "config.h" > + #include <stdio.h> > + #include <stdlib.h> > +-#include <time.h> > ++#include <sys/time.h> > + > + int main(int argc, char *argv[]) > + { > +diff --git a/tools/omfile.c b/tools/omfile.c > +index 3335067..c20a015 100644 > +--- a/tools/omfile.c > ++++ b/tools/omfile.c > +@@ -48,9 +48,7 @@ > + #include <libgen.h> > + #include <unistd.h> > + #include <sys/file.h> > +-#ifdef OS_SOLARIS > +-# include <fcntl.h> > +-#endif > ++#include <fcntl.h> > + #ifdef HAVE_ATOMIC_BUILTINS > + # include <pthread.h> > + #endif > +diff --git a/tools/pidfile.c b/tools/pidfile.c > +index 8298b94..188cca4 100644 > +--- a/tools/pidfile.c > ++++ b/tools/pidfile.c > +@@ -36,9 +36,7 @@ > + #include <string.h> > + #include <errno.h> > + #include <signal.h> > +-#ifdef __sun > + #include <fcntl.h> > +-#endif > + > + #include "srUtils.h" > + > +-- > +1.9.1 > + > diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_7.6.1.bb > b/meta-oe/recipes-extended/rsyslog/rsyslog_7.6.1.bb > index c1d923c..48c1056 100644 > --- a/meta-oe/recipes-extended/rsyslog/rsyslog_7.6.1.bb > +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_7.6.1.bb > @@ -30,6 +30,8 @@ SRC_URI = > "http://www.rsyslog.com/download/files/download/rsyslog/${BPN}-${PV}.t > file://enable_tls_ptests.patch \ > " > > +SRC_URI_append_libc-musl = " file://fix_build_with_musl.patch" > + > SRC_URI[md5sum] = "093c462a5245012bd9e7b82dd8aedffb" > SRC_URI[sha256sum] = > "357f089d866c351d5fe5b7139fa85b010223d77b3c21f29b2a1baa8688926111" > > -- > 1.9.1 > > -- > _______________________________________________ > Openembedded-devel mailing list > [email protected] > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- Martin 'JaMa' Jansa jabber: [email protected]
signature.asc
Description: Digital signature
-- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
