diff options
author | Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> | 2015-02-09 13:58:28 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-14 08:41:00 +0000 |
commit | e34a65f6d54214c8a891c37f57271cee86685e35 (patch) | |
tree | ff4f1edbb46b716b6ea114d3b8895dd9c6dc851b /meta | |
parent | ae977c5efc2b5bde466962e29ad58755a6ba7b55 (diff) | |
download | poky-e34a65f6d54214c8a891c37f57271cee86685e35.tar.gz |
cryptodev-module: Fix build on kernel v3.19
Kernel commit f938612dd97d481b8b5bf960c992ae577f081c17 removes the get_unused_fd_macro().
This patch replaces the macro with its output.
| NOTE: make -j 8 KERNEL_DIR=/home/ricardo/curro/qtec/qt5022/build-qt5022-cesium/build/tmp/sysroots/qt5022/usr/src/kernel PREFIX=/home/ricardo/curro/qtec/qt5022/build-qt5022-cesium/build/tmp/work/qt5022-poky-linux/cryptodev-module/1.6-r0/image KERNEL_PATH=/home/ricardo/curro/qtec/qt5022/build-qt5022-cesium/build/tmp/sysroots/qt5022/usr/src/kernel KERNEL_SRC=/home/ricardo/curro/qtec/qt5022/build-qt5022-cesium/build/tmp/sysroots/qt5022/usr/src/kernel KERNEL_VERSION=3.19.0-qtec-standard CC=x86_64-poky-linux-gcc LD=x86_64-poky-linux-ld.bfd AR=x86_64-poky-linux-ar
| make -C /home/ricardo/curro/qtec/qt5022/build-qt5022-cesium/build/tmp/sysroots/qt5022/usr/src/kernel SUBDIRS=`pwd` modules
| make[1]: warning: jobserver unavailable: using -j1. Add '+' to parent make rule.
| make[1]: Entering directory '/home/ricardo/curro/qtec/qt5022/build-qt5022-cesium/build/tmp/sysroots/qt5022/usr/src/kernel'
| CC [M] /home/ricardo/curro/qtec/qt5022/build-qt5022-cesium/build/tmp/work/qt5022-poky-linux/cryptodev-module/1.6-r0/cryptodev-linux-1.6/ioctl.o
| /home/ricardo/curro/qtec/qt5022/build-qt5022-cesium/build/tmp/work/qt5022-poky-linux/cryptodev-module/1.6-r0/cryptodev-linux-1.6/ioctl.c: In function 'clonefd':
| /home/ricardo/curro/qtec/qt5022/build-qt5022-cesium/build/tmp/work/qt5022-poky-linux/cryptodev-module/1.6-r0/cryptodev-linux-1.6/ioctl.c:532:2: error: implicit declaration of function 'get_unused_fd' [-Werror=implicit-function-declaration]
| ret = get_unused_fd();
| ^
(From OE-Core rev: 83643dc4edb9c7656726302b92fb22d1c8652dac)
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-kernel/cryptodev/cryptodev-module_1.6.bb | 1 | ||||
-rw-r--r-- | meta/recipes-kernel/cryptodev/files/0001-ioctl.c-Fix-build-on-3.19.patch | 29 |
2 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-kernel/cryptodev/cryptodev-module_1.6.bb b/meta/recipes-kernel/cryptodev/cryptodev-module_1.6.bb index df50e5a1c6..e6b10257f0 100644 --- a/meta/recipes-kernel/cryptodev/cryptodev-module_1.6.bb +++ b/meta/recipes-kernel/cryptodev/cryptodev-module_1.6.bb | |||
@@ -10,6 +10,7 @@ DEPENDS += "cryptodev-linux" | |||
10 | SRC_URI += " \ | 10 | SRC_URI += " \ |
11 | file://0001-Disable-installing-header-file-provided-by-another-p.patch \ | 11 | file://0001-Disable-installing-header-file-provided-by-another-p.patch \ |
12 | file://0002-In-the-3.13-rc1-Linux-kernel-the-INIT_COMPLETION-mac.patch \ | 12 | file://0002-In-the-3.13-rc1-Linux-kernel-the-INIT_COMPLETION-mac.patch \ |
13 | file://0001-ioctl.c-Fix-build-on-3.19.patch \ | ||
13 | " | 14 | " |
14 | 15 | ||
15 | EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"' | 16 | EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"' |
diff --git a/meta/recipes-kernel/cryptodev/files/0001-ioctl.c-Fix-build-on-3.19.patch b/meta/recipes-kernel/cryptodev/files/0001-ioctl.c-Fix-build-on-3.19.patch new file mode 100644 index 0000000000..74c8972536 --- /dev/null +++ b/meta/recipes-kernel/cryptodev/files/0001-ioctl.c-Fix-build-on-3.19.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From 7d71124991030f99965e6e6aaed421115f185adb Mon Sep 17 00:00:00 2001 | ||
2 | From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> | ||
3 | Date: Mon, 9 Feb 2015 13:51:56 +0100 | ||
4 | Subject: [PATCH] ioctl.c: Fix build on 3.19 | ||
5 | |||
6 | get_unused_fd() MACRO has been removed on kernel 3.19. Replace by the | ||
7 | actual output of the macro. | ||
8 | |||
9 | Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> | ||
10 | --- | ||
11 | ioctl.c | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/ioctl.c b/ioctl.c | ||
15 | index f26cf93..cf8cc17 100644 | ||
16 | --- a/ioctl.c | ||
17 | +++ b/ioctl.c | ||
18 | @@ -529,7 +529,7 @@ static int | ||
19 | clonefd(struct file *filp) | ||
20 | { | ||
21 | int ret; | ||
22 | - ret = get_unused_fd(); | ||
23 | + ret = get_unused_fd_flags(0); | ||
24 | if (ret >= 0) { | ||
25 | get_file(filp); | ||
26 | fd_install(ret, filp); | ||
27 | -- | ||
28 | 2.1.4 | ||
29 | |||