diff options
author | Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com> | 2016-04-10 09:35:27 +0530 |
---|---|---|
committer | Joe MacDonald <joe_macdonald@mentor.com> | 2016-04-20 15:10:45 -0400 |
commit | ee61becc5bea1acee847c25243ad5ac59c6f3143 (patch) | |
tree | 32d320da1931814c060cad6d59d40f8f54986fe8 /meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb | |
parent | a9d1b61080cec79a30971a6c9c63ae4626528c83 (diff) | |
download | meta-openembedded-contrib-ee61becc5bea1acee847c25243ad5ac59c6f3143.tar.gz |
iscsitarget: resolve build error with linux kernel 4.3 and above
1. test_bit was used to return true boolean value, if
BIO_UPTODATE bit of bio->bi_flags is set. But the same
job can be done by checking bio->bi_error, implemented in
linux kernel 4.3 and above. If bio->bi_error is set, then
it denotes error.
Ref: https://github.com/torvalds/linux/commit/4246a0b63bd8f56a1469b12eafeb875b1041a451
It solves below build error:
-- snip --
iscsitarget-1.4.20.3+svn502/kernel/block-io.c:40:19: error: 'BIO_UPTODATE' undeclared (first use in this function)
error = test_bit(BIO_UPTODATE, &bio->bi_flags) ? error : -EIO;
-- CUT --
2. bio can always be filled to a maximum value of BIO_MAX_PAGES,
so no need to check for min value for linux kernel 4.3 and above.
Ref: https://github.com/torvalds/linux/commit/b54ffb73cadcdcff9cc1ae0e11f502407e3e2e4c
It solves below build error:
-- snip --
iscsitarget-1.4.20.3+svn502/kernel/block-io.c:80:15: error: implicit declaration of function 'bio_get_nr_vecs' [-Werror=implicit-function-declaration]
max_pages = bio_get_nr_vecs(bio_data->bdev);
-- CUT --
3. Remove unwanted explicit setting of CFLAGS and CC flags. Setting them in
oe_runmake command, will override CFLAGS mentioned in iscsitarget Makefile
and resulting in a below error:
-- snip --
In file included from iscsid.c:38:0:
iscsid.h:38:19: fatal error: iet_u.h: No such file or directory
compilation terminated.
In file included from conn.c:15:0:
iscsid.h:38:19: fatal error: iet_u.h: No such file or directory
compilation terminated.
-- CUT --
Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb')
-rw-r--r-- | meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb b/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb index 6a2b135faa..4c5eed6de9 100644 --- a/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb +++ b/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb @@ -8,13 +8,12 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=6e233eda45c807aa29aeaa6d94bc48a2" DEPENDS = "openssl virtual/kernel" -PNBLACKLIST[iscsitarget] ?= "BROKEN: kernel/block-io.c:36:19: error: 'BIO_UPTODATE' undeclared (first use in this function)" - SRC_URI = "http://ftp.heanet.ie/mirrors/ubuntu/pool/universe/i/${BPN}/${BPN}_${PV}.orig.tar.gz \ file://use-kernel-makefile-to-get-kernel-version.patch \ file://fix-errors-observed-with-linux-3.19-and-greater.patch \ file://access-sk_v6_daddr-iff-IPV6-defined.patch \ - " + file://build_with_updated_bio_struct_of_linux_v4.3_and_above.patch" + SRC_URI[md5sum] = "ef9bc823bbabd3c772208c00d5f2d089" SRC_URI[sha256sum] = "d3196ccb78a43266dce28587bfe30d8ab4db7566d7bce96057dfbb84100babb5" @@ -27,8 +26,7 @@ do_configure[noexec] = "1" do_make_scripts[depends] += "virtual/kernel:do_shared_workdir" do_compile() { - oe_runmake KSRC=${STAGING_KERNEL_DIR} CFLAGS='${CFLAGS}' LDFLAGS='' \ - CC="${CC}" V=1 + oe_runmake KSRC=${STAGING_KERNEL_DIR} LDFLAGS='' V=1 } do_install() { |