diff options
author | Cristiana Voicu <cristiana.voicu@intel.com> | 2014-01-06 10:15:40 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-06 22:17:29 +0000 |
commit | 2acd6174dea199917255cfe69f7504923069185e (patch) | |
tree | 25d735abf51fe06d1aa3efc5668574eafcce3fe6 /meta/recipes-kernel/kmod/kmod | |
parent | 741a8941625a978ce877fd833463903eb31011be (diff) | |
download | ast2050-yocto-poky-2acd6174dea199917255cfe69f7504923069185e.zip ast2050-yocto-poky-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>
Diffstat (limited to 'meta/recipes-kernel/kmod/kmod')
-rw-r--r-- | meta/recipes-kernel/kmod/kmod/0001-Fix-build-with-older-gcc-4.6.patch | 44 | ||||
-rw-r--r-- | meta/recipes-kernel/kmod/kmod/fix-seperatebuilddir.patch | 34 |
2 files changed, 0 insertions, 78 deletions
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 f8ff103..0000000 --- a/meta/recipes-kernel/kmod/kmod/0001-Fix-build-with-older-gcc-4.6.patch +++ /dev/null @@ -1,44 +0,0 @@ -Upstream-Status: Inappropriate [kmod is new] - -From 30e1839a46b0b9449f272765193a0da61bf85997 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 26 Aug 2013 15:32:36 -0700 -Subject: [PATCH] Fix build with older gcc < 4.6 - -Static_assert is new feature in C11 standards and older than gcc 4.6 -does not support it. So define it to make the old gcc happy - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - libkmod/macro.h | 14 ++++++++++++-- - 1 file changed, 12 insertions(+), 2 deletions(-) - -diff --git a/libkmod/macro.h b/libkmod/macro.h -index c6ba855..5032f54 100644 ---- a/libkmod/macro.h -+++ b/libkmod/macro.h -@@ -20,9 +20,19 @@ - #pragma once - - #include <stddef.h> -- --#define assert_cc(expr) \ -+#if defined(__GNUC__) -+/* Determine which version of GNU C we're using */ -+#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) -+#endif -+#if (GCC_VERSION >= 40600) -+# define assert_cc(expr) \ - _Static_assert((expr), #expr) -+#else -+# define STATIC_ASSERT_GLUE1(x, y) x##y -+# define STATIC_ASSERT_GLUE(x, y) STATIC_ASSERT_GLUE1(x, y) -+# define assert_cc(expr) \ -+extern void STATIC_ASSERT_GLUE(static_assert, __LINE__)(int arg[(expr) ? 1 : -1]) __attribute__((unused)) -+#endif - - #if HAVE_TYPEOF - #define check_types_match(expr1, expr2) \ --- -1.8.3.4 - 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 b090eb5..0000000 --- a/meta/recipes-kernel/kmod/kmod/fix-seperatebuilddir.patch +++ /dev/null @@ -1,34 +0,0 @@ - -If we are not building in the existing source tree, the testsuite -directory will not exist so the cp of the stamp-rootfs would fail. - -Also added buildtest-TESTS so they could be build in the cross env, -without running the tests. - -Upstream-Status: Accepted - -Signed-off-by: Saul Wold <sgw@linux.intel.com> - -Index: git/Makefile.am -=================================================================== ---- git.orig/Makefile.am -+++ git/Makefile.am -@@ -131,7 +131,7 @@ endif - - ROOTFS = testsuite/rootfs - ROOTFS_PRISTINE = $(top_srcdir)/testsuite/rootfs-pristine --CREATE_ROOTFS = $(AM_V_GEN) ( $(RM) -rf $(ROOTFS) && \ -+CREATE_ROOTFS = $(AM_V_GEN) ( $(RM) -rf $(ROOTFS) && mkdir -p $(dir $(ROOTFS)) && \ - cp -r $(ROOTFS_PRISTINE) $(ROOTFS) && \ - touch testsuite/stamp-rootfs && \ - find $(ROOTFS) -type d -exec chmod +w {} \; ) -@@ -217,6 +217,9 @@ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-d - - distclean-local: $(DISTCLEAN_LOCAL_HOOKS) - -+buildtest-TESTS: -+ $(MAKE) $(AM_MAKEFLAGS) $(check_LTLIBRARIES) $(check_PROGRAMS) -+ - install-ptest: - @$(MKDIR_P) $(DESTDIR)/testsuite - @for file in $(TESTSUITE); do \ |