summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCristiana Voicu <cristiana.voicu@intel.com>2014-01-06 10:15:40 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-06 22:17:29 +0000
commit2acd6174dea199917255cfe69f7504923069185e (patch)
tree25d735abf51fe06d1aa3efc5668574eafcce3fe6
parent741a8941625a978ce877fd833463903eb31011be (diff)
downloadpoky-2acd6174dea199917255cfe69f7504923069185e.tar.gz
kmod: Update to Rev 16 via git
Two patches are not needed anymore, because the changes are already upstream. (From OE-Core rev: d0e52b125a58c0556087fcdf1673920e63573e7b) 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-native_git.bb3
-rw-r--r--meta/recipes-kernel/kmod/kmod.inc5
-rw-r--r--meta/recipes-kernel/kmod/kmod/0001-Fix-build-with-older-gcc-4.6.patch44
-rw-r--r--meta/recipes-kernel/kmod/kmod/fix-seperatebuilddir.patch34
4 files changed, 3 insertions, 83 deletions
diff --git a/meta/recipes-kernel/kmod/kmod-native_git.bb b/meta/recipes-kernel/kmod/kmod-native_git.bb
index 6600413476..f0e274ed79 100644
--- a/meta/recipes-kernel/kmod/kmod-native_git.bb
+++ b/meta/recipes-kernel/kmod/kmod-native_git.bb
@@ -7,8 +7,7 @@ DEPENDS += "zlib-native"
7 7
8inherit native 8inherit native
9 9
10SRC_URI += "file://0001-Fix-build-with-older-gcc-4.6.patch \ 10SRC_URI += "file://Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch \
11 file://Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch \
12 " 11 "
13 12
14do_install_append (){ 13do_install_append (){
diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc
index 94724e45b8..b7e176c876 100644
--- a/meta/recipes-kernel/kmod/kmod.inc
+++ b/meta/recipes-kernel/kmod/kmod.inc
@@ -16,16 +16,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
16 " 16 "
17inherit autotools gtk-doc ptest 17inherit autotools gtk-doc ptest
18 18
19SRCREV = "18811d22e9923893555b88a482aa967db0e7892a" 19SRCREV = "36c4bb928a6a7962dd0ad3aa64c0b18120ca5b46"
20# Lookout for PV bump too when SRCREV is changed 20# Lookout for PV bump too when SRCREV is changed
21PV = "15+git${SRCPV}" 21PV = "16+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 \
25 file://run-ptest \ 25 file://run-ptest \
26 file://ptest.patch \ 26 file://ptest.patch \
27 file://avoid_parallel_tests.patch \ 27 file://avoid_parallel_tests.patch \
28 file://fix-seperatebuilddir.patch \
29 " 28 "
30 29
31S = "${WORKDIR}/git" 30S = "${WORKDIR}/git"
diff --git a/meta/recipes-kernel/kmod/kmod/0001-Fix-build-with-older-gcc-4.6.patch b/meta/recipes-kernel/kmod/kmod/0001-Fix-build-with-older-gcc-4.6.patch
deleted file mode 100644
index f8ff103087..0000000000
--- a/meta/recipes-kernel/kmod/kmod/0001-Fix-build-with-older-gcc-4.6.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1Upstream-Status: Inappropriate [kmod is new]
2
3From 30e1839a46b0b9449f272765193a0da61bf85997 Mon Sep 17 00:00:00 2001
4From: Khem Raj <raj.khem@gmail.com>
5Date: Mon, 26 Aug 2013 15:32:36 -0700
6Subject: [PATCH] Fix build with older gcc < 4.6
7
8Static_assert is new feature in C11 standards and older than gcc 4.6
9does not support it. So define it to make the old gcc happy
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 libkmod/macro.h | 14 ++++++++++++--
14 1 file changed, 12 insertions(+), 2 deletions(-)
15
16diff --git a/libkmod/macro.h b/libkmod/macro.h
17index c6ba855..5032f54 100644
18--- a/libkmod/macro.h
19+++ b/libkmod/macro.h
20@@ -20,9 +20,19 @@
21 #pragma once
22
23 #include <stddef.h>
24-
25-#define assert_cc(expr) \
26+#if defined(__GNUC__)
27+/* Determine which version of GNU C we're using */
28+#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
29+#endif
30+#if (GCC_VERSION >= 40600)
31+# define assert_cc(expr) \
32 _Static_assert((expr), #expr)
33+#else
34+# define STATIC_ASSERT_GLUE1(x, y) x##y
35+# define STATIC_ASSERT_GLUE(x, y) STATIC_ASSERT_GLUE1(x, y)
36+# define assert_cc(expr) \
37+extern void STATIC_ASSERT_GLUE(static_assert, __LINE__)(int arg[(expr) ? 1 : -1]) __attribute__((unused))
38+#endif
39
40 #if HAVE_TYPEOF
41 #define check_types_match(expr1, expr2) \
42--
431.8.3.4
44
diff --git a/meta/recipes-kernel/kmod/kmod/fix-seperatebuilddir.patch b/meta/recipes-kernel/kmod/kmod/fix-seperatebuilddir.patch
deleted file mode 100644
index b090eb56a5..0000000000
--- a/meta/recipes-kernel/kmod/kmod/fix-seperatebuilddir.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1
2If we are not building in the existing source tree, the testsuite
3directory will not exist so the cp of the stamp-rootfs would fail.
4
5Also added buildtest-TESTS so they could be build in the cross env,
6without running the tests.
7
8Upstream-Status: Accepted
9
10Signed-off-by: Saul Wold <sgw@linux.intel.com>
11
12Index: git/Makefile.am
13===================================================================
14--- git.orig/Makefile.am
15+++ git/Makefile.am
16@@ -131,7 +131,7 @@ endif
17
18 ROOTFS = testsuite/rootfs
19 ROOTFS_PRISTINE = $(top_srcdir)/testsuite/rootfs-pristine
20-CREATE_ROOTFS = $(AM_V_GEN) ( $(RM) -rf $(ROOTFS) && \
21+CREATE_ROOTFS = $(AM_V_GEN) ( $(RM) -rf $(ROOTFS) && mkdir -p $(dir $(ROOTFS)) && \
22 cp -r $(ROOTFS_PRISTINE) $(ROOTFS) && \
23 touch testsuite/stamp-rootfs && \
24 find $(ROOTFS) -type d -exec chmod +w {} \; )
25@@ -217,6 +217,9 @@ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-d
26
27 distclean-local: $(DISTCLEAN_LOCAL_HOOKS)
28
29+buildtest-TESTS:
30+ $(MAKE) $(AM_MAKEFLAGS) $(check_LTLIBRARIES) $(check_PROGRAMS)
31+
32 install-ptest:
33 @$(MKDIR_P) $(DESTDIR)/testsuite
34 @for file in $(TESTSUITE); do \