diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2019-08-14 11:31:32 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-08-21 15:29:01 +0100 |
commit | abe7b8add804472c2f80b17a61d9c90e3e987c51 (patch) | |
tree | e526088aabe8cf6f876bf3c3f2aefe3e65ecffec /meta | |
parent | 00ad844fe9279cc5c9005e3d096a9f4de0f33a4c (diff) | |
download | poky-abe7b8add804472c2f80b17a61d9c90e3e987c51.tar.gz |
kernel-yocto: import security fragments from meta-security
Adding the following fragments from meta-security to make them
centrally available and easier to maintain:
283939d5c9e kernel-cache: add yama security fragments
0b86f3fa241 kernel-cache: add ima fragments
731b466654d kernel-cache: add smack
813afe8ff47 kernel-cache: add apparmor fragments
(From OE-Core rev: 3063d64984e993d3e7dc2f4c80fb74005f5d6d7e)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_4.19.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.0.bb | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb index 4013a0c2d0..52deb3fc86 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb | |||
@@ -12,7 +12,7 @@ python () { | |||
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "ca2e3322f4c5678eaef6434c808d0842c805d74d" | 14 | SRCREV_machine ?= "ca2e3322f4c5678eaef6434c808d0842c805d74d" |
15 | SRCREV_meta ?= "960be4218436fbbb3500e019f7abf02fa94e6aac" | 15 | SRCREV_meta ?= "283939d5c9ebec9750c34982405a39a9864ac10f" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ | 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ |
18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb index f66ee6f4ad..b214ee0a0a 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb | |||
@@ -12,7 +12,7 @@ python () { | |||
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "e6cb812b5532630b6fc6dfd7778d57a4907d3180" | 14 | SRCREV_machine ?= "e6cb812b5532630b6fc6dfd7778d57a4907d3180" |
15 | SRCREV_meta ?= "96c82f3d7ab25a3f44e517f9dbbb53e2c4c45729" | 15 | SRCREV_meta ?= "7f6e97c357746382d4339e7e0463637e715acd4b" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ | 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ |
18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.0;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.0;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb index 4759d80438..be25d075de 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb | |||
@@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2" | |||
17 | 17 | ||
18 | SRCREV_machine_qemuarm ?= "b5a2efa31290f31384971494031285d394635938" | 18 | SRCREV_machine_qemuarm ?= "b5a2efa31290f31384971494031285d394635938" |
19 | SRCREV_machine ?= "4ec6f255163da37a4c83528e5835b6b9baccee63" | 19 | SRCREV_machine ?= "4ec6f255163da37a4c83528e5835b6b9baccee63" |
20 | SRCREV_meta ?= "960be4218436fbbb3500e019f7abf02fa94e6aac" | 20 | SRCREV_meta ?= "283939d5c9ebec9750c34982405a39a9864ac10f" |
21 | 21 | ||
22 | PV = "${LINUX_VERSION}+git${SRCPV}" | 22 | PV = "${LINUX_VERSION}+git${SRCPV}" |
23 | 23 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb index 42e0dcd603..33672c6d49 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb | |||
@@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2" | |||
17 | 17 | ||
18 | SRCREV_machine_qemuarm ?= "b9001287984b0066814c8739f38d629de73739b7" | 18 | SRCREV_machine_qemuarm ?= "b9001287984b0066814c8739f38d629de73739b7" |
19 | SRCREV_machine ?= "55dd15336b7301b686a0c183f5372b49c1003d03" | 19 | SRCREV_machine ?= "55dd15336b7301b686a0c183f5372b49c1003d03" |
20 | SRCREV_meta ?= "96c82f3d7ab25a3f44e517f9dbbb53e2c4c45729" | 20 | SRCREV_meta ?= "7f6e97c357746382d4339e7e0463637e715acd4b" |
21 | 21 | ||
22 | PV = "${LINUX_VERSION}+git${SRCPV}" | 22 | PV = "${LINUX_VERSION}+git${SRCPV}" |
23 | 23 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.19.bb b/meta/recipes-kernel/linux/linux-yocto_4.19.bb index cee8af7c99..7704bd3e55 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.19.bb | |||
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "4ec6f255163da37a4c83528e5835b6b9baccee63" | |||
19 | SRCREV_machine_qemux86-64 ?= "4ec6f255163da37a4c83528e5835b6b9baccee63" | 19 | SRCREV_machine_qemux86-64 ?= "4ec6f255163da37a4c83528e5835b6b9baccee63" |
20 | SRCREV_machine_qemumips64 ?= "ca47368b698795cd5cada84dbfcceda1f47da1aa" | 20 | SRCREV_machine_qemumips64 ?= "ca47368b698795cd5cada84dbfcceda1f47da1aa" |
21 | SRCREV_machine ?= "4ec6f255163da37a4c83528e5835b6b9baccee63" | 21 | SRCREV_machine ?= "4ec6f255163da37a4c83528e5835b6b9baccee63" |
22 | SRCREV_meta ?= "960be4218436fbbb3500e019f7abf02fa94e6aac" | 22 | SRCREV_meta ?= "283939d5c9ebec9750c34982405a39a9864ac10f" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ |
25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA} \ | 25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA} \ |
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.0.bb b/meta/recipes-kernel/linux/linux-yocto_5.0.bb index ea4b6f5b33..898f824d48 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.0.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.0.bb | |||
@@ -21,7 +21,7 @@ SRCREV_machine_qemux86 ?= "55dd15336b7301b686a0c183f5372b49c1003d03" | |||
21 | SRCREV_machine_qemux86-64 ?= "55dd15336b7301b686a0c183f5372b49c1003d03" | 21 | SRCREV_machine_qemux86-64 ?= "55dd15336b7301b686a0c183f5372b49c1003d03" |
22 | SRCREV_machine_qemumips64 ?= "9d4105b32cf123a861bc754377d2f2e156278a7e" | 22 | SRCREV_machine_qemumips64 ?= "9d4105b32cf123a861bc754377d2f2e156278a7e" |
23 | SRCREV_machine ?= "55dd15336b7301b686a0c183f5372b49c1003d03" | 23 | SRCREV_machine ?= "55dd15336b7301b686a0c183f5372b49c1003d03" |
24 | SRCREV_meta ?= "96c82f3d7ab25a3f44e517f9dbbb53e2c4c45729" | 24 | SRCREV_meta ?= "7f6e97c357746382d4339e7e0463637e715acd4b" |
25 | 25 | ||
26 | # remap qemuarm to qemuarma15 for the 5.0 kernel | 26 | # remap qemuarm to qemuarma15 for the 5.0 kernel |
27 | # KMACHINE_qemuarm ?= "qemuarma15" | 27 | # KMACHINE_qemuarm ?= "qemuarma15" |