aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2018-08-09 07:06:13 +0800
committerAnuj Mittal <anuj.mittal@intel.com>2018-08-09 22:03:22 +0800
commitd5b1fabc39c65a2084f6d49224bb176167db4ba4 (patch)
tree7b8f62fe84708dace924de4cea2a43937f9788fa
parent7889338bf4275aa155adb48e884b2abdf03dc274 (diff)
downloadmeta-intel-d5b1fabc39c65a2084f6d49224bb176167db4ba4.tar.gz
meta-intel-d5b1fabc39c65a2084f6d49224bb176167db4ba4.tar.bz2
meta-intel-d5b1fabc39c65a2084f6d49224bb176167db4ba4.zip
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 e3249cf0..00000000
--- a/recipes-kernel/linux/linux-intel/0001-ver_linux-point-to-usr-bin-awk.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 8af11c1cdd8fa08217e702b57cf96e9030db52b2 Mon Sep 17 00:00:00 2001
-From: Saul Wold <sgw@linux.intel.com>
-Date: Tue, 28 Mar 2017 15:06:08 -0700
-Subject: [PATCH] ver_linux: Use /usr/bin/awk instead of /bin/awk
-
-Most Linux distributions contain awk in /usr/bin by default,
-not in /bin. This script's suggested use is for creating version
-information for bug reporting.
-
-This has been tested on a number of different distributions,
-including Fedora, Ubuntu, OpenSUSE, Debian, Centos, Arch Linuxi,
-and Poky!
-
-Upstream-Status: Backport
-
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
-Reviewed-by: Alexander Kapshuk <alexander.kapshuk@gmail.com>
-Reviewed-by: Mark Gross <mgross@linux.intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- scripts/ver_linux | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scripts/ver_linux b/scripts/ver_linux
-index 430b201f3e25..b51de8a7e2a3 100755
---- a/scripts/ver_linux
-+++ b/scripts/ver_linux
-@@ -1,4 +1,4 @@
--#!/bin/awk -f
-+#!/usr/bin/awk -f
- # Before running this script please ensure that your PATH is
- # typical as you use for compilation/installation. I use
- # /bin /sbin /usr/bin /usr/sbin /usr/local/bin, but it may
---
-2.17.1
-
diff --git a/recipes-kernel/linux/linux-intel_4.9.bb b/recipes-kernel/linux/linux-intel_4.9.bb
index 5d38c970..0bc9249a 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
KBRANCH = "4.9/yocto/base"
KMETA_BRANCH = "yocto-4.9"
-SRC_URI_append = " file://0001-ver_linux-point-to-usr-bin-awk.patch"
-
LINUX_VERSION ?= "4.9.116"
-SRCREV_machine ?= "521a610f0eab91e6f8c36c88916338e2cb36aa1c"
+SRCREV_machine ?= "36a5f3d10a2e660653cb2d237754081b8fd5af31"
SRCREV_meta ?= "5e993963afb54bdc82a02077c29ecdbc0b12368e"
# For Crystalforest and Romley