diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2016-02-18 16:56:23 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-19 15:33:02 +0000 |
commit | 7e19f88e13b8433721797084c4f02d4d08050da5 (patch) | |
tree | 1c3c8f57fc76464541dfea998391656c3e3f2c96 /meta/recipes-kernel | |
parent | 54bfbcc6c92cb663aefa626e8febb8f853f72a93 (diff) | |
download | poky-7e19f88e13b8433721797084c4f02d4d08050da5.tar.gz |
linux-yocto/4.1: capabilities backports
Backporting the following upstream commits to the 4.1 yocto tree:
bdf4565e5dcc capabilities: add a securebit to disable PR_CAP_AMBIENT_RAISE
2483c95caedc selftests/capabilities: Add tests for capability evolution
4c274aa74e5d capabilities: ambient capabilities
(From OE-Core rev: e864caec7a9b522d86d164ffbaadaa4ea7de0f9b)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_4.1.bb | 16 |
3 files changed, 10 insertions, 10 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb index 52a8a7f335..3dd8959895 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb | |||
@@ -2,7 +2,7 @@ KBRANCH ?= "standard/preempt-rt/base" | |||
2 | 2 | ||
3 | require recipes-kernel/linux/linux-yocto.inc | 3 | require recipes-kernel/linux/linux-yocto.inc |
4 | 4 | ||
5 | SRCREV_machine ?= "c0e9b50e9f871ae73a3efafebf2fe1ceb0adbe85" | 5 | SRCREV_machine ?= "132d72a980837eccc082d5dfb9c5eb5596611b0b" |
6 | SRCREV_meta ?= "79dbb64d9e179718369a7a5c7b364fda9936571f" | 6 | SRCREV_meta ?= "79dbb64d9e179718369a7a5c7b364fda9936571f" |
7 | 7 | ||
8 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \ | 8 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \ |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb index d0970cb4c8..4fde066eeb 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | |||
@@ -9,7 +9,7 @@ LINUX_VERSION ?= "4.1.17" | |||
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 ?= "a5327464dad92042f79dd5fb12523d16780980fb" | 12 | SRCREV_machine ?= "bdf4565e5dcc1ad65e26cebdff7bf427289f1d61" |
13 | SRCREV_meta ?= "79dbb64d9e179718369a7a5c7b364fda9936571f" | 13 | SRCREV_meta ?= "79dbb64d9e179718369a7a5c7b364fda9936571f" |
14 | 14 | ||
15 | PV = "${LINUX_VERSION}+git${SRCPV}" | 15 | PV = "${LINUX_VERSION}+git${SRCPV}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.1.bb b/meta/recipes-kernel/linux/linux-yocto_4.1.bb index 12e1b82029..9f3ad5c663 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.1.bb | |||
@@ -11,14 +11,14 @@ 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 ?= "5f2bc8d122ac2247d5a01025f73d09ae723efb21" | 14 | SRCREV_machine_qemuarm ?= "fc38bc54e15ab2943507b63e740c576f5537fbc0" |
15 | SRCREV_machine_qemuarm64 ?= "a5327464dad92042f79dd5fb12523d16780980fb" | 15 | SRCREV_machine_qemuarm64 ?= "bdf4565e5dcc1ad65e26cebdff7bf427289f1d61" |
16 | SRCREV_machine_qemumips ?= "6e4bc756e0289b9f1869bfb5d84f033df2437d0b" | 16 | SRCREV_machine_qemumips ?= "d7d76bf246979d635990a05961886292ddcb5600" |
17 | SRCREV_machine_qemuppc ?= "a5327464dad92042f79dd5fb12523d16780980fb" | 17 | SRCREV_machine_qemuppc ?= "bdf4565e5dcc1ad65e26cebdff7bf427289f1d61" |
18 | SRCREV_machine_qemux86 ?= "a5327464dad92042f79dd5fb12523d16780980fb" | 18 | SRCREV_machine_qemux86 ?= "bdf4565e5dcc1ad65e26cebdff7bf427289f1d61" |
19 | SRCREV_machine_qemux86-64 ?= "a5327464dad92042f79dd5fb12523d16780980fb" | 19 | SRCREV_machine_qemux86-64 ?= "bdf4565e5dcc1ad65e26cebdff7bf427289f1d61" |
20 | SRCREV_machine_qemumips64 ?= "e83d6e6fcfc04591109e470e55532d25a2a1bef1" | 20 | SRCREV_machine_qemumips64 ?= "84dd3ffed15ebb59e6d396343ced2450f0f10379" |
21 | SRCREV_machine ?= "a5327464dad92042f79dd5fb12523d16780980fb" | 21 | SRCREV_machine ?= "bdf4565e5dcc1ad65e26cebdff7bf427289f1d61" |
22 | SRCREV_meta ?= "79dbb64d9e179718369a7a5c7b364fda9936571f" | 22 | SRCREV_meta ?= "79dbb64d9e179718369a7a5c7b364fda9936571f" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \ |