From 8e67d3e8aeb506749425b6ec9ec63ef744914d36 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Wed, 25 Nov 2015 16:27:58 +0800 Subject: 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 Signed-off-by: Martin Jansa Signed-off-by: Armin Kuster --- .../iscsitarget/iscsitarget_1.4.20.3+svn502.bb | 10 ++-------- 1 file 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 b327f8649..48f73cb56 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" -- cgit v1.2.3-54-g00ecf