From 63c4b28180a27fb44aeb2680d5dd7513c474ac41 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Wed, 8 Aug 2018 15:56:39 +0800 Subject: 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 --- .../0001-ver_linux-point-to-usr-bin-awk.patch | 36 ++++++++++++++++++++++ recipes-kernel/linux/linux-intel_4.9.bb | 6 ++-- 2 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 recipes-kernel/linux/linux-intel/0001-ver_linux-point-to-usr-bin-awk.patch (limited to 'recipes-kernel/linux') 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 @@ +From 8af11c1cdd8fa08217e702b57cf96e9030db52b2 Mon Sep 17 00:00:00 2001 +From: Saul Wold +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 +Reviewed-by: Alexander Kapshuk +Reviewed-by: Mark Gross +Signed-off-by: Greg Kroah-Hartman +--- + 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 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 KBRANCH = "4.9/yocto/base" KMETA_BRANCH = "yocto-4.9" -LINUX_VERSION ?= "4.9.113" -SRCREV_machine ?= "9116ef3dfd570cb565989926233ebcaf03ad76fb" +SRC_URI_append = " file://0001-ver_linux-point-to-usr-bin-awk.patch" + +LINUX_VERSION ?= "4.9.116" +SRCREV_machine ?= "521a610f0eab91e6f8c36c88916338e2cb36aa1c" SRCREV_meta ?= "5e993963afb54bdc82a02077c29ecdbc0b12368e" # For Crystalforest and Romley -- cgit v1.2.3-54-g00ecf