[oe-commits] [meta-openembedded] 15/15: iscsitarget: split the kernel module into separate package

[git at git.openembedded.org]

joe_macdonald pushed a commit to branch master
in repository meta-openembedded.

commit a6abc25189cf49a17993637cf9e8fbd5419a5686
Author: Jackie Huang <jackie.huang at windriver.com>
AuthorDate: Wed Nov 25 16:27:58 2015 +0800

    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 at windriver.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
    Signed-off-by: Joe MacDonald <joe_macdonald at mentor.com>
---
 .../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 b73da51..6a2b135 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
@@ -18,10 +18,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"
 
@@ -29,9 +26,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
@@ -59,7 +53,7 @@ do_install() {
 }
 
 FILES_${PN} += "${sbindir} \
-                /lib \
                 ${sysconfdir}"
 
+RDEPENDS_${PN} = "kernel-module-iscsi-trgt"
 RRECOMMENDS_${PN} = "kernel-module-crc32c kernel-module-libcrc32c"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.