Mirror of git.yoctoproject.org/poky https://git.enea.com/cgit/linux/poky.git/atom?h=honister 2018-03-08T18:39:32+00:00 2018-03-08T18:39:32+00:00 Bruce Ashfield bruce.ashfield@windriver.com 2018-03-06T18:11:10+00:00 urn:sha1:240c3db54d426d901b5b4c63ce36d1da68f2080f While we don't normally follow all the -stable updates for libc-headers, there was one userspace header that was broken in the 4.15 cycle, and it has now been fixed in -stable. The offending header breaks the build for several packages, so we update to pick up this change: Author: Hauke Mehrtens <hauke@hauke-m.de> Date: Mon Feb 12 23:59:51 2018 +0100 uapi/if_ether.h: move __UAPI_DEF_ETHHDR libc define commit da360299b6734135a5f66d7db458dcc7801c826a upstream. This fixes a compile problem of some user space applications by not including linux/libc-compat.h in uapi/if_ether.h. linux/libc-compat.h checks which "features" the header files, included from the libc, provide to make the Linux kernel uapi header files only provide no conflicting structures and enums. If a user application mixes kernel headers and libc headers it could happen that linux/libc-compat.h gets included too early where not all other libc headers are included yet. Then the linux/libc-compat.h would not prevent all the redefinitions and we run into compile problems. This patch removes the include of linux/libc-compat.h from uapi/if_ether.h to fix the recently introduced case, but not all as this is more or less impossible. It is no problem to do the check directly in the if_ether.h file and not in libc-compat.h as this does not need any fancy glibc header detection as glibc never provided struct ethhdr and should define __UAPI_DEF_ETHHDR by them self when they will provide this. The following test program did not compile correctly any more: #include <linux/if_ether.h> #include <netinet/in.h> #include <linux/in.h> int main(void) { return 0; } Fixes: 6926e041a892 ("uapi/if_ether.h: prevent redefinition of struct ethhdr") Reported-by: Guillaume Nault <g.nault@alphalink.fr> Cc: <stable@vger.kernel.org> # 4.15 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> We also add a new muslc patch to adjust the ethhdr change in the uapi. As is suggested in the kernel commit, we can protect musl directly in if_ether itself. (From OE-Core rev: 1718a2dbabd05e51717b17327d531948faa64659) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> 2018-02-15T11:23:10+00:00 Bruce Ashfield bruce.ashfield@windriver.com 2018-02-06T16:21:54+00:00 urn:sha1:9c3b84d5ee86b4eaeff9821e720069130310b143 (From OE-Core rev: ef96628d850f1154c7e59bca418ef3a7c9a2bcc1) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>