| Submitter | Matthew McClintock |
|---|---|
| Date | Aug. 24, 2012, 6:16 p.m. |
| Message ID | <1345832197-3648-1-git-send-email-msm@freescale.com> |
| Download | mbox | patch |
| Permalink | /patch/35325/ |
| State | Accepted |
| Commit | edcb57fe308979cc5b92359d064e32bb70d4ad76 |
| Headers | show |
Comments
On 08/24/2012 11:16 AM, Matthew McClintock wrote: > kmod will fail to build with the following error because O_CLOEXEC is > not defined: > > | libkmod/libkmod-module.c: In function 'kmod_module_get_initstate': > | libkmod/libkmod-module.c:1640: error: 'O_CLOEXEC' undeclared (first use in this function) > | libkmod/libkmod-module.c:1640: error: (Each undeclared identifier is reported only once > | libkmod/libkmod-module.c:1640: error: for each function it appears in.) > | libkmod/libkmod-module.c: In function 'kmod_module_get_refcnt': > | libkmod/libkmod-module.c:1754: error: 'O_CLOEXEC' undeclared (first use in this function) > | libkmod/libkmod-module.c: In function 'kmod_module_get_sections': > | libkmod/libkmod-module.c:1913: error: 'O_CLOEXEC' undeclared (first use in this function) > | libkmod/libkmod-file.c: In function 'kmod_file_open': > | libkmod/libkmod-file.c:282: error: 'O_CLOEXEC' undeclared (first use in this function) > | libkmod/libkmod-file.c:282: error: (Each undeclared identifier is reported only once > | libkmod/libkmod-file.c:282: error: for each function it appears in.) > > Since we are only using kmod-native for depmod, and it's a non-threaded > user of this libary being built this should be safe to override O_CLOEXEC. > > Keep in mind this is ONLY effecting the native builds and not what is > being shipped in the root file system. > > Signed-off-by: Matthew McClintock <msm@freescale.com> > --- > v2: use patch instead of munging CFLAGS > > meta/recipes-kernel/kmod/kmod-native_git.bb | 3 ++- > .../kmod/kmod/fix-undefined-O_CLOEXEC.patch | 17 +++++++++++++++++ > 2 files changed, 19 insertions(+), 1 deletion(-) > create mode 100644 meta/recipes-kernel/kmod/kmod/fix-undefined-O_CLOEXEC.patch > > diff --git a/meta/recipes-kernel/kmod/kmod-native_git.bb b/meta/recipes-kernel/kmod/kmod-native_git.bb > index 96de8b8..8cbcdf8 100644 > --- a/meta/recipes-kernel/kmod/kmod-native_git.bb > +++ b/meta/recipes-kernel/kmod/kmod-native_git.bb > @@ -4,7 +4,8 @@ > require kmod.inc > inherit native > > -PR = "${INC_PR}.0" > +PR = "${INC_PR}.1" > +SRC_URI += "file://fix-undefined-O_CLOEXEC.patch" > > do_install_append (){ > for tool in depmod insmod lsmod modinfo modprobe rmmod > diff --git a/meta/recipes-kernel/kmod/kmod/fix-undefined-O_CLOEXEC.patch b/meta/recipes-kernel/kmod/kmod/fix-undefined-O_CLOEXEC.patch > new file mode 100644 > index 0000000..3177e9a > --- /dev/null > +++ b/meta/recipes-kernel/kmod/kmod/fix-undefined-O_CLOEXEC.patch > @@ -0,0 +1,17 @@ > +Upstream-Status: Not applicable > + > +Index: git/libkmod/libkmod-private.h > +=================================================================== > +--- git.orig/libkmod/libkmod-private.h > ++++ git/libkmod/libkmod-private.h > +@@ -1,6 +1,10 @@ > + #ifndef _LIBKMOD_PRIVATE_H_ > + #define _LIBKMOD_PRIVATE_H_ > + > ++#ifndef O_CLOEXEC > ++# define O_CLOEXEC 0 > ++#endif > ++ > + #include <stdbool.h> > + #include <stdio.h> > + #include <syslog.h> > Merged into OE-Core Thanks Sau!
Patch
diff --git a/meta/recipes-kernel/kmod/kmod-native_git.bb b/meta/recipes-kernel/kmod/kmod-native_git.bb index 96de8b8..8cbcdf8 100644 --- a/meta/recipes-kernel/kmod/kmod-native_git.bb +++ b/meta/recipes-kernel/kmod/kmod-native_git.bb @@ -4,7 +4,8 @@ require kmod.inc inherit native -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" +SRC_URI += "file://fix-undefined-O_CLOEXEC.patch" do_install_append (){ for tool in depmod insmod lsmod modinfo modprobe rmmod diff --git a/meta/recipes-kernel/kmod/kmod/fix-undefined-O_CLOEXEC.patch b/meta/recipes-kernel/kmod/kmod/fix-undefined-O_CLOEXEC.patch new file mode 100644 index 0000000..3177e9a --- /dev/null +++ b/meta/recipes-kernel/kmod/kmod/fix-undefined-O_CLOEXEC.patch @@ -0,0 +1,17 @@ +Upstream-Status: Not applicable + +Index: git/libkmod/libkmod-private.h +=================================================================== +--- git.orig/libkmod/libkmod-private.h ++++ git/libkmod/libkmod-private.h +@@ -1,6 +1,10 @@ + #ifndef _LIBKMOD_PRIVATE_H_ + #define _LIBKMOD_PRIVATE_H_ + ++#ifndef O_CLOEXEC ++# define O_CLOEXEC 0 ++#endif ++ + #include <stdbool.h> + #include <stdio.h> + #include <syslog.h>
kmod will fail to build with the following error because O_CLOEXEC is not defined: | libkmod/libkmod-module.c: In function 'kmod_module_get_initstate': | libkmod/libkmod-module.c:1640: error: 'O_CLOEXEC' undeclared (first use in this function) | libkmod/libkmod-module.c:1640: error: (Each undeclared identifier is reported only once | libkmod/libkmod-module.c:1640: error: for each function it appears in.) | libkmod/libkmod-module.c: In function 'kmod_module_get_refcnt': | libkmod/libkmod-module.c:1754: error: 'O_CLOEXEC' undeclared (first use in this function) | libkmod/libkmod-module.c: In function 'kmod_module_get_sections': | libkmod/libkmod-module.c:1913: error: 'O_CLOEXEC' undeclared (first use in this function) | libkmod/libkmod-file.c: In function 'kmod_file_open': | libkmod/libkmod-file.c:282: error: 'O_CLOEXEC' undeclared (first use in this function) | libkmod/libkmod-file.c:282: error: (Each undeclared identifier is reported only once | libkmod/libkmod-file.c:282: error: for each function it appears in.) Since we are only using kmod-native for depmod, and it's a non-threaded user of this libary being built this should be safe to override O_CLOEXEC. Keep in mind this is ONLY effecting the native builds and not what is being shipped in the root file system. Signed-off-by: Matthew McClintock <msm@freescale.com> --- v2: use patch instead of munging CFLAGS meta/recipes-kernel/kmod/kmod-native_git.bb | 3 ++- .../kmod/kmod/fix-undefined-O_CLOEXEC.patch | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-kernel/kmod/kmod/fix-undefined-O_CLOEXEC.patch