summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2018-08-08 23:06:13 (GMT)
committerAnuj Mittal <anuj.mittal@intel.com>2018-08-09 14:01:18 (GMT)
commit5a72182247847179a7077f4d5078047a7ec2c11b (patch)
tree983d2b20ffb7f3f8e1bc5f7f7f7052d41eaa3cf7
parent0ac4864b754eee62918c53be6446039fd1780ca5 (diff)
downloadmeta-intel-5a72182247847179a7077f4d5078047a7ec2c11b.tar.gz
linux-intel/4.9: use new/correct revision for 4.9.116
Also drop the patch that has been included in the lts tree instead. 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.patch36
-rw-r--r--recipes-kernel/linux/linux-intel_4.9.bb4
2 files changed, 1 insertions, 39 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
deleted file mode 100644
index e3249cf..0000000
--- a/recipes-kernel/linux/linux-intel/0001-ver_linux-point-to-usr-bin-awk.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From 8af11c1cdd8fa08217e702b57cf96e9030db52b2 Mon Sep 17 00:00:00 2001
2From: Saul Wold <sgw@linux.intel.com>
3Date: Tue, 28 Mar 2017 15:06:08 -0700
4Subject: [PATCH] ver_linux: Use /usr/bin/awk instead of /bin/awk
5
6Most Linux distributions contain awk in /usr/bin by default,
7not in /bin. This script's suggested use is for creating version
8information for bug reporting.
9
10This has been tested on a number of different distributions,
11including Fedora, Ubuntu, OpenSUSE, Debian, Centos, Arch Linuxi,
12and Poky!
13
14Upstream-Status: Backport
15
16Signed-off-by: Saul Wold <sgw@linux.intel.com>
17Reviewed-by: Alexander Kapshuk <alexander.kapshuk@gmail.com>
18Reviewed-by: Mark Gross <mgross@linux.intel.com>
19Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
20---
21 scripts/ver_linux | 2 +-
22 1 file changed, 1 insertion(+), 1 deletion(-)
23
24diff --git a/scripts/ver_linux b/scripts/ver_linux
25index 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--
352.17.1
36
diff --git a/recipes-kernel/linux/linux-intel_4.9.bb b/recipes-kernel/linux/linux-intel_4.9.bb
index 5d38c97..0bc9249 100644
--- a/recipes-kernel/linux/linux-intel_4.9.bb
+++ b/recipes-kernel/linux/linux-intel_4.9.bb
@@ -4,10 +4,8 @@ require linux-intel.inc
4KBRANCH = "4.9/yocto/base" 4KBRANCH = "4.9/yocto/base"
5KMETA_BRANCH = "yocto-4.9" 5KMETA_BRANCH = "yocto-4.9"
6 6
7SRC_URI_append = " file://0001-ver_linux-point-to-usr-bin-awk.patch"
8
9LINUX_VERSION ?= "4.9.116" 7LINUX_VERSION ?= "4.9.116"
10SRCREV_machine ?= "521a610f0eab91e6f8c36c88916338e2cb36aa1c" 8SRCREV_machine ?= "36a5f3d10a2e660653cb2d237754081b8fd5af31"
11SRCREV_meta ?= "5e993963afb54bdc82a02077c29ecdbc0b12368e" 9SRCREV_meta ?= "5e993963afb54bdc82a02077c29ecdbc0b12368e"
12 10
13# For Crystalforest and Romley 11# For Crystalforest and Romley