summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCristiana Voicu <cristiana.voicu@intel.com>2014-04-18 09:40:36 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-23 11:43:29 +0100
commit8dd299b5a95c751401100a0fcdafc4c940c63fe3 (patch)
treeb22a2e710646d43ccd45f8aade503ff407ddc883
parent8285e784be23a860564d62f4082d53d3471f8f5b (diff)
downloadpoky-8dd299b5a95c751401100a0fcdafc4c940c63fe3.tar.gz
kmod: upgrade to v17 via git
Just one patch has some small changes because the new code has another fix for unaligned access. (From OE-Core rev: 1d82fb4f1980bbe3c9cf0fffb45702bddda73307) Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/kmod/kmod.inc4
-rw-r--r--meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch4
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc
index 47445eb8bf..504a32fcee 100644
--- a/meta/recipes-kernel/kmod/kmod.inc
+++ b/meta/recipes-kernel/kmod/kmod.inc
@@ -16,9 +16,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
16 " 16 "
17inherit autotools gtk-doc ptest 17inherit autotools gtk-doc ptest
18 18
19SRCREV = "36c4bb928a6a7962dd0ad3aa64c0b18120ca5b46" 19SRCREV = "49d8e0b59052999de577ab732b719cfbeb89504d"
20# Lookout for PV bump too when SRCREV is changed 20# Lookout for PV bump too when SRCREV is changed
21PV = "16+git${SRCPV}" 21PV = "17+git${SRCPV}"
22 22
23SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \ 23SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \
24 file://depmod-search.conf \ 24 file://depmod-search.conf \
diff --git a/meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch b/meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch
index 82b83b36b7..5b4c8fa27a 100644
--- a/meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch
+++ b/meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch
@@ -29,8 +29,8 @@ index 6b80caa..3544a36 100644
29 modsig->hash >= PKEY_HASH__LAST || 29 modsig->hash >= PKEY_HASH__LAST ||
30 modsig->id_type >= PKEY_ID_TYPE__LAST) 30 modsig->id_type >= PKEY_ID_TYPE__LAST)
31 return false; 31 return false;
32- sig_len = be32toh(modsig->sig_len); 32- sig_len = be32toh(get_unaligned(&modsig->sig_len));
33+ sig_len = bswap_32(modsig->sig_len); 33+ sig_len = bswap_32(get_unaligned(&modsig->sig_len));
34 if (size < (off_t)(modsig->signer_len + modsig->key_id_len + sig_len)) 34 if (size < (off_t)(modsig->signer_len + modsig->key_id_len + sig_len))
35 return false; 35 return false;
36 36