sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

udev: Add 2 patches to support 4.4 kernel 

These 2 patches are needed to build udev with the 4.4 kernel, the first
mtd-probe adds back a stdint.h header that was removed in the kernel's mtd-user.h
header file.

The second adds a check for a new header and sets a Makefile variable
to determine which header to use for the new kernel vs older kernels.

(From OE-Core rev: 8084c185c43cb7e7f5e29d31939dfd308f8a0f93)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Saul Wold 2016-01-19 19:50:37 -08:00 committed by Richard Purdie
parent 1013385b2f
commit b80219eac1
3 changed files with 85 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meta/recipes-core/udev/udev.inc
View File

@ -31,7 +31,10 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
file://add-install-ptest.patch \
file://fix_rule-syntax-regex-ptest.patch \
file://run-ptest \
file://init"
file://init \
file://0001-mtd_probe.h-Add-stdint.h-as-it-was-removed-from-mtd-.patch \
file://0002-configure.ac-Makefile.am-Check-for-input.h-and-input.patch \
"
inherit autotools pkgconfig update-rc.d ptest
RDEPENDS_${PN}-ptest += "make perl python"

29
meta/recipes-core/udev/udev/0001-mtd_probe.h-Add-stdint.h-as-it-was-removed-from-mtd-.patch Normal file
View File

@ -0,0 +1,29 @@
From 2935f9b2dfb92c3ce4376a988cd01b624430905b Mon Sep 17 00:00:00 2001
From: Saul Wold <sgw@linux.intel.com>
Date: Tue, 19 Jan 2016 09:49:56 -0800
Subject: [PATCH 1/2] mtd_probe.h: Add stdint.h as it was removed from
mtd-user.h in the kernel
Upstream-Status: Inappropriate [Upstream unsupported]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
src/mtd_probe/mtd_probe.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/mtd_probe/mtd_probe.h b/src/mtd_probe/mtd_probe.h
index 2a37ede..49c1918 100644
--- a/src/mtd_probe/mtd_probe.h
+++ b/src/mtd_probe/mtd_probe.h
@@ -18,6 +18,7 @@
*/
#include <mtd/mtd-user.h>
+#include <stdint.h>
/* Full oob structure as written on the flash */
struct sm_oob {
--
2.5.0

52
meta/recipes-core/udev/udev/0002-configure.ac-Makefile.am-Check-for-input.h-and-input.patch Normal file
View File

@ -0,0 +1,52 @@
From 63ae7ebb0c6177efed46734061fb59c458a47a26 Mon Sep 17 00:00:00 2001
From: Saul Wold <sgw@linux.intel.com>
Date: Tue, 19 Jan 2016 09:49:19 -0800
Subject: [PATCH 2/2] configure.ac/Makefile.am: Check for input.h and
input-event-codes.h
Add INPUT_HEADER to know which header file to use because it changed
in the 4.4 kernel code.
Set INPUT_HEADER with default linux/input.h if it exists and if the
newer input-events-codes.h exists from 4.4 use it instead.
Upstream-Status: Inappropriate [Upstream unsupported]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
Makefile.am | 2 +-
configure.ac | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 2e32e69..04eb194 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -591,7 +591,7 @@ dist_udevkeymapforcerel_DATA = \
src/keymap/force-release-maps/samsung-other \
src/keymap/force-release-maps/common-volume-keys
-src/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h
+src/keymap/keys.txt: $(INCLUDE_PREFIX)/$(INPUT_HEADER)
$(AM_V_at)mkdir -p src/keymap
$(AM_V_GEN)$(AWK) '/^#define.*KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' < $< | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
diff --git a/configure.ac b/configure.ac
index 0500313..9674620 100644
--- a/configure.ac
+++ b/configure.ac
@@ -154,8 +154,10 @@ AS_IF([test "x$enable_keymap" = "xyes"], [
if test -z "$GPERF"; then
AC_MSG_ERROR([gperf is needed])
fi
+
+ AC_CHECK_HEADER([linux/input.h], [AC_SUBST([INPUT_HEADER], [$(echo 'linux/input.h')])], AC_MSG_ERROR([kernel headers not found]))
+ AC_CHECK_HEADER([linux/input-event-codes.h], [AC_SUBST([INPUT_HEADER], [$(echo 'linux/input-event-codes.h')])], [:])
- AC_CHECK_HEADER([linux/input.h], [:], AC_MSG_ERROR([kernel headers not found]))
AC_SUBST([INCLUDE_PREFIX], [$(echo '#include <linux/input.h>' | eval $ac_cpp -E - | sed -n '/linux\/input.h/ {s:.*"\(.*\)/linux/input.h".*:\1:; p; q}')])
])
AM_CONDITIONAL([ENABLE_KEYMAP], [test "x$enable_keymap" = "xyes"])
--
2.5.0