Skip to contentSkip to conversation

kernel module fixes

PATCH In review Mark Hatle 4 participants 8 messages Feb 28, 2013

lore
Share & tools
lore

Mark Hatle

author
#0 lore raw

cover kernel module fixes

There are two patches in this set, they address two different, but related problems.

The first patch likely needs some discussion before it can be accepted. This fixes the issue, but we're not sure that putting these two files into the kernel-base package is the right answer.

The second patch adds a new depmodwrapper, that resolves the issue. This fix was suggested by Richard. I think it's a reasonable solution and in all of my testing it has resolved the problem. (Without the first patch, you will get warnings about the missing files, but that first patch is not required for this one to work.)

author
#1 lore raw

PATCH 1/2 kernel.bbclass: Add missing modules.order and modules.builtins

When running depmod, from kmod, warnings about missing modules.order and modules.builtins occur. Looking back it is not clear why these files were being ignored, other then nobody knew what to do with them.

Add the files into the kernel-base package, if they exist, ensuring they will always get installed if at least one module is installed.

[ YOCTO #3963 ]

---
 meta/classes/kernel.bbclass |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
meta/classes/kernel.bbclass +1 -2
index 00117a6..e8c585b 100644
@@ -94,8 +94,6 @@ kernel_do_install() {
 	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
 	if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
 		oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" modules_install
-		rm -f "${D}/lib/modules/${KERNEL_VERSION}/modules.order"
-		rm -f "${D}/lib/modules/${KERNEL_VERSION}/modules.builtin"
 		rm "${D}/lib/modules/${KERNEL_VERSION}/build"
 		rm "${D}/lib/modules/${KERNEL_VERSION}/source"
 	else
@@ -251,6 +249,7 @@ EXPORT_FUNCTIONS do_compile do_install do_configure
 # kernel-image becomes kernel-image-${KERNEL_VERISON}
 PACKAGES = "kernel kernel-base kernel-vmlinux kernel-image kernel-dev kernel-modules"
 FILES = ""
+FILES_kernel-base = "/lib/modules/${KERNEL_VERSION}/modules.order /lib/modules/${KERNEL_VERSION}/modules.builtin"
 FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*"
 FILES_kernel-dev = "/boot/System.map* /boot/Module.symvers* /boot/config* ${KERNEL_SRC_PATH}"
 FILES_kernel-vmlinux = "/boot/vmlinux*"
Signature · 1 line
1.7.1
author
#2 lore raw

PATCH 2/2 module.bbclass: Create a new depmodwrapper to assist cross-installs

In reply to Mark Hatle

Previously the build path to STAGING_KERNEL_DIR was being embedded into the package post install scripts. We avoid this behavior by generating a special depmodwrapper script. This script contains that hard-coded path, ensuring that re-use of the sstate-cache (and/or packages) will always run through the wrapper generated by the current build with a checksum that includes STAGING_KERNEL_DIR.

[ YOCTO #3962 ]

---
 meta/classes/image.bbclass                         |    4 +-
 meta/classes/kernel.bbclass                        |    8 ++--
 meta/classes/module.bbclass                        |    4 +-
 .../recipes-kernel/kmod/depmodwrapper-cross_1.0.bb |   34 ++++++++++++++++++++
 4 files changed, 42 insertions(+), 8 deletions(-)
 create mode 100644 meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb
meta/classes/image.bbclass +2 -2
index dd78acb..af17331 100644
@@ -10,7 +10,7 @@ inherit gzipnative
 
 LICENSE = "MIT"
 PACKAGES = ""
-DEPENDS += "${MLPREFIX}qemuwrapper-cross"
+DEPENDS += "${MLPREFIX}qemuwrapper-cross depmodwrapper-cross"
 RDEPENDS += "${IMAGE_INSTALL} ${LINGUAS_INSTALL} ${NORMAL_FEATURE_INSTALL} ${ROOTFS_BOOTSTRAP_INSTALL}"
 RRECOMMENDS += "${NORMAL_FEATURE_INSTALL_OPTIONAL}"
 
@@ -283,7 +283,7 @@ fakeroot do_rootfs () {
 		KERNEL_VERSION=`cat ${STAGING_KERNEL_DIR}/kernel-abiversion`
 
 		mkdir -p ${IMAGE_ROOTFS}/lib/modules/$KERNEL_VERSION
-		depmod -a -b ${IMAGE_ROOTFS} -F ${STAGING_KERNEL_DIR}/System.map-$KERNEL_VERSION $KERNEL_VERSION
+		depmodwrapper -a -b ${IMAGE_ROOTFS} $KERNEL_VERSION
 	fi
 
 	${IMAGE_PREPROCESS_COMMAND}
meta/classes/kernel.bbclass +4 -4
index e8c585b..2bdc2fc 100644
@@ -1,7 +1,7 @@
 inherit linux-kernel-base module_strip
 
 PROVIDES += "virtual/kernel"
-DEPENDS += "virtual/${TARGET_PREFIX}gcc kmod-native"
+DEPENDS += "virtual/${TARGET_PREFIX}gcc kmod-native depmodwrapper-cross"
 
 # we include gcc above, we dont need virtual/libc
 INHIBIT_DEFAULT_DEPS = "1"
@@ -272,7 +272,7 @@ if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then
 	mkdir -p $D/lib/modules/${KERNEL_VERSION}
 fi
 if [ -n "$D" ]; then
-	depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
+	depmodwrapper -a -b $D ${KERNEL_VERSION}
 else
 	depmod -a ${KERNEL_VERSION}
 fi
@@ -282,7 +282,7 @@ pkg_postinst_modules () {
 if [ -z "$D" ]; then
 	depmod -a ${KERNEL_VERSION}
 else
-	depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
+	depmodwrapper -a -b $D ${KERNEL_VERSION}
 fi
 }
 
@@ -290,7 +290,7 @@ pkg_postrm_modules () {
 if [ -z "$D" ]; then
 	depmod -a ${KERNEL_VERSION}
 else
-	depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
+	depmodwrapper -a -b $D ${KERNEL_VERSION}
 fi
 }
 
meta/classes/module.bbclass +2 -2
index e2174a1..2c1888c 100644
@@ -28,7 +28,7 @@ module_pkg_postinst () {
 if [ -z "$D" ]; then
 	depmod -a ${KERNEL_VERSION}
 else
-	depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
+	depmodwrapper -a -b $D ${KERNEL_VERSION}
 fi
 }
 
@@ -36,7 +36,7 @@ module_pkg_postrm () {
 if [ -z "$D" ]; then
 	depmod -a ${KERNEL_VERSION}
 else
-	depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
+	depmodwrapper -a -b $D ${KERNEL_VERSION}
 fi
 }
 
meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb new file +34 -0
new file mode 100644
index 0000000..646c4cd
@@ -0,0 +1,34 @@
+DESCRIPTION = "Depmod wrapper script"
+LICENSE = "MIT"
+PR = "r0"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+# We need to evaluate it to the final path for vardeps to
+# work properly.
+STAGING_KERNEL_DIR := "${STAGING_KERNEL_DIR}"
+
+do_install() {
+	install -d ${D}${bindir_crossscripts}/
+
+	cat > ${D}${bindir_crossscripts}/depmodwrapper << EOF
+#!/bin/sh
+# Expected to be called as: depmodwrapper -a KERNEL_VERSION
+if [ "\$1" != "-a" -a "\$2" != "-b" ]; then
+    echo "Usage: depmodwrapper -a -b rootfs KERNEL_VERSION" >&2
+    exit 1
+fi
+if [ ! -r ${STAGING_KERNEL_DIR}/System.map-\$4 ]; then
+    echo "Unable to read: ${STAGING_KERNEL_DIR}/System.map-\$4" >&2
+    exec env depmod "\$1" "\$2" "\$3" "\$4"
+else
+    exec env depmod "\$1" "\$2" "\$3" -F "${STAGING_KERNEL_DIR}/System.map-\$4" "\$4"
+fi
+EOF
+	chmod +x ${D}${bindir_crossscripts}/depmodwrapper
+}
+
+SYSROOT_PREPROCESS_FUNCS += "depmodwrapper_sysroot_preprocess"
+
+depmodwrapper_sysroot_preprocess () {
+	sysroot_stage_dir ${D}${bindir_crossscripts} ${SYSROOT_DESTDIR}${bindir_crossscripts}
+}
Signature · 1 line
1.7.1
#3 lore raw

Re: [PATCH 2/2] module.bbclass: Create a new depmodwrapper to assist cross-installs

Quoted 114 lines · Mark Hatle

Previously the build path to STAGING_KERNEL_DIR was being embedded into the package post install scripts. We avoid this behavior by generating a special depmodwrapper script. This script contains that hard-coded path, ensuring that re-use of the sstate-cache (and/or packages) will always run through the wrapper generated by the current build with a checksum that includes STAGING_KERNEL_DIR.

[ YOCTO #3962 ]

---
 meta/classes/image.bbclass                         |    4 +-
 meta/classes/kernel.bbclass                        |    8 ++--
 meta/classes/module.bbclass                        |    4 +-
 .../recipes-kernel/kmod/depmodwrapper-cross_1.0.bb |   34 ++++++++++++++++++++
 4 files changed, 42 insertions(+), 8 deletions(-)
 create mode 100644 meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb
meta/classes/image.bbclass +2 -2
index dd78acb..af17331 100644
@@ -10,7 +10,7 @@ inherit gzipnative
 
 LICENSE = "MIT"
 PACKAGES = ""
-DEPENDS += "${MLPREFIX}qemuwrapper-cross"
+DEPENDS += "${MLPREFIX}qemuwrapper-cross depmodwrapper-cross"
 RDEPENDS += "${IMAGE_INSTALL} ${LINGUAS_INSTALL} ${NORMAL_FEATURE_INSTALL} ${ROOTFS_BOOTSTRAP_INSTALL}"
 RRECOMMENDS += "${NORMAL_FEATURE_INSTALL_OPTIONAL}"
 
@@ -283,7 +283,7 @@ fakeroot do_rootfs () {
                KERNEL_VERSION=`cat ${STAGING_KERNEL_DIR}/kernel-abiversion`
 
                mkdir -p ${IMAGE_ROOTFS}/lib/modules/$KERNEL_VERSION
-               depmod -a -b ${IMAGE_ROOTFS} -F ${STAGING_KERNEL_DIR}/System.map-$KERNEL_VERSION $KERNEL_VERSION
+               depmodwrapper -a -b ${IMAGE_ROOTFS} $KERNEL_VERSION
        fi
 
        ${IMAGE_PREPROCESS_COMMAND}
meta/classes/kernel.bbclass +4 -4
index e8c585b..2bdc2fc 100644
@@ -1,7 +1,7 @@
 inherit linux-kernel-base module_strip
 
 PROVIDES += "virtual/kernel"
-DEPENDS += "virtual/${TARGET_PREFIX}gcc kmod-native"
+DEPENDS += "virtual/${TARGET_PREFIX}gcc kmod-native depmodwrapper-cross"
 
 # we include gcc above, we dont need virtual/libc
 INHIBIT_DEFAULT_DEPS = "1"
@@ -272,7 +272,7 @@ if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then
        mkdir -p $D/lib/modules/${KERNEL_VERSION}
 fi
 if [ -n "$D" ]; then
-       depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
+       depmodwrapper -a -b $D ${KERNEL_VERSION}
 else
        depmod -a ${KERNEL_VERSION}
 fi
@@ -282,7 +282,7 @@ pkg_postinst_modules () {
 if [ -z "$D" ]; then
        depmod -a ${KERNEL_VERSION}
 else
-       depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
+       depmodwrapper -a -b $D ${KERNEL_VERSION}
 fi
 }
 
@@ -290,7 +290,7 @@ pkg_postrm_modules () {
 if [ -z "$D" ]; then
        depmod -a ${KERNEL_VERSION}
 else
-       depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
+       depmodwrapper -a -b $D ${KERNEL_VERSION}
 fi
 }
 
meta/classes/module.bbclass +2 -2
index e2174a1..2c1888c 100644
@@ -28,7 +28,7 @@ module_pkg_postinst () {
 if [ -z "$D" ]; then
        depmod -a ${KERNEL_VERSION}
 else
-       depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
+       depmodwrapper -a -b $D ${KERNEL_VERSION}
 fi
 }
 
@@ -36,7 +36,7 @@ module_pkg_postrm () {
 if [ -z "$D" ]; then
        depmod -a ${KERNEL_VERSION}
 else
-       depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
+       depmodwrapper -a -b $D ${KERNEL_VERSION}
 fi
 }
 
meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb new file +5 -0
new file mode 100644
index 0000000..646c4cd
@@ -0,0 +1,34 @@
+DESCRIPTION = "Depmod wrapper script"
+LICENSE = "MIT"
+PR = "r0"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+

meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb line 15

Quoted 10 lines
meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb new file +10 -0
+# We need to evaluate it to the final path for vardeps to
+# work properly.
+STAGING_KERNEL_DIR := "${STAGING_KERNEL_DIR}"
+
+do_install() {
+       install -d ${D}${bindir_crossscripts}/
+
+       cat > ${D}${bindir_crossscripts}/depmodwrapper << EOF
+#!/bin/sh
+# Expected to be called as: depmodwrapper -a KERNEL_VERSION

Can we remove the need for KERNEL_VERSION to be passed ? You are already looking at ${STAGING_KERNEL_DIR}, so just pulling the kernel version out of ${STAGING_KERNEL_DIR}/kernel-abiversion will reduce the chances of mistakes.

Bruce

Quoted 23 lines
meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb new file +19 -1
+if [ "\$1" != "-a" -a "\$2" != "-b" ]; then
+    echo "Usage: depmodwrapper -a -b rootfs KERNEL_VERSION" >&2
+    exit 1
+fi
+if [ ! -r ${STAGING_KERNEL_DIR}/System.map-\$4 ]; then
+    echo "Unable to read: ${STAGING_KERNEL_DIR}/System.map-\$4" >&2
+    exec env depmod "\$1" "\$2" "\$3" "\$4"
+else
+    exec env depmod "\$1" "\$2" "\$3" -F "${STAGING_KERNEL_DIR}/System.map-\$4" "\$4"
+fi
+EOF
+       chmod +x ${D}${bindir_crossscripts}/depmodwrapper
+}
+
+SYSROOT_PREPROCESS_FUNCS += "depmodwrapper_sysroot_preprocess"
+
+depmodwrapper_sysroot_preprocess () {
+       sysroot_stage_dir ${D}${bindir_crossscripts} ${SYSROOT_DESTDIR}${bindir_crossscripts}
+}
--

1.7.1

Quoted 4 lines

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

--
"Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"

author
#4 lore raw

Re: [PATCH 2/2] module.bbclass: Create a new depmodwrapper to assist cross-installs

Quoted 122 lines · Bruce Ashfield
Quoted 121 lines · Mark Hatle

Previously the build path to STAGING_KERNEL_DIR was being embedded into the package post install scripts. We avoid this behavior by generating a special depmodwrapper script. This script contains that hard-coded path, ensuring that re-use of the sstate-cache (and/or packages) will always run through the wrapper generated by the current build with a checksum that includes STAGING_KERNEL_DIR.

[ YOCTO #3962 ]

---
  meta/classes/image.bbclass                         |    4 +-
  meta/classes/kernel.bbclass                        |    8 ++--
  meta/classes/module.bbclass                        |    4 +-
  .../recipes-kernel/kmod/depmodwrapper-cross_1.0.bb |   34 ++++++++++++++++++++
  4 files changed, 42 insertions(+), 8 deletions(-)

create mode 100644 meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb

meta/classes/image.bbclass +2 -2
index dd78acb..af17331 100644
@@ -10,7 +10,7 @@ inherit gzipnative
 
  LICENSE = "MIT"
  PACKAGES = ""
-DEPENDS += "${MLPREFIX}qemuwrapper-cross"
+DEPENDS += "${MLPREFIX}qemuwrapper-cross depmodwrapper-cross"
  RDEPENDS += "${IMAGE_INSTALL} ${LINGUAS_INSTALL} ${NORMAL_FEATURE_INSTALL} ${ROOTFS_BOOTSTRAP_INSTALL}"
  RRECOMMENDS += "${NORMAL_FEATURE_INSTALL_OPTIONAL}"
 
@@ -283,7 +283,7 @@ fakeroot do_rootfs () {
                 KERNEL_VERSION=`cat ${STAGING_KERNEL_DIR}/kernel-abiversion`
 
                 mkdir -p ${IMAGE_ROOTFS}/lib/modules/$KERNEL_VERSION
-               depmod -a -b ${IMAGE_ROOTFS} -F ${STAGING_KERNEL_DIR}/System.map-$KERNEL_VERSION $KERNEL_VERSION
+               depmodwrapper -a -b ${IMAGE_ROOTFS} $KERNEL_VERSION
         fi
 
         ${IMAGE_PREPROCESS_COMMAND}
meta/classes/kernel.bbclass +4 -4
index e8c585b..2bdc2fc 100644
@@ -1,7 +1,7 @@
  inherit linux-kernel-base module_strip
 
  PROVIDES += "virtual/kernel"
-DEPENDS += "virtual/${TARGET_PREFIX}gcc kmod-native"
+DEPENDS += "virtual/${TARGET_PREFIX}gcc kmod-native depmodwrapper-cross"
 
  # we include gcc above, we dont need virtual/libc
  INHIBIT_DEFAULT_DEPS = "1"
@@ -272,7 +272,7 @@ if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then
         mkdir -p $D/lib/modules/${KERNEL_VERSION}
  fi
  if [ -n "$D" ]; then
-       depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
+       depmodwrapper -a -b $D ${KERNEL_VERSION}
  else
         depmod -a ${KERNEL_VERSION}
  fi
@@ -282,7 +282,7 @@ pkg_postinst_modules () {
  if [ -z "$D" ]; then
         depmod -a ${KERNEL_VERSION}
  else
-       depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
+       depmodwrapper -a -b $D ${KERNEL_VERSION}
  fi
  }
 
@@ -290,7 +290,7 @@ pkg_postrm_modules () {
  if [ -z "$D" ]; then
         depmod -a ${KERNEL_VERSION}
  else
-       depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
+       depmodwrapper -a -b $D ${KERNEL_VERSION}
  fi
  }
 
meta/classes/module.bbclass +2 -2
index e2174a1..2c1888c 100644
@@ -28,7 +28,7 @@ module_pkg_postinst () {
  if [ -z "$D" ]; then
         depmod -a ${KERNEL_VERSION}
  else
-       depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
+       depmodwrapper -a -b $D ${KERNEL_VERSION}
  fi
  }
 
@@ -36,7 +36,7 @@ module_pkg_postrm () {
  if [ -z "$D" ]; then
         depmod -a ${KERNEL_VERSION}
  else
-       depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
+       depmodwrapper -a -b $D ${KERNEL_VERSION}
  fi
  }
 
meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb new file +12 -0
new file mode 100644
index 0000000..646c4cd
@@ -0,0 +1,34 @@
+DESCRIPTION = "Depmod wrapper script"
+LICENSE = "MIT"
+PR = "r0"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+# We need to evaluate it to the final path for vardeps to
+# work properly.
+STAGING_KERNEL_DIR := "${STAGING_KERNEL_DIR}"
+
+do_install() {
+       install -d ${D}${bindir_crossscripts}/
+
Quoted 8 lines

meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb line 15

Quoted 3 lines
meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb new file +3 -0
+       cat > ${D}${bindir_crossscripts}/depmodwrapper << EOF
+#!/bin/sh
+# Expected to be called as: depmodwrapper -a KERNEL_VERSION

Can we remove the need for KERNEL_VERSION to be passed ? You are already looking at ${STAGING_KERNEL_DIR}, so just pulling the kernel version out of ${STAGING_KERNEL_DIR}/kernel-abiversion will reduce the chances of mistakes.

I did it this way specifically so that the KERNEL_VERSION that is already embedded into the depmod call for the "target" install, is the same as the one used for the cross-install. My assumption is that if one works, the other will work.

What I can do is simply check that kernel-abiversion and verify it's the same value, and fail (cross) if it's not... Would that be reasonable?

Quoted 37 lines

Bruce

Quoted 23 lines
meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb new file +19 -1
+if [ "\$1" != "-a" -a "\$2" != "-b" ]; then
+    echo "Usage: depmodwrapper -a -b rootfs KERNEL_VERSION" >&2
+    exit 1
+fi
+if [ ! -r ${STAGING_KERNEL_DIR}/System.map-\$4 ]; then
+    echo "Unable to read: ${STAGING_KERNEL_DIR}/System.map-\$4" >&2
+    exec env depmod "\$1" "\$2" "\$3" "\$4"
+else
+    exec env depmod "\$1" "\$2" "\$3" -F "${STAGING_KERNEL_DIR}/System.map-\$4" "\$4"
+fi
+EOF
+       chmod +x ${D}${bindir_crossscripts}/depmodwrapper
+}
+
+SYSROOT_PREPROCESS_FUNCS += "depmodwrapper_sysroot_preprocess"
+
+depmodwrapper_sysroot_preprocess () {
+       sysroot_stage_dir ${D}${bindir_crossscripts} ${SYSROOT_DESTDIR}${bindir_crossscripts}
+}
--

1.7.1

Quoted 4 lines

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

--
"Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"

#5 lore raw

Re: [PATCH 2/2] module.bbclass: Create a new depmodwrapper to assist cross-installs

In reply to Mark Hatle
Quoted 109 lines · Mark Hatle

Previously the build path to STAGING_KERNEL_DIR was being embedded into the package post install scripts. We avoid this behavior by generating a special depmodwrapper script. This script contains that hard-coded path, ensuring that re-use of the sstate-cache (and/or packages) will always run through the wrapper generated by the current build with a checksum that includes STAGING_KERNEL_DIR.

[ YOCTO #3962 ]

---
 meta/classes/image.bbclass                         |    4 +-
 meta/classes/kernel.bbclass                        |    8 ++--
 meta/classes/module.bbclass                        |    4 +-
 .../recipes-kernel/kmod/depmodwrapper-cross_1.0.bb |   34 ++++++++++++++++++++
 4 files changed, 42 insertions(+), 8 deletions(-)
 create mode 100644 meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb
meta/classes/image.bbclass +2 -2
index dd78acb..af17331 100644
@@ -10,7 +10,7 @@ inherit gzipnative
 
 LICENSE = "MIT"
 PACKAGES = ""
-DEPENDS += "${MLPREFIX}qemuwrapper-cross"
+DEPENDS += "${MLPREFIX}qemuwrapper-cross depmodwrapper-cross"
 RDEPENDS += "${IMAGE_INSTALL} ${LINGUAS_INSTALL} ${NORMAL_FEATURE_INSTALL} ${ROOTFS_BOOTSTRAP_INSTALL}"
 RRECOMMENDS += "${NORMAL_FEATURE_INSTALL_OPTIONAL}"
 
@@ -283,7 +283,7 @@ fakeroot do_rootfs () {
 		KERNEL_VERSION=`cat ${STAGING_KERNEL_DIR}/kernel-abiversion`
 
 		mkdir -p ${IMAGE_ROOTFS}/lib/modules/$KERNEL_VERSION
-		depmod -a -b ${IMAGE_ROOTFS} -F ${STAGING_KERNEL_DIR}/System.map-$KERNEL_VERSION $KERNEL_VERSION
+		depmodwrapper -a -b ${IMAGE_ROOTFS} $KERNEL_VERSION
 	fi
 
 	${IMAGE_PREPROCESS_COMMAND}
meta/classes/kernel.bbclass +4 -4
index e8c585b..2bdc2fc 100644
@@ -1,7 +1,7 @@
 inherit linux-kernel-base module_strip
 
 PROVIDES += "virtual/kernel"
-DEPENDS += "virtual/${TARGET_PREFIX}gcc kmod-native"
+DEPENDS += "virtual/${TARGET_PREFIX}gcc kmod-native depmodwrapper-cross"
 
 # we include gcc above, we dont need virtual/libc
 INHIBIT_DEFAULT_DEPS = "1"
@@ -272,7 +272,7 @@ if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then
 	mkdir -p $D/lib/modules/${KERNEL_VERSION}
 fi
 if [ -n "$D" ]; then
-	depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
+	depmodwrapper -a -b $D ${KERNEL_VERSION}
 else
 	depmod -a ${KERNEL_VERSION}
 fi
@@ -282,7 +282,7 @@ pkg_postinst_modules () {
 if [ -z "$D" ]; then
 	depmod -a ${KERNEL_VERSION}
 else
-	depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
+	depmodwrapper -a -b $D ${KERNEL_VERSION}
 fi
 }
 
@@ -290,7 +290,7 @@ pkg_postrm_modules () {
 if [ -z "$D" ]; then
 	depmod -a ${KERNEL_VERSION}
 else
-	depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
+	depmodwrapper -a -b $D ${KERNEL_VERSION}
 fi
 }
 
meta/classes/module.bbclass +2 -2
index e2174a1..2c1888c 100644
@@ -28,7 +28,7 @@ module_pkg_postinst () {
 if [ -z "$D" ]; then
 	depmod -a ${KERNEL_VERSION}
 else
-	depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
+	depmodwrapper -a -b $D ${KERNEL_VERSION}
 fi
 }
 
@@ -36,7 +36,7 @@ module_pkg_postrm () {
 if [ -z "$D" ]; then
 	depmod -a ${KERNEL_VERSION}
 else
-	depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
+	depmodwrapper -a -b $D ${KERNEL_VERSION}
 fi
 }
 
meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb new file +0 -0
new file mode 100644
index 0000000..646c4cd

meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb line 8

Quoted 8 lines
meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb new file +8 -0
@@ -0,0 +1,34 @@
+DESCRIPTION = "Depmod wrapper script"
+LICENSE = "MIT"
+PR = "r0"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+# We need to evaluate it to the final path for vardeps to
+# work properly.
+STAGING_KERNEL_DIR := "${STAGING_KERNEL_DIR}"

Please get rid of the above line. Really. You do not need to do this. I've told you this already and I do mean it.

No, it won't show up in the sstate dependencies directly but the sed run over text files containing "STAGING_DIR" expressions will take care of relocating it, hence it doesn't need to be there.

If that doesn't happen, please say why the sed expressions don't catch it.

Cheers,

Richard

Quoted 25 lines
meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb new file +25 -0
+do_install() {
+	install -d ${D}${bindir_crossscripts}/
+
+	cat > ${D}${bindir_crossscripts}/depmodwrapper << EOF
+#!/bin/sh
+# Expected to be called as: depmodwrapper -a KERNEL_VERSION
+if [ "\$1" != "-a" -a "\$2" != "-b" ]; then
+    echo "Usage: depmodwrapper -a -b rootfs KERNEL_VERSION" >&2
+    exit 1
+fi
+if [ ! -r ${STAGING_KERNEL_DIR}/System.map-\$4 ]; then
+    echo "Unable to read: ${STAGING_KERNEL_DIR}/System.map-\$4" >&2
+    exec env depmod "\$1" "\$2" "\$3" "\$4"
+else
+    exec env depmod "\$1" "\$2" "\$3" -F "${STAGING_KERNEL_DIR}/System.map-\$4" "\$4"
+fi
+EOF
+	chmod +x ${D}${bindir_crossscripts}/depmodwrapper
+}
+
+SYSROOT_PREPROCESS_FUNCS += "depmodwrapper_sysroot_preprocess"
+
+depmodwrapper_sysroot_preprocess () {
+	sysroot_stage_dir ${D}${bindir_crossscripts} ${SYSROOT_DESTDIR}${bindir_crossscripts}
+}
author
#6 lore raw

Re: [PATCH 2/2] module.bbclass: Create a new depmodwrapper to assist cross-installs

Quoted 122 lines · Richard Purdie
Quoted 109 lines · Mark Hatle

Previously the build path to STAGING_KERNEL_DIR was being embedded into the package post install scripts. We avoid this behavior by generating a special depmodwrapper script. This script contains that hard-coded path, ensuring that re-use of the sstate-cache (and/or packages) will always run through the wrapper generated by the current build with a checksum that includes STAGING_KERNEL_DIR.

[ YOCTO #3962 ]

---
  meta/classes/image.bbclass                         |    4 +-
  meta/classes/kernel.bbclass                        |    8 ++--
  meta/classes/module.bbclass                        |    4 +-
  .../recipes-kernel/kmod/depmodwrapper-cross_1.0.bb |   34 ++++++++++++++++++++
  4 files changed, 42 insertions(+), 8 deletions(-)

create mode 100644 meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb

meta/classes/image.bbclass +2 -2
index dd78acb..af17331 100644
@@ -10,7 +10,7 @@ inherit gzipnative
 
  LICENSE = "MIT"
  PACKAGES = ""
-DEPENDS += "${MLPREFIX}qemuwrapper-cross"
+DEPENDS += "${MLPREFIX}qemuwrapper-cross depmodwrapper-cross"
  RDEPENDS += "${IMAGE_INSTALL} ${LINGUAS_INSTALL} ${NORMAL_FEATURE_INSTALL} ${ROOTFS_BOOTSTRAP_INSTALL}"
  RRECOMMENDS += "${NORMAL_FEATURE_INSTALL_OPTIONAL}"
 
@@ -283,7 +283,7 @@ fakeroot do_rootfs () {
  		KERNEL_VERSION=`cat ${STAGING_KERNEL_DIR}/kernel-abiversion`
 
  		mkdir -p ${IMAGE_ROOTFS}/lib/modules/$KERNEL_VERSION
-		depmod -a -b ${IMAGE_ROOTFS} -F ${STAGING_KERNEL_DIR}/System.map-$KERNEL_VERSION $KERNEL_VERSION
+		depmodwrapper -a -b ${IMAGE_ROOTFS} $KERNEL_VERSION
  	fi
 
  	${IMAGE_PREPROCESS_COMMAND}
meta/classes/kernel.bbclass +4 -4
index e8c585b..2bdc2fc 100644
@@ -1,7 +1,7 @@
  inherit linux-kernel-base module_strip
 
  PROVIDES += "virtual/kernel"
-DEPENDS += "virtual/${TARGET_PREFIX}gcc kmod-native"
+DEPENDS += "virtual/${TARGET_PREFIX}gcc kmod-native depmodwrapper-cross"
 
  # we include gcc above, we dont need virtual/libc
  INHIBIT_DEFAULT_DEPS = "1"
@@ -272,7 +272,7 @@ if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then
  	mkdir -p $D/lib/modules/${KERNEL_VERSION}
  fi
  if [ -n "$D" ]; then
-	depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
+	depmodwrapper -a -b $D ${KERNEL_VERSION}
  else
  	depmod -a ${KERNEL_VERSION}
  fi
@@ -282,7 +282,7 @@ pkg_postinst_modules () {
  if [ -z "$D" ]; then
  	depmod -a ${KERNEL_VERSION}
  else
-	depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
+	depmodwrapper -a -b $D ${KERNEL_VERSION}
  fi
  }
 
@@ -290,7 +290,7 @@ pkg_postrm_modules () {
  if [ -z "$D" ]; then
  	depmod -a ${KERNEL_VERSION}
  else
-	depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
+	depmodwrapper -a -b $D ${KERNEL_VERSION}
  fi
  }
 
meta/classes/module.bbclass +2 -2
index e2174a1..2c1888c 100644
@@ -28,7 +28,7 @@ module_pkg_postinst () {
  if [ -z "$D" ]; then
  	depmod -a ${KERNEL_VERSION}
  else
-	depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
+	depmodwrapper -a -b $D ${KERNEL_VERSION}
  fi
  }
 
@@ -36,7 +36,7 @@ module_pkg_postrm () {
  if [ -z "$D" ]; then
  	depmod -a ${KERNEL_VERSION}
  else
-	depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
+	depmodwrapper -a -b $D ${KERNEL_VERSION}
  fi
  }
 
meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb new file +0 -0
new file mode 100644
index 0000000..646c4cd

meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb line 8

Quoted 8 lines
meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb new file +8 -0
@@ -0,0 +1,34 @@
+DESCRIPTION = "Depmod wrapper script"
+LICENSE = "MIT"
+PR = "r0"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+# We need to evaluate it to the final path for vardeps to
+# work properly.
+STAGING_KERNEL_DIR := "${STAGING_KERNEL_DIR}"

Please get rid of the above line. Really. You do not need to do this. I've told you this already and I do mean it.

Quoted 6 lines

No, it won't show up in the sstate dependencies directly but the sed run over text files containing "STAGING_DIR" expressions will take care of relocating it, hence it doesn't need to be there.

If that doesn't happen, please say why the sed expressions don't catch it.

Without that line, the thing was never modified from what was installed into the sysroot. I have no idea what is supposed to change the values, but it wasn't working.

Very easy to reproduce with master, take that code and run it in one build, share the sstate, run it in the second. Without the := bit, it keeps using the old path. (I spent almost 4 hours on this yesterday before finally doing the := to make it work. I'd rather the sstate code "make it work", but it wasn't.)

--Mark

Quoted 31 lines

Cheers,

Richard

Quoted 25 lines
meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb new file +25 -0
+do_install() {
+	install -d ${D}${bindir_crossscripts}/
+
+	cat > ${D}${bindir_crossscripts}/depmodwrapper << EOF
+#!/bin/sh
+# Expected to be called as: depmodwrapper -a KERNEL_VERSION
+if [ "\$1" != "-a" -a "\$2" != "-b" ]; then
+    echo "Usage: depmodwrapper -a -b rootfs KERNEL_VERSION" >&2
+    exit 1
+fi
+if [ ! -r ${STAGING_KERNEL_DIR}/System.map-\$4 ]; then
+    echo "Unable to read: ${STAGING_KERNEL_DIR}/System.map-\$4" >&2
+    exec env depmod "\$1" "\$2" "\$3" "\$4"
+else
+    exec env depmod "\$1" "\$2" "\$3" -F "${STAGING_KERNEL_DIR}/System.map-\$4" "\$4"
+fi
+EOF
+	chmod +x ${D}${bindir_crossscripts}/depmodwrapper
+}
+
+SYSROOT_PREPROCESS_FUNCS += "depmodwrapper_sysroot_preprocess"
+
+depmodwrapper_sysroot_preprocess () {
+	sysroot_stage_dir ${D}${bindir_crossscripts} ${SYSROOT_DESTDIR}${bindir_crossscripts}
+}
#7 lore raw

Re: [PATCH 2/2] module.bbclass: Create a new depmodwrapper to assist cross-installs

Quoted 130 lines · Mark Hatle
Quoted 122 lines · Richard Purdie
Quoted 109 lines · Mark Hatle

Previously the build path to STAGING_KERNEL_DIR was being embedded into the package post install scripts. We avoid this behavior by generating a special depmodwrapper script. This script contains that hard-coded path, ensuring that re-use of the sstate-cache (and/or packages) will always run through the wrapper generated by the current build with a checksum that includes STAGING_KERNEL_DIR.

[ YOCTO #3962 ]

---
  meta/classes/image.bbclass                         |    4 +-
  meta/classes/kernel.bbclass                        |    8 ++--
  meta/classes/module.bbclass                        |    4 +-
  .../recipes-kernel/kmod/depmodwrapper-cross_1.0.bb |   34 ++++++++++++++++++++
  4 files changed, 42 insertions(+), 8 deletions(-)

create mode 100644 meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb

meta/classes/image.bbclass +2 -2
index dd78acb..af17331 100644
@@ -10,7 +10,7 @@ inherit gzipnative
 
  LICENSE = "MIT"
  PACKAGES = ""
-DEPENDS += "${MLPREFIX}qemuwrapper-cross"
+DEPENDS += "${MLPREFIX}qemuwrapper-cross depmodwrapper-cross"
  RDEPENDS += "${IMAGE_INSTALL} ${LINGUAS_INSTALL} ${NORMAL_FEATURE_INSTALL} ${ROOTFS_BOOTSTRAP_INSTALL}"
  RRECOMMENDS += "${NORMAL_FEATURE_INSTALL_OPTIONAL}"
 
@@ -283,7 +283,7 @@ fakeroot do_rootfs () {
  		KERNEL_VERSION=`cat ${STAGING_KERNEL_DIR}/kernel-abiversion`
 
  		mkdir -p ${IMAGE_ROOTFS}/lib/modules/$KERNEL_VERSION
-		depmod -a -b ${IMAGE_ROOTFS} -F ${STAGING_KERNEL_DIR}/System.map-$KERNEL_VERSION $KERNEL_VERSION
+		depmodwrapper -a -b ${IMAGE_ROOTFS} $KERNEL_VERSION
  	fi
 
  	${IMAGE_PREPROCESS_COMMAND}
meta/classes/kernel.bbclass +4 -4
index e8c585b..2bdc2fc 100644
@@ -1,7 +1,7 @@
  inherit linux-kernel-base module_strip
 
  PROVIDES += "virtual/kernel"
-DEPENDS += "virtual/${TARGET_PREFIX}gcc kmod-native"
+DEPENDS += "virtual/${TARGET_PREFIX}gcc kmod-native depmodwrapper-cross"
 
  # we include gcc above, we dont need virtual/libc
  INHIBIT_DEFAULT_DEPS = "1"
@@ -272,7 +272,7 @@ if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then
  	mkdir -p $D/lib/modules/${KERNEL_VERSION}
  fi
  if [ -n "$D" ]; then
-	depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
+	depmodwrapper -a -b $D ${KERNEL_VERSION}
  else
  	depmod -a ${KERNEL_VERSION}
  fi
@@ -282,7 +282,7 @@ pkg_postinst_modules () {
  if [ -z "$D" ]; then
  	depmod -a ${KERNEL_VERSION}
  else
-	depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
+	depmodwrapper -a -b $D ${KERNEL_VERSION}
  fi
  }
 
@@ -290,7 +290,7 @@ pkg_postrm_modules () {
  if [ -z "$D" ]; then
  	depmod -a ${KERNEL_VERSION}
  else
-	depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
+	depmodwrapper -a -b $D ${KERNEL_VERSION}
  fi
  }
 
meta/classes/module.bbclass +2 -2
index e2174a1..2c1888c 100644
@@ -28,7 +28,7 @@ module_pkg_postinst () {
  if [ -z "$D" ]; then
  	depmod -a ${KERNEL_VERSION}
  else
-	depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
+	depmodwrapper -a -b $D ${KERNEL_VERSION}
  fi
  }
 
@@ -36,7 +36,7 @@ module_pkg_postrm () {
  if [ -z "$D" ]; then
  	depmod -a ${KERNEL_VERSION}
  else
-	depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
+	depmodwrapper -a -b $D ${KERNEL_VERSION}
  fi
  }
 
meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb new file +0 -0
new file mode 100644
index 0000000..646c4cd

meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb line 8

Quoted 8 lines
meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb new file +8 -0
@@ -0,0 +1,34 @@
+DESCRIPTION = "Depmod wrapper script"
+LICENSE = "MIT"
+PR = "r0"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+# We need to evaluate it to the final path for vardeps to
+# work properly.
+STAGING_KERNEL_DIR := "${STAGING_KERNEL_DIR}"

Please get rid of the above line. Really. You do not need to do this. I've told you this already and I do mean it.

Quoted 6 lines

No, it won't show up in the sstate dependencies directly but the sed run over text files containing "STAGING_DIR" expressions will take care of relocating it, hence it doesn't need to be there.

If that doesn't happen, please say why the sed expressions don't catch it.

Quoted 8 lines

Without that line, the thing was never modified from what was installed into the sysroot. I have no idea what is supposed to change the values, but it wasn't working.

Very easy to reproduce with master, take that code and run it in one build, share the sstate, run it in the second. Without the := bit, it keeps using the old path. (I spent almost 4 hours on this yesterday before finally doing the := to make it work. I'd rather the sstate code "make it work", but it wasn't.)

Did you append depmodwrapper to SSTATE_SCAN_FILES?

Quoted 39 lines

--Mark

Quoted 21 lines

Cheers,

Richard

Quoted 17 lines
meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb new file +17 -0
+do_install() {
+	install -d ${D}${bindir_crossscripts}/
+
+	cat > ${D}${bindir_crossscripts}/depmodwrapper << EOF
+#!/bin/sh
+# Expected to be called as: depmodwrapper -a KERNEL_VERSION
+if [ "\$1" != "-a" -a "\$2" != "-b" ]; then
+    echo "Usage: depmodwrapper -a -b rootfs KERNEL_VERSION" >&2
+    exit 1
+fi
+if [ ! -r ${STAGING_KERNEL_DIR}/System.map-\$4 ]; then
+    echo "Unable to read: ${STAGING_KERNEL_DIR}/System.map-\$4" >&2
+    exec env depmod "\$1" "\$2" "\$3" "\$4"
+else
+    exec env depmod "\$1" "\$2" "\$3" -F "${STAGING_KERNEL_DIR}/System.map-\$4" "\$4"
+fi
+EOF
Quoted 10 lines

meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb line 34

Quoted 8 lines
meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb new file +8 -0
+	chmod +x ${D}${bindir_crossscripts}/depmodwrapper
+}
+
+SYSROOT_PREPROCESS_FUNCS += "depmodwrapper_sysroot_preprocess"
+
+depmodwrapper_sysroot_preprocess () {
+	sysroot_stage_dir ${D}${bindir_crossscripts} ${SYSROOT_DESTDIR}${bindir_crossscripts}
+}

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]