aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2015-11-25 16:27:58 +0800
committerArmin Kuster <akuster808@gmail.com>2016-02-06 16:56:53 -0800
commit8e67d3e8aeb506749425b6ec9ec63ef744914d36 (patch)
tree555f763120f81c8f38c8d7d6311047b8e703b76e
parent23db7070f97742c64112ddfdac382a0f27f59178 (diff)
downloadmeta-openembedded-contrib-8e67d3e8aeb506749425b6ec9ec63ef744914d36.tar.gz
iscsitarget: split the kernel module into separate package
inherit module instead of module-base, so the module is split into kernel-module-iscsi-trgt and make PN rdepends on it. Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb10
1 files changed, 2 insertions, 8 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 b327f8649e..48f73cb567 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
@@ -16,10 +16,7 @@ SRC_URI = "http://ftp.heanet.ie/mirrors/ubuntu/pool/universe/i/${BPN}/${BPN}_${P
SRC_URI[md5sum] = "ef9bc823bbabd3c772208c00d5f2d089"
SRC_URI[sha256sum] = "d3196ccb78a43266dce28587bfe30d8ab4db7566d7bce96057dfbb84100babb5"
-inherit module-base
-
-# Add make_scripts task to create kernel scripts
-addtask make_scripts after do_patch before do_compile
+inherit module
do_configure[noexec] = "1"
@@ -27,9 +24,6 @@ do_configure[noexec] = "1"
# kernel scripts
do_make_scripts[depends] += "virtual/kernel:do_shared_workdir"
-# Make sure we don't have race condition against "make scripts"
-do_make_scripts[lockfiles] = "${TMPDIR}/kernel-scripts.lock"
-
do_compile() {
oe_runmake KSRC=${STAGING_KERNEL_DIR} CFLAGS='${CFLAGS}' LDFLAGS='' \
CC="${CC}" V=1
@@ -57,7 +51,7 @@ do_install() {
}
FILES_${PN} += "${sbindir} \
- /lib \
${sysconfdir}"
+RDEPENDS_${PN} = "kernel-module-iscsi-trgt"
RRECOMMENDS_${PN} = "kernel-module-crc32c kernel-module-libcrc32c"