Skip to contentSkip to conversation

iscsitarget: split the kernel module into separate package

PATCH In review [email protected] 4 participants 7 messages Nov 25, 2015 – Mar 4, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 iscsitarget: split the kernel module into separate package

From: Jackie Huang <[email protected]>

inherit module instead of module-base, so the module is split into kernel-module-iscsi-trgt and make PN rdepends on it.

---
 .../iscsitarget/iscsitarget_1.4.20.3+svn502.bb                 | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)
meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb +2 -8
index c96810b..9d49759 100644
@@ -15,10 +15,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"
 
@@ -26,9 +23,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
@@ -56,7 +50,7 @@ do_install() {
 }
 
 FILES_${PN} += "${sbindir} \
-                /lib \
                 ${sysconfdir}"
 
+RDEPENDS_${PN} = "kernel-module-iscsi-trgt"
 RRECOMMENDS_${PN} = "kernel-module-crc32c kernel-module-libcrc32c"
Signature · 1 line
2.3.5
#1 lore raw

PATCH 2/2 iscsitarget: skip the arch test for kernel modules

From: Jackie Huang <[email protected]>

Kernel modules may not have the same architecture as user space. So we tell INSANE_SKIP to skip checking the arch for the modules. This is consistent with other kernel modules and the kernel recipe.

---
 .../recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb        | 3 +++
 1 file changed, 3 insertions(+)
meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb +3 -0
index 9d49759..9db16bc 100644
@@ -54,3 +54,6 @@ FILES_${PN} += "${sbindir} \
 
 RDEPENDS_${PN} = "kernel-module-iscsi-trgt"
 RRECOMMENDS_${PN} = "kernel-module-crc32c kernel-module-libcrc32c"
+
+# Skip the arch test for kernel modules
+INSANE_SKIP_kernel-module-iscsi-trgt = "arch"
Signature · 1 line
2.3.5
#2 lore raw

Re: [PATCH 2/2] iscsitarget: skip the arch test for kernel modules

Op 25-11-15 om 09:27 schreef [email protected]:

Quoted 3 lines

From: Jackie Huang <[email protected]>

Kernel modules may not have the same architecture as user space.

LOL

Quoted 2 lines

So we tell INSANE_SKIP to skip checking the arch for the modules. This is consistent with other kernel modules and the kernel recipe.

Split this recipe in 2: one recipe for userspace, the other for kernel space.

#3 lore raw

Re: [PATCH 2/2] iscsitarget: skip the arch test for kernel modules

In reply to [email protected]
Quoted 6 lines · On Wed, Nov 25, 2015 at 3:27 AM, <[email protected]> wrote:

From: Jackie Huang <[email protected]>

Kernel modules may not have the same architecture as user space. So we tell INSANE_SKIP to skip checking the arch for the modules. This is consistent with other kernel modules and the kernel recipe.

This one still hasn't been merged and since iscsitarget is currently unbuildable, I'm not in a rush to merge this one particularly since I'm not really clear on the logic underlying the change. I searched the archives and found your response to Martin was essentially "see my netmap-modules patch for an explanation" and in that one the explanation was basically "this is the way other kernel modules do it". I merged that one but now I'm thinking I shouldn't have without more careful consideration. Am I correct in thinking that this problem only shows up when you're building for multilib? I've reverted "netmap-modules: Modules may not have the same arch as userspace" in my contrib tree at
http://git.openembedded.org/meta-openembedded-contrib/log/?h=joeythesaint/meta-networking-next
and my initial test builds showed no QA issues related to netmap-modules and the arch checks. So I started looking around for other kernel modules doing something similar and I don't actually see this "INSANE_SKIP_kernel-module-*" construct being used anywhere else in meta-oe or poky (and at the least I would expect something like cryptodev-module to need it, it looks like an analogue to me). Can you fill me in on what's special with iscsitarget and netmap, because even if it is a multilib issue, why wouldn't that be showing up for other kernel modules built in poky?

Thanks.

-J.

Quoted 33 lines

---
.../recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb |
3 +++

 1 file changed, 3 insertions(+)

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 9d49759..9db16bc 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

meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb +3 -1
@@ -54,3 +54,6 @@ FILES_${PN} += "${sbindir} \
 
 RDEPENDS_${PN} = "kernel-module-iscsi-trgt"
 RRECOMMENDS_${PN} = "kernel-module-crc32c kernel-module-libcrc32c"
+
+# Skip the arch test for kernel modules
+INSANE_SKIP_kernel-module-iscsi-trgt = "arch"
--

2.3.5

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Signature · 2 lines
Joe MacDonald
:wq
#4 lore raw

Re: [PATCH 2/2] iscsitarget: skip the arch test for kernel modules

Quoted 9 lines · On Wed, Nov 25, 2015 at 3:27 AM, <[email protected]> wrote:

From: Jackie Huang <[email protected]>

Kernel modules may not have the same architecture as user space. So we tell INSANE_SKIP to skip checking the arch for the modules. This is consistent with other kernel modules and the kernel recipe.

Quoted 5 lines

This one still hasn't been merged and since iscsitarget is currently unbuildable, I'm not in a rush to merge this one particularly since I'm not really clear on the logic underlying the change. I searched the archives and found your response to Martin was essentially "see my netmap-modules patch for an explanation" and in that one the explanation was basically "this is the way other kernel modules do it".

I think I meant to refer to this one which is not merged either:
commit 6727154c929f3dc8ed86bab29aa1de88620906e9

Author: Jackie Huang <[email protected]>
Date:   Tue Nov 17 01:44:47 2015 -0800

netmap-modules: skip the arch check for kernel module

When building on a multilib capable BSP, it's possible for the kernel bit size to be different than the userspace. Avoid the QA test when building the kernel module.

sorry that if the explanation is not clear enough.

Quoted 1 line

I merged that one but now I'm thinking I shouldn't have without more careful consideration.

The one you merged is "netmap-modules: Modules may not have the same arch as userspace" and Mark helped to split and re-word the commit message like what it is now.

Quoted 1 line

Am I correct in thinking that this problem only shows up when you're building for multilib?

We have BSPs with a 64 bit kernel + modules + 32 bit userspace by default, the problem always show up when we're building such BSP, and we have a bbclass to add INSANE_SKIP for internal modules:

# sanity updates. The do_package_qa_prepend and vmlinux sanity
# flags allow a 64 bit kernel + modules to be packaged against a
# 32 bit userspace. If external modules are built, they must supply
# their own INSANE_SKIP_<module> = "arch" if they want to be properly
# packaged.
python do_package_qa_prepend () {
Quoted 9 lines

I've reverted "netmap-modules: Modules may not have the same arch as userspace" in my contrib tree at http://git.openembedded.org/meta-openembedded-contrib/log/?h=joeythesaint/meta-networking-next
and my initial test builds showed no QA issues related to netmap-modules and the arch checks. So I started looking around for other kernel modules doing something similar and I don't actually see this "INSANE_SKIP_kernel-module-*" construct being used anywhere else in meta-oe or poky (and at the least I would expect something like cryptodev-module to need it, it looks like an analogue to me). Can you fill me in on what's special with iscsitarget and netmap, because even if it is a multilib issue, why wouldn't that be showing up for other kernel modules built in poky?

That's because there is no such BSP like I mentioned above in poky, I undersatand if this is not accpeted, we may add this in our own layer.

Thanks,
Jackie

Quoted 38 lines

Thanks.

-J.

---
 .../recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb        | 3 +++
 1 file changed, 3 insertions(+)
meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb +3 -1
index 9d49759..9db16bc 100644
@@ -54,3 +54,6 @@ FILES_${PN} += "${sbindir} \
 
 RDEPENDS_${PN} = "kernel-module-iscsi-trgt"
 RRECOMMENDS_${PN} = "kernel-module-crc32c kernel-module-libcrc32c"
+
+# Skip the arch test for kernel modules
+INSANE_SKIP_kernel-module-iscsi-trgt = "arch"
--

2.3.5

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Signature · 2 lines
Joe MacDonald
:wq
#5 lore raw

Re: [PATCH 2/2] iscsitarget: skip the arch test for kernel modules

Hi Jackie,

Quoted 26 lines · Jie (Jackie)
Quoted 7 lines · On Wed, Nov 25, 2015 at 3:27 AM, <[email protected]> wrote:

From: Jackie Huang <[email protected]>

Kernel modules may not have the same architecture as user space. So we tell INSANE_SKIP to skip checking the arch for the modules. This is consistent with other kernel modules and the kernel recipe.

Quoted 5 lines

This one still hasn't been merged and since iscsitarget is currently unbuildable, I'm not in a rush to merge this one particularly since I'm not really clear on the logic underlying the change. I searched the archives and found your response to Martin was essentially "see my netmap-modules patch for an explanation" and in that one the explanation was basically "this is the way other kernel modules do it".

I think I meant to refer to this one which is not merged either:
commit 6727154c929f3dc8ed86bab29aa1de88620906e9

Author: Jackie Huang <[email protected]>
Date:   Tue Nov 17 01:44:47 2015 -0800

netmap-modules: skip the arch check for kernel module

When building on a multilib capable BSP, it's possible for the kernel bit size to be different than the userspace. Avoid the QA test when building the kernel module.

Quoted 7 lines

sorry that if the explanation is not clear enough.

Quoted 2 lines

I merged that one but now I'm thinking I shouldn't have without more careful consideration.

The one you merged is "netmap-modules: Modules may not have the same arch as userspace" and Mark helped to split and re-word the commit message like what it is now.

Okay, so at least I am looking at what I think I'm looking at.

Quoted 7 lines
Quoted 2 lines

Am I correct in thinking that this problem only shows up when you're building for multilib?

We have BSPs with a 64 bit kernel + modules + 32 bit userspace by default, the problem always show up when we're building such BSP, and we have a bbclass to add INSANE_SKIP for internal modules:

Quoted 6 lines
# sanity updates. The do_package_qa_prepend and vmlinux sanity
# flags allow a 64 bit kernel + modules to be packaged against a
# 32 bit userspace. If external modules are built, they must supply
# their own INSANE_SKIP_<module> = "arch" if they want to be properly
# packaged.
python do_package_qa_prepend () {

I guess in this case you mean it's a bbclass that's internal to Wind River, I did a quick search and couldn't find the code you reference above anywhere in my poky tree.

Quoted 10 lines
Quoted 9 lines

I've reverted "netmap-modules: Modules may not have the same arch as userspace" in my contrib tree at http://git.openembedded.org/meta-openembedded-contrib/log/?h=joeythesaint/meta-networking-next
and my initial test builds showed no QA issues related to netmap-modules and the arch checks. So I started looking around for other kernel modules doing something similar and I don't actually see this "INSANE_SKIP_kernel-module-*" construct being used anywhere else in meta-oe or poky (and at the least I would expect something like cryptodev-module to need it, it looks like an analogue to me). Can you fill me in on what's special with iscsitarget and netmap, because even if it is a multilib issue, why wouldn't that be showing up for other kernel modules built in poky?

Quoted 2 lines

That's because there is no such BSP like I mentioned above in poky, I undersatand if this is not accpeted, we may add this in our own layer.

I think that's best, since otherwise the you'll be submitting these changes for any external module to support a use-case that we don't have in Yocto and there's no obvious corresponding behaviour in poky.

Thanks.

Signature · 2 lines
-Joe MacDonald.
:wq
#6 lore raw

Re: [PATCH 2/2] iscsitarget: skip the arch test for kernel modules

Quoted 57 lines

-----Original Message-----
From: Joe MacDonald [mailto:[email protected]]
Sent: Friday, March 04, 2016 12:17 AM
To: Huang, Jie (Jackie)
Cc: openembedded-devel
Subject: Re: [oe] [PATCH 2/2] iscsitarget: skip the arch test for kernel modules

Hi Jackie,

[Re: [oe] [PATCH 2/2] iscsitarget: skip the arch test for kernel modules] On 16.03.03 (Thu 04:41) Huang,

Quoted 26 lines · Jie (Jackie)
Quoted 7 lines · On Wed, Nov 25, 2015 at 3:27 AM, <[email protected]> wrote:

From: Jackie Huang <[email protected]>

Kernel modules may not have the same architecture as user space. So we tell INSANE_SKIP to skip checking the arch for the modules. This is consistent with other kernel modules and the kernel recipe.

Quoted 5 lines

This one still hasn't been merged and since iscsitarget is currently unbuildable, I'm not in a rush to merge this one particularly since I'm not really clear on the logic underlying the change. I searched the archives and found your response to Martin was essentially "see my netmap-modules patch for an explanation" and in that one the explanation was basically "this is the way other kernel modules do it".

I think I meant to refer to this one which is not merged either:
commit 6727154c929f3dc8ed86bab29aa1de88620906e9

Author: Jackie Huang <[email protected]>
Date:   Tue Nov 17 01:44:47 2015 -0800

netmap-modules: skip the arch check for kernel module

When building on a multilib capable BSP, it's possible for the kernel bit size to be different than the userspace. Avoid the QA test when building the kernel module.

Quoted 7 lines

sorry that if the explanation is not clear enough.

Quoted 2 lines

I merged that one but now I'm thinking I shouldn't have without more careful consideration.

The one you merged is "netmap-modules: Modules may not have the same arch as userspace" and Mark helped to split and re-word the commit message like what it is now.

Okay, so at least I am looking at what I think I'm looking at.

Quoted 7 lines
Quoted 2 lines

Am I correct in thinking that this problem only shows up when you're building for multilib?

We have BSPs with a 64 bit kernel + modules + 32 bit userspace by default, the problem always show up when we're building such BSP, and we have a bbclass to add INSANE_SKIP for internal modules:

Quoted 8 lines
Quoted 6 lines
# sanity updates. The do_package_qa_prepend and vmlinux sanity
# flags allow a 64 bit kernel + modules to be packaged against a
# 32 bit userspace. If external modules are built, they must supply
# their own INSANE_SKIP_<module> = "arch" if they want to be properly
# packaged.
python do_package_qa_prepend () {

I guess in this case you mean it's a bbclass that's internal to Wind

Yes.

Quoted 14 lines

River, I did a quick search and couldn't find the code you reference above anywhere in my poky tree.

Quoted 2 lines
Quoted 2 lines

I've reverted "netmap-modules: Modules may not have the same arch as userspace" in my contrib tree at http://git.openembedded.org/meta-openembedded-contrib/log/?h=joeythesaint/meta-

networking-next

Quoted 8 lines
Quoted 7 lines

and my initial test builds showed no QA issues related to netmap-modules and the arch checks. So I started looking around for other kernel modules doing something similar and I don't actually see this "INSANE_SKIP_kernel-module-*" construct being used anywhere else in meta-oe or poky (and at the least I would expect something like cryptodev-module to need it, it looks like an analogue to me). Can you fill me in on what's special with iscsitarget and netmap, because even if it is a multilib issue, why wouldn't that be showing up for other kernel modules built in poky?

Quoted 6 lines
Quoted 2 lines

That's because there is no such BSP like I mentioned above in poky, I undersatand if this is not accpeted, we may add this in our own layer.

I think that's best, since otherwise the you'll be submitting these changes for any external module to support a use-case that we don't have in Yocto and there's no obvious corresponding behaviour in poky.

Ok, I see, thanks!

Thanks,
Jackie

Quoted 6 lines

Thanks.

--
-Joe MacDonald.
:wq