Skip to contentSkip to conversation

support CONFIG_MODULE_COMPRESS=y

PATCH In review Jens Rehsack 2 participants 5 messages Apr 3, 2019 – Apr 4, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 support CONFIG_MODULE_COMPRESS=y

In case, kernel config enables compressed modules, support of splitting via split_kernel_module_packages won't find any module. So, first expand module pattern regex to recognize compressed modules and then objcopy on temporary extacted to extract module information.

---
 meta/classes/kernel-module-split.bbclass | 36 +++++++++++++++++-------
 1 file changed, 26 insertions(+), 10 deletions(-)
meta/classes/kernel-module-split.bbclass +26 -10
index e8d3eb5105..61819dca99 100644
@@ -1,31 +1,31 @@
 pkg_postinst_modules () {
 if [ -z "$D" ]; then
-	depmod -a ${KERNEL_VERSION}
+        depmod -a ${KERNEL_VERSION}
 else
-	# image.bbclass will call depmodwrapper after everything is installed,
-	# no need to do it here as well
-	:
+        # image.bbclass will call depmodwrapper after everything is installed,
+        # no need to do it here as well
+        :
 fi
 }
 
 pkg_postrm_modules () {
 if [ -z "$D" ]; then
-	depmod -a ${KERNEL_VERSION}
+        depmod -a ${KERNEL_VERSION}
 else
-	depmodwrapper -a -b $D ${KERNEL_VERSION}
+        depmodwrapper -a -b $D ${KERNEL_VERSION}
 fi
 }
 
 autoload_postinst_fragment() {
 if [ x"$D" = "x" ]; then
-	modprobe %s || true
+        modprobe %s || true
 fi
 }
 
 PACKAGE_WRITE_DEPS += "kmod-native depmodwrapper-cross"
 
 do_install_append() {
-	install -d ${D}${sysconfdir}/modules-load.d/ ${D}${sysconfdir}/modprobe.d/
+        install -d ${D}${sysconfdir}/modules-load.d/ ${D}${sysconfdir}/modprobe.d/
 }
 
 PACKAGESPLITFUNCS_prepend = "split_kernel_module_packages "
@@ -44,9 +44,23 @@ python split_kernel_module_packages () {
     def extract_modinfo(file):
         import tempfile, subprocess
         tempfile.tempdir = d.getVar("WORKDIR")
+        compressed = re.match( r'.*\.([xg])z$', file)
         tf = tempfile.mkstemp()
         tmpfile = tf[1]
-        cmd = "%sobjcopy -j .modinfo -O binary %s %s" % (d.getVar("HOST_PREFIX") or "", file, tmpfile)
+        if compressed:
+            tmpkofile = tmpfile + ".ko"
+            if compressed.group(1) == 'g':
+                cmd = "gunzip -dc %s > %s" % (file, tmpkofile)
+                subprocess.check_call(cmd, shell=True)
+            elif compressed.group(1) == 'x':
+                cmd = "xz -dc %s > %s" % (file, tmpkofile)
+                subprocess.check_call(cmd, shell=True)
+            else:
+                msg = "Cannot decompress '%s'" % file
+                raise msg
+            cmd = "%sobjcopy -j .modinfo -O binary %s %s" % (d.getVar("HOST_PREFIX") or "", tmpkofile, tmpfile)
+        else:
+            cmd = "%sobjcopy -j .modinfo -O binary %s %s" % (d.getVar("HOST_PREFIX") or "", file, tmpfile)
         subprocess.check_call(cmd, shell=True)
         # errors='replace': Some old kernel versions contain invalid utf-8 characters in mod descriptions (like 0xf6, 'ö')
         f = open(tmpfile, errors='replace')
@@ -54,6 +68,8 @@ python split_kernel_module_packages () {
         f.close()
         os.close(tf[0])
         os.unlink(tmpfile)
+        if compressed:
+            os.unlink(tmpkofile)
         vals = {}
         for i in l:
             m = modinfoexp.match(i)
@@ -133,7 +149,7 @@ python split_kernel_module_packages () {
     kernel_package_name = d.getVar("KERNEL_PACKAGE_NAME") or "kernel"
     kernel_version = d.getVar("KERNEL_VERSION")
 
-    module_regex = r'^(.*)\.k?o$'
+    module_regex = r'^(.*)\.k?o(?:\.[xg]z)?$'
 
     module_pattern_prefix = d.getVar('KERNEL_MODULE_PACKAGE_PREFIX')
     module_pattern_suffix = d.getVar('KERNEL_MODULE_PACKAGE_SUFFIX')
Signature · 1 line
2.17.1
#1 lore raw
Quoted 11 lines · Jens Rehsack

In case, kernel config enables compressed modules, support of splitting via split_kernel_module_packages won't find any module. So, first expand module pattern regex to recognize compressed modules and then objcopy on temporary extacted to extract module information.

---
 meta/classes/kernel-module-split.bbclass | 36 +++++++++++++++++-----
--
 1 file changed, 26 insertions(+), 10 deletions(-)

There is a lot of whitespace noise in this, could you clean that up and resend please?

Cheers,

Richard

#2 lore raw
Quoted 11 lines

Am 03.04.2019 um 15:58 schrieb Richard Purdie <[email protected]>:

Quoted 6 lines · Jens Rehsack

In case, kernel config enables compressed modules, support of splitting via split_kernel_module_packages won't find any module. So, first expand module pattern regex to recognize compressed modules and then objcopy on temporary extacted to extract module information.

Quoted 8 lines
Quoted 5 lines

---
meta/classes/kernel-module-split.bbclass | 36 +++++++++++++++++----- --

1 file changed, 26 insertions(+), 10 deletions(-)

There is a lot of whitespace noise in this, could you clean that up and resend please?

It's because of <tab>s were replaced with spaces - which is reasonable when python code is mixed in. Sure that you want keep the tab's?

Cheers
--
Jens Rehsack - [email protected]

#3 lore raw
Quoted 19 lines · Jens Rehsack
Quoted 19 lines

Am 03.04.2019 um 15:58 schrieb Richard Purdie <
[email protected]>:

Quoted 12 lines · Jens Rehsack

In case, kernel config enables compressed modules, support of splitting via split_kernel_module_packages won't find any module. So, first expand module pattern regex to recognize compressed modules and then objcopy on temporary extacted to extract module information.

---
meta/classes/kernel-module-split.bbclass | 36 +++++++++++++++++
-----
--

1 file changed, 26 insertions(+), 10 deletions(-)
Quoted 7 lines
Quoted 3 lines

There is a lot of whitespace noise in this, could you clean that up and
resend please?

It's because of <tab>s were replaced with spaces - which is reasonable when python code is mixed in.
Sure that you want keep the tab's?

Rightly or wrongly, the style convention for OE-Core is tabs in shell, spaces in python (I'd prefer not to open that can of worms again right now).

Whitespace changes need to be in a separate patch to code changes regardless.

Cheers,

Richard

#4 lore raw
Quoted 28 lines

Am 03.04.2019 um 19:10 schrieb [email protected]:

Quoted 23 lines · Jens Rehsack
Quoted 22 lines

Am 03.04.2019 um 15:58 schrieb Richard Purdie <
[email protected]>:

Quoted 6 lines · Jens Rehsack

In case, kernel config enables compressed modules, support of splitting via split_kernel_module_packages won't find any module. So, first expand module pattern regex to recognize compressed modules and then objcopy on temporary extacted to extract module information.

Quoted 6 lines

---
meta/classes/kernel-module-split.bbclass | 36 +++++++++++++++++
-----
--

1 file changed, 26 insertions(+), 10 deletions(-)

There is a lot of whitespace noise in this, could you clean that up and
resend please?

Quoted 7 lines
Quoted 3 lines

It's because of <tab>s were replaced with spaces - which is reasonable when python code is mixed in.
Sure that you want keep the tab's?

Rightly or wrongly, the style convention for OE-Core is tabs in shell, spaces in python (I'd prefer not to open that can of worms again right now).

That wasn't the intension - I just wanted to be sure.

Quoted 2 lines

Whitespace changes need to be in a separate patch to code changes regardless.

Understood.

Cheers
--
Jens Rehsack - [email protected]