summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2016-01-19 19:50:37 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-20 17:07:16 +0000
commitb80219eac1695044554c18994124ae32c04642c6 (patch)
tree155ed090a239b04a666a6d624b94a3355cb555a4 /meta
parent1013385b2f04b914538c0699a636074496911788 (diff)
downloadpoky-b80219eac1695044554c18994124ae32c04642c6.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/udev/udev.inc5
-rw-r--r--meta/recipes-core/udev/udev/0001-mtd_probe.h-Add-stdint.h-as-it-was-removed-from-mtd-.patch29
-rw-r--r--meta/recipes-core/udev/udev/0002-configure.ac-Makefile.am-Check-for-input.h-and-input.patch52
3 files changed, 85 insertions, 1 deletions
diff --git a/meta/recipes-core/udev/udev.inc b/meta/recipes-core/udev/udev.inc
index c00ed3412a..93d736941d 100644
--- a/meta/recipes-core/udev/udev.inc
+++ b/meta/recipes-core/udev/udev.inc
@@ -31,7 +31,10 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
31 file://add-install-ptest.patch \ 31 file://add-install-ptest.patch \
32 file://fix_rule-syntax-regex-ptest.patch \ 32 file://fix_rule-syntax-regex-ptest.patch \
33 file://run-ptest \ 33 file://run-ptest \
34 file://init" 34 file://init \
35 file://0001-mtd_probe.h-Add-stdint.h-as-it-was-removed-from-mtd-.patch \
36 file://0002-configure.ac-Makefile.am-Check-for-input.h-and-input.patch \
37 "
35 38
36inherit autotools pkgconfig update-rc.d ptest 39inherit autotools pkgconfig update-rc.d ptest
37RDEPENDS_${PN}-ptest += "make perl python" 40RDEPENDS_${PN}-ptest += "make perl python"
diff --git a/meta/recipes-core/udev/udev/0001-mtd_probe.h-Add-stdint.h-as-it-was-removed-from-mtd-.patch b/meta/recipes-core/udev/udev/0001-mtd_probe.h-Add-stdint.h-as-it-was-removed-from-mtd-.patch
new file mode 100644
index 0000000000..8d2df1a390
--- /dev/null
+++ b/meta/recipes-core/udev/udev/0001-mtd_probe.h-Add-stdint.h-as-it-was-removed-from-mtd-.patch
@@ -0,0 +1,29 @@
1From 2935f9b2dfb92c3ce4376a988cd01b624430905b Mon Sep 17 00:00:00 2001
2From: Saul Wold <sgw@linux.intel.com>
3Date: Tue, 19 Jan 2016 09:49:56 -0800
4Subject: [PATCH 1/2] mtd_probe.h: Add stdint.h as it was removed from
5 mtd-user.h in the kernel
6
7
8Upstream-Status: Inappropriate [Upstream unsupported]
9
10Signed-off-by: Saul Wold <sgw@linux.intel.com>
11---
12 src/mtd_probe/mtd_probe.h | 1 +
13 1 file changed, 1 insertion(+)
14
15diff --git a/src/mtd_probe/mtd_probe.h b/src/mtd_probe/mtd_probe.h
16index 2a37ede..49c1918 100644
17--- a/src/mtd_probe/mtd_probe.h
18+++ b/src/mtd_probe/mtd_probe.h
19@@ -18,6 +18,7 @@
20 */
21
22 #include <mtd/mtd-user.h>
23+#include <stdint.h>
24
25 /* Full oob structure as written on the flash */
26 struct sm_oob {
27--
282.5.0
29
diff --git a/meta/recipes-core/udev/udev/0002-configure.ac-Makefile.am-Check-for-input.h-and-input.patch b/meta/recipes-core/udev/udev/0002-configure.ac-Makefile.am-Check-for-input.h-and-input.patch
new file mode 100644
index 0000000000..a9dc627459
--- /dev/null
+++ b/meta/recipes-core/udev/udev/0002-configure.ac-Makefile.am-Check-for-input.h-and-input.patch
@@ -0,0 +1,52 @@
1From 63ae7ebb0c6177efed46734061fb59c458a47a26 Mon Sep 17 00:00:00 2001
2From: Saul Wold <sgw@linux.intel.com>
3Date: Tue, 19 Jan 2016 09:49:19 -0800
4Subject: [PATCH 2/2] configure.ac/Makefile.am: Check for input.h and
5 input-event-codes.h
6
7Add INPUT_HEADER to know which header file to use because it changed
8in the 4.4 kernel code.
9
10Set INPUT_HEADER with default linux/input.h if it exists and if the
11newer input-events-codes.h exists from 4.4 use it instead.
12
13Upstream-Status: Inappropriate [Upstream unsupported]
14
15Signed-off-by: Saul Wold <sgw@linux.intel.com>
16---
17 Makefile.am | 2 +-
18 configure.ac | 4 +++-
19 2 files changed, 4 insertions(+), 2 deletions(-)
20
21diff --git a/Makefile.am b/Makefile.am
22index 2e32e69..04eb194 100644
23--- a/Makefile.am
24+++ b/Makefile.am
25@@ -591,7 +591,7 @@ dist_udevkeymapforcerel_DATA = \
26 src/keymap/force-release-maps/samsung-other \
27 src/keymap/force-release-maps/common-volume-keys
28
29-src/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h
30+src/keymap/keys.txt: $(INCLUDE_PREFIX)/$(INPUT_HEADER)
31 $(AM_V_at)mkdir -p src/keymap
32 $(AM_V_GEN)$(AWK) '/^#define.*KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' < $< | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
33
34diff --git a/configure.ac b/configure.ac
35index 0500313..9674620 100644
36--- a/configure.ac
37+++ b/configure.ac
38@@ -154,8 +154,10 @@ AS_IF([test "x$enable_keymap" = "xyes"], [
39 if test -z "$GPERF"; then
40 AC_MSG_ERROR([gperf is needed])
41 fi
42+
43+ AC_CHECK_HEADER([linux/input.h], [AC_SUBST([INPUT_HEADER], [$(echo 'linux/input.h')])], AC_MSG_ERROR([kernel headers not found]))
44+ AC_CHECK_HEADER([linux/input-event-codes.h], [AC_SUBST([INPUT_HEADER], [$(echo 'linux/input-event-codes.h')])], [:])
45
46- AC_CHECK_HEADER([linux/input.h], [:], AC_MSG_ERROR([kernel headers not found]))
47 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}')])
48 ])
49 AM_CONDITIONAL([ENABLE_KEYMAP], [test "x$enable_keymap" = "xyes"])
50--
512.5.0
52