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>
This commit is contained in:
parent
741a894162
commit
2acd6174de
|
@ -7,8 +7,7 @@ DEPENDS += "zlib-native"
|
|||
|
||||
inherit native
|
||||
|
||||
SRC_URI += "file://0001-Fix-build-with-older-gcc-4.6.patch \
|
||||
file://Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch \
|
||||
SRC_URI += "file://Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch \
|
||||
"
|
||||
|
||||
do_install_append (){
|
||||
|
|
|
@ -16,16 +16,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
|
|||
"
|
||||
inherit autotools gtk-doc ptest
|
||||
|
||||
SRCREV = "18811d22e9923893555b88a482aa967db0e7892a"
|
||||
SRCREV = "36c4bb928a6a7962dd0ad3aa64c0b18120ca5b46"
|
||||
# Lookout for PV bump too when SRCREV is changed
|
||||
PV = "15+git${SRCPV}"
|
||||
PV = "16+git${SRCPV}"
|
||||
|
||||
SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \
|
||||
file://depmod-search.conf \
|
||||
file://run-ptest \
|
||||
file://ptest.patch \
|
||||
file://avoid_parallel_tests.patch \
|
||||
file://fix-seperatebuilddir.patch \
|
||||
"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
|
|
@ -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
|
||||
|
|
@ -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 \
|
Loading…
Reference in New Issue