From c66a1d17f9a7a1170e95e7cff5856ee6c6f695c2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 30 Jun 2011 01:07:15 -0700 Subject: uclibc: Fix bug exposed by udev 168+ for mips architecture newer udev uses sgnalfd + epoll and this exposed a bug in uclibc for mips where SFD_NONBLOCK should be defined with 0200 for mips but was using 04000. This would cause random segfaults in udev during boot process Tested on qemumips/angstrom console-image since angstrom uses udev 171. It worked well when we did not use meta-oe layer because udev in oe-core will then be used which is at version 164. (From OE-Core rev: a318b3c319ab34f661b3f41855374adba5b10394) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...fd.h-SFD_NONBLOCK-for-mips-is-0200-unlike.patch | 33 ++++++++++++++++++++++ meta/recipes-core/uclibc/uclibc_git.bb | 3 +- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/uclibc/uclibc-git/0001-mips-signalfd.h-SFD_NONBLOCK-for-mips-is-0200-unlike.patch (limited to 'meta') diff --git a/meta/recipes-core/uclibc/uclibc-git/0001-mips-signalfd.h-SFD_NONBLOCK-for-mips-is-0200-unlike.patch b/meta/recipes-core/uclibc/uclibc-git/0001-mips-signalfd.h-SFD_NONBLOCK-for-mips-is-0200-unlike.patch new file mode 100644 index 0000000000..6892ceb922 --- /dev/null +++ b/meta/recipes-core/uclibc/uclibc-git/0001-mips-signalfd.h-SFD_NONBLOCK-for-mips-is-0200-unlike.patch @@ -0,0 +1,33 @@ +From ecc7d34cbbaf83aae87b091555650ed33e27ed2e Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 30 Jun 2011 00:32:11 -0700 +Subject: [PATCH] mips/signalfd.h: SFD_NONBLOCK for mips is 0200 unlike 04000 commonly + +Signed-off-by: Khem Raj +--- + include/sys/signalfd.h | 9 +++++++++ + 1 files changed, 9 insertions(+), 0 deletions(-) + +diff --git a/include/sys/signalfd.h b/include/sys/signalfd.h +index 8cee17c..f1cb63a 100644 +--- a/include/sys/signalfd.h ++++ b/include/sys/signalfd.h +@@ -64,6 +64,15 @@ enum + # define SFD_NONBLOCK SFD_NONBLOCK + }; + ++#elif defined __mips__ ++enum ++ { ++ SFD_CLOEXEC = 02000000, ++# define SFD_CLOEXEC SFD_CLOEXEC ++ SFD_NONBLOCK = 0200 ++# define SFD_NONBLOCK SFD_NONBLOCK ++ }; ++ + #else + enum + { +-- +1.7.0.4 + diff --git a/meta/recipes-core/uclibc/uclibc_git.bb b/meta/recipes-core/uclibc/uclibc_git.bb index 201ec93f19..0e43f9e669 100644 --- a/meta/recipes-core/uclibc/uclibc_git.bb +++ b/meta/recipes-core/uclibc/uclibc_git.bb @@ -2,7 +2,7 @@ SRCREV="71d63ed75648da9b0b71afabb9c60aaad792c55c" require uclibc.inc PV = "0.9.31+0.9.32rc3" -PR = "${INC_PR}.4" +PR = "${INC_PR}.5" PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc" FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-git' ], d)}" @@ -30,5 +30,6 @@ SRC_URI = "git://uclibc.org/uClibc.git;branch=master;protocol=git \ file://orign_path.patch \ file://rtld_no.patch \ file://0001-Config.in.arch-Free-UCLIBC_HAS_FPU-setting-from-depe.patch \ + file://0001-mips-signalfd.h-SFD_NONBLOCK-for-mips-is-0200-unlike.patch \ " S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf