diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-02-01 10:30:31 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-02-05 09:22:17 +0000 |
commit | 48ac84f9533c377512d636f4e0fa327a7b54a23c (patch) | |
tree | d70cd484aa1bf559e6a610b3687d232dc37bbbbb | |
parent | 0476945e9c54d6707f6a6231d81a7bedfe941ebb (diff) | |
download | poky-48ac84f9533c377512d636f4e0fa327a7b54a23c.tar.gz |
ver_linux: Use /usr/bin/awk instead of /bin/awk
To avoid kernel-devsrc failing with missing a dependency on "/bin/awk".
Due to the way this script is invoked, using #!/usr/bin/env can run into
issue when invoked.
Since most distros have awk in /usr/bin and not /bin, we change the
script while this is sorted out upstream.
(From OE-Core rev: 3360eadb719f1d3b406e6cf48d99a74fdb2f6c77)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_4.9.bb | 18 |
3 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb index a0adb3830c..904a8465b3 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb | |||
@@ -11,8 +11,8 @@ python () { | |||
11 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") | 11 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") |
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "628a985d1bb4d992b76c727afd373788bd496c90" | 14 | SRCREV_machine ?= "0898601446c6bde63cb97fb6236d114886ed5f2a" |
15 | SRCREV_meta ?= "39aa01a6d4332a8ef746a03246e56a41a69fae99" | 15 | SRCREV_meta ?= "8c71361007816dcabe297f40cd5a38ed5d7d7599" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;branch=${KBRANCH};name=machine \ | 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;branch=${KBRANCH};name=machine \ |
18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb index 8d8c082612..c2931df201 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb | |||
@@ -9,8 +9,8 @@ LINUX_VERSION ?= "4.9.4" | |||
9 | KMETA = "kernel-meta" | 9 | KMETA = "kernel-meta" |
10 | KCONF_BSP_AUDIT_LEVEL = "2" | 10 | KCONF_BSP_AUDIT_LEVEL = "2" |
11 | 11 | ||
12 | SRCREV_machine ?= "6fdf2bca12625c67b64f39e08b1b4ae7c610f8bd" | 12 | SRCREV_machine ?= "087b65ddac049813eef2513c4440cb1d02971357" |
13 | SRCREV_meta ?= "39aa01a6d4332a8ef746a03246e56a41a69fae99" | 13 | SRCREV_meta ?= "8c71361007816dcabe297f40cd5a38ed5d7d7599" |
14 | 14 | ||
15 | PV = "${LINUX_VERSION}+git${SRCPV}" | 15 | PV = "${LINUX_VERSION}+git${SRCPV}" |
16 | 16 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.9.bb b/meta/recipes-kernel/linux/linux-yocto_4.9.bb index 0ca3d2c8f7..eb3f027e70 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.9.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.9.bb | |||
@@ -11,15 +11,15 @@ KBRANCH_qemux86 ?= "standard/base" | |||
11 | KBRANCH_qemux86-64 ?= "standard/base" | 11 | KBRANCH_qemux86-64 ?= "standard/base" |
12 | KBRANCH_qemumips64 ?= "standard/mti-malta64" | 12 | KBRANCH_qemumips64 ?= "standard/mti-malta64" |
13 | 13 | ||
14 | SRCREV_machine_qemuarm ?= "9027d6fa2661251146c08851a13ca623bc2c1156" | 14 | SRCREV_machine_qemuarm ?= "ebd7956fb8f43632fff9537579d2788532ec5dad" |
15 | SRCREV_machine_qemuarm64 ?= "6fdf2bca12625c67b64f39e08b1b4ae7c610f8bd" | 15 | SRCREV_machine_qemuarm64 ?= "087b65ddac049813eef2513c4440cb1d02971357" |
16 | SRCREV_machine_qemumips ?= "ce10acbd809335dd0c6f697770b3279ae168d145" | 16 | SRCREV_machine_qemumips ?= "2e81d7a5cc2cbfae377f4d07d85c34800c04e3c2" |
17 | SRCREV_machine_qemuppc ?= "6fdf2bca12625c67b64f39e08b1b4ae7c610f8bd" | 17 | SRCREV_machine_qemuppc ?= "087b65ddac049813eef2513c4440cb1d02971357" |
18 | SRCREV_machine_qemux86 ?= "6fdf2bca12625c67b64f39e08b1b4ae7c610f8bd" | 18 | SRCREV_machine_qemux86 ?= "087b65ddac049813eef2513c4440cb1d02971357" |
19 | SRCREV_machine_qemux86-64 ?= "6fdf2bca12625c67b64f39e08b1b4ae7c610f8bd" | 19 | SRCREV_machine_qemux86-64 ?= "087b65ddac049813eef2513c4440cb1d02971357" |
20 | SRCREV_machine_qemumips64 ?= "303f51499cfe9f770c4a843a2042228897cea1b4" | 20 | SRCREV_machine_qemumips64 ?= "af223adb1634de8cb279ff809c6d13266b87e5dc" |
21 | SRCREV_machine ?= "6fdf2bca12625c67b64f39e08b1b4ae7c610f8bd" | 21 | SRCREV_machine ?= "087b65ddac049813eef2513c4440cb1d02971357" |
22 | SRCREV_meta ?= "39aa01a6d4332a8ef746a03246e56a41a69fae99" | 22 | SRCREV_meta ?= "8c71361007816dcabe297f40cd5a38ed5d7d7599" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;name=machine;branch=${KBRANCH}; \ |
25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}" | 25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}" |