summaryrefslogtreecommitdiffstats
path: root/recipes-kernel
diff options
context:
space:
mode:
authorMax Krummenacher <max.oss.09@gmail.com>2019-01-06 13:02:44 +0100
committerDaiane Angolini <daiane.angolini@nxp.com>2019-01-09 14:42:52 -0200
commitf4b590bc5e2fbbc76c564c93c36b648065b0d8b3 (patch)
tree516d319d13b2ce123012ce910f86c89e5fb80922 /recipes-kernel
parent9b6c142bc0fab96f8ce1830555850e9e3215bda0 (diff)
downloadmeta-freescale-f4b590bc5e2fbbc76c564c93c36b648065b0d8b3.tar.gz
linux-imx_4.9.123: fix kernel module deploymenmt for ipk
Change the LOCALVERSION to '-imx'. While only linux-imx_4.9.123.bb fails, change the the same pattern in linux-imx-headers_4.9.123.bb for consistency. At least the ipk packager doesn't like the '_' characters and errors out with the following for each kernel module: | ERROR: Fatal errors occurred in subprocesses: | Command 'PATH="..." opkg-build -Z xz kernel-module-snd-usbmidi-lib-4.9.123-imx_4.9.123_imx8mm_ga+g6a71cbc08975 \ | .../deploy-ipks/imx8qmmek' returned non-zero exit status 1.: Traceback (most recent call last): | File "/build/krm/oe-core_master/build/../layers/openembedded-core/meta/lib/oe/utils.py", line 272, in run | ret = self._target(*self._args, **self._kwargs) | File "/build/krm/oe-core_master/build/../layers/openembedded-core/meta/classes/package_ipk.bbclass", line 230, \ | in ipk_write_pkg | shell=True) | File "/usr/lib64/python3.6/subprocess.py", line 336, in check_output | **kwargs).stdout | File "/usr/lib64/python3.6/subprocess.py", line 418, in run | output=stdout, stderr=stderr) | subprocess.CalledProcessError: Command '...' returned non-zero exit status 1. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'recipes-kernel')
-rw-r--r--recipes-kernel/linux/linux-imx-headers_4.9.123.bb2
-rw-r--r--recipes-kernel/linux/linux-imx_4.9.123.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/recipes-kernel/linux/linux-imx-headers_4.9.123.bb b/recipes-kernel/linux/linux-imx-headers_4.9.123.bb
index 77b05cff..44bce42a 100644
--- a/recipes-kernel/linux/linux-imx-headers_4.9.123.bb
+++ b/recipes-kernel/linux/linux-imx-headers_4.9.123.bb
@@ -8,7 +8,7 @@ LICENSE = "GPLv2"
8LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" 8LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
9 9
10SRCBRANCH = "imx_4.9.123_imx8mm_ga" 10SRCBRANCH = "imx_4.9.123_imx8mm_ga"
11LOCALVERSION = "-${SRCBRANCH}" 11LOCALVERSION = "-imx"
12SRC_URI = "git://source.codeaurora.org/external/imx/linux-imx.git;protocol=https;branch=${SRCBRANCH} \ 12SRC_URI = "git://source.codeaurora.org/external/imx/linux-imx.git;protocol=https;branch=${SRCBRANCH} \
13 file://0001-uapi-Install-custom-headers.patch" 13 file://0001-uapi-Install-custom-headers.patch"
14SRCREV = "6a71cbc089755afd6a86c005c22a1af6eab24a70" 14SRCREV = "6a71cbc089755afd6a86c005c22a1af6eab24a70"
diff --git a/recipes-kernel/linux/linux-imx_4.9.123.bb b/recipes-kernel/linux/linux-imx_4.9.123.bb
index c709249d..bc47f2db 100644
--- a/recipes-kernel/linux/linux-imx_4.9.123.bb
+++ b/recipes-kernel/linux/linux-imx_4.9.123.bb
@@ -12,7 +12,7 @@ require recipes-kernel/linux/linux-imx.inc
12DEPENDS += "lzop-native bc-native" 12DEPENDS += "lzop-native bc-native"
13 13
14SRCBRANCH = "imx_4.9.123_imx8mm_ga" 14SRCBRANCH = "imx_4.9.123_imx8mm_ga"
15LOCALVERSION = "-${SRCBRANCH}" 15LOCALVERSION = "-imx"
16SRCREV = "6a71cbc089755afd6a86c005c22a1af6eab24a70" 16SRCREV = "6a71cbc089755afd6a86c005c22a1af6eab24a70"
17 17
18DEFAULT_PREFERENCE = "1" 18DEFAULT_PREFERENCE = "1"