diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2018-08-08 15:56:39 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2018-08-08 22:30:56 +0800 |
commit | 63c4b28180a27fb44aeb2680d5dd7513c474ac41 (patch) | |
tree | e36e19e8c17494944b739457ae0e9ce5aceb0472 | |
parent | 8bca950b8a89500782148f0fcbeae14ae9ba30fd (diff) | |
download | meta-intel-63c4b28180a27fb44aeb2680d5dd7513c474ac41.tar.gz |
linux-intel/4.9: update to 4.9.116
Also include a patch to replace /bin/awk with /usr/bin/awk to fix
issues with kernel-devsrc packaging/installation.
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-rw-r--r-- | recipes-kernel/linux/linux-intel/0001-ver_linux-point-to-usr-bin-awk.patch | 36 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-intel_4.9.bb | 6 |
2 files changed, 40 insertions, 2 deletions
diff --git a/recipes-kernel/linux/linux-intel/0001-ver_linux-point-to-usr-bin-awk.patch b/recipes-kernel/linux/linux-intel/0001-ver_linux-point-to-usr-bin-awk.patch new file mode 100644 index 00000000..e3249cf0 --- /dev/null +++ b/recipes-kernel/linux/linux-intel/0001-ver_linux-point-to-usr-bin-awk.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From 8af11c1cdd8fa08217e702b57cf96e9030db52b2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Saul Wold <sgw@linux.intel.com> | ||
3 | Date: Tue, 28 Mar 2017 15:06:08 -0700 | ||
4 | Subject: [PATCH] ver_linux: Use /usr/bin/awk instead of /bin/awk | ||
5 | |||
6 | Most Linux distributions contain awk in /usr/bin by default, | ||
7 | not in /bin. This script's suggested use is for creating version | ||
8 | information for bug reporting. | ||
9 | |||
10 | This has been tested on a number of different distributions, | ||
11 | including Fedora, Ubuntu, OpenSUSE, Debian, Centos, Arch Linuxi, | ||
12 | and Poky! | ||
13 | |||
14 | Upstream-Status: Backport | ||
15 | |||
16 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
17 | Reviewed-by: Alexander Kapshuk <alexander.kapshuk@gmail.com> | ||
18 | Reviewed-by: Mark Gross <mgross@linux.intel.com> | ||
19 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | ||
20 | --- | ||
21 | scripts/ver_linux | 2 +- | ||
22 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
23 | |||
24 | diff --git a/scripts/ver_linux b/scripts/ver_linux | ||
25 | index 430b201f3e25..b51de8a7e2a3 100755 | ||
26 | --- a/scripts/ver_linux | ||
27 | +++ b/scripts/ver_linux | ||
28 | @@ -1,4 +1,4 @@ | ||
29 | -#!/bin/awk -f | ||
30 | +#!/usr/bin/awk -f | ||
31 | # Before running this script please ensure that your PATH is | ||
32 | # typical as you use for compilation/installation. I use | ||
33 | # /bin /sbin /usr/bin /usr/sbin /usr/local/bin, but it may | ||
34 | -- | ||
35 | 2.17.1 | ||
36 | |||
diff --git a/recipes-kernel/linux/linux-intel_4.9.bb b/recipes-kernel/linux/linux-intel_4.9.bb index 7137c69b..5d38c970 100644 --- a/recipes-kernel/linux/linux-intel_4.9.bb +++ b/recipes-kernel/linux/linux-intel_4.9.bb | |||
@@ -4,8 +4,10 @@ require linux-intel.inc | |||
4 | KBRANCH = "4.9/yocto/base" | 4 | KBRANCH = "4.9/yocto/base" |
5 | KMETA_BRANCH = "yocto-4.9" | 5 | KMETA_BRANCH = "yocto-4.9" |
6 | 6 | ||
7 | LINUX_VERSION ?= "4.9.113" | 7 | SRC_URI_append = " file://0001-ver_linux-point-to-usr-bin-awk.patch" |
8 | SRCREV_machine ?= "9116ef3dfd570cb565989926233ebcaf03ad76fb" | 8 | |
9 | LINUX_VERSION ?= "4.9.116" | ||
10 | SRCREV_machine ?= "521a610f0eab91e6f8c36c88916338e2cb36aa1c" | ||
9 | SRCREV_meta ?= "5e993963afb54bdc82a02077c29ecdbc0b12368e" | 11 | SRCREV_meta ?= "5e993963afb54bdc82a02077c29ecdbc0b12368e" |
10 | 12 | ||
11 | # For Crystalforest and Romley | 13 | # For Crystalforest and Romley |