merged. I have a runc update queued, but I can drop this when I push that update.
Cheers, Bruce On Thu, Jun 16, 2016 at 3:06 PM, Paul Barker <[email protected]> wrote: > Signed-off-by: Paul Barker <[email protected]> > --- > .../0001-nsexec-fix-build-against-musl-libc.patch | 48 > ++++++++++++++++++++++ > recipes-containers/runc/runc_git.bb | 1 + > 2 files changed, 49 insertions(+) > create mode 100644 > recipes-containers/runc/runc/0001-nsexec-fix-build-against-musl-libc.patch > > diff --git > a/recipes-containers/runc/runc/0001-nsexec-fix-build-against-musl-libc.patch > b/recipes-containers/runc/runc/0001-nsexec-fix-build-against-musl-libc.patch > new file mode 100644 > index 0000000..aa57636 > --- /dev/null > +++ > b/recipes-containers/runc/runc/0001-nsexec-fix-build-against-musl-libc.patch > @@ -0,0 +1,48 @@ > +From ac6bd953192fa6752a07be7501f69f7cffe33e8e Mon Sep 17 00:00:00 2001 > +From: Natanael Copa <[email protected]> > +Date: Tue, 19 Apr 2016 10:43:00 +0200 > +Subject: [PATCH] nsexec: fix build against musl libc > + > +Remove a wrongly added include which was added in commit 3c2e77ee (Add a > +compatibility header for CentOS/RHEL 6, 2016-01-29) apparently to > +fix this compile error on centos 6: > + > +> In file included from > +> Godeps/_workspace/src/ > github.com/opencontainers/runc/libcontainer/nsenter/nsexec.c:20: > +> /usr/include/linux/netlink.h:35: error: expected > specifier-qualifier-list before 'sa_family_t' > + > +The glibc bits/sockaddr.h says that this header should never be included > +directly[1]. Instead, sys/socket.h should be used. > + > +The problem was correctly fixed later, in commit 394fb55 (Fix build > +error on centos6, 2016-03-02) so the incorrect bits/sockaddr.h can > +safely be removed. > + > +This is needed to build musl libc. > + > +Fixes #761 > + > +[1]: > https://github.molgen.mpg.de/git-mirror/glibc/blob/20003c49884422da7ffbc459cdeee768a6fee07b/bits/sockaddr.h#L20 > + > +Signed-off-by: Natanael Copa <[email protected]> > +Signed-off-by: Paul Barker <[email protected]> > +Upstream-status: Backport > +--- > + libcontainer/nsenter/nsexec.c | 1 - > + 1 file changed, 1 deletion(-) > + > +diff --git a/libcontainer/nsenter/nsexec.c b/libcontainer/nsenter/nsexec.c > +index 8f37d6c..40a8f89 100644 > +--- a/libcontainer/nsenter/nsexec.c > ++++ b/libcontainer/nsenter/nsexec.c > +@@ -18,7 +18,6 @@ > + #include <unistd.h> > + #include <grp.h> > + > +-#include <bits/sockaddr.h> > + #include <linux/types.h> > + > + // All arguments should be above the stack because it grows down > +-- > +2.1.4 > + > diff --git a/recipes-containers/runc/runc_git.bb > b/recipes-containers/runc/runc_git.bb > index 30a4640..b47914e 100644 > --- a/recipes-containers/runc/runc_git.bb > +++ b/recipes-containers/runc/runc_git.bb > @@ -7,6 +7,7 @@ DESCRIPTION = "runc is a CLI tool for spawning and running > containers according > SRCREV = "baf6536d6259209c3edfa2b22237af82942d3dfa" > SRC_URI = "\ > git://github.com/opencontainers/runc;branch=master \ > + file://0001-nsexec-fix-build-against-musl-libc.patch \ > " > > # Apache-2.0 for containerd > -- > 2.1.4 > > -- > _______________________________________________ > meta-virtualization mailing list > [email protected] > https://lists.yoctoproject.org/listinfo/meta-virtualization > -- "Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"
-- _______________________________________________ meta-virtualization mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-virtualization
