Patchwork [1/1] kmod: Update to Rev 16 via git

login
register
mail settings
Submitter Cristiana Voicu
Date Jan. 3, 2014, 8:05 a.m.
Message ID <05cec0c2a25dedaced68d3da08fb8a43b07ff368.1388735980.git.cristiana.voicu@intel.com>
Download mbox | patch
Permalink /patch/64009/
State New
Headers show

Comments

Cristiana Voicu - Jan. 3, 2014, 8:05 a.m.
Two patches are not needed anymore, because the changes are
already upstream.

Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com>
---
 meta/recipes-kernel/kmod/kmod-native_git.bb        |    3 +-
 meta/recipes-kernel/kmod/kmod.inc                  |    5 +--
 .../kmod/0001-Fix-build-with-older-gcc-4.6.patch   |   44 --------------------
 .../kmod/kmod/fix-seperatebuilddir.patch           |   34 ---------------
 4 files changed, 3 insertions(+), 83 deletions(-)
 delete mode 100644 meta/recipes-kernel/kmod/kmod/0001-Fix-build-with-older-gcc-4.6.patch
 delete mode 100644 meta/recipes-kernel/kmod/kmod/fix-seperatebuilddir.patch

Patch

diff --git a/meta/recipes-kernel/kmod/kmod-native_git.bb b/meta/recipes-kernel/kmod/kmod-native_git.bb
index fccc39b..d442bcb 100644
--- a/meta/recipes-kernel/kmod/kmod-native_git.bb
+++ b/meta/recipes-kernel/kmod/kmod-native_git.bb
@@ -4,8 +4,7 @@ 
 require kmod.inc
 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 (){
diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc
index f8d5bac..b4609dd 100644
--- a/meta/recipes-kernel/kmod/kmod.inc
+++ b/meta/recipes-kernel/kmod/kmod.inc
@@ -15,16 +15,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"
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 \