mirror of
git://git.yoctoproject.org/poky
synced 2026-05-12 11:01:04 +00:00
240c3db54d
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>
14 lines
577 B
BlitzBasic
14 lines
577 B
BlitzBasic
require linux-libc-headers.inc
|
|
|
|
SRC_URI_append_libc-musl = "\
|
|
file://0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch \
|
|
file://0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch \
|
|
file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \
|
|
file://0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch \
|
|
file://0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch \
|
|
"
|
|
|
|
|
|
SRC_URI[md5sum] = "8186ce63c489199b58b6a58ad2a24a94"
|
|
SRC_URI[sha256sum] = "cd44df4b23a3e0edc14be63df95d768b9600b31c35be05fb89f93226907fc8c6"
|