From 3063d64984e993d3e7dc2f4c80fb74005f5d6d7e Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 14 Aug 2019 11:31:32 -0400 Subject: 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 Signed-off-by: Armin Kuster Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_4.19.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_5.0.bb | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'meta/recipes-kernel/linux') 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 () { } SRCREV_machine ?= "ca2e3322f4c5678eaef6434c808d0842c805d74d" -SRCREV_meta ?= "960be4218436fbbb3500e019f7abf02fa94e6aac" +SRCREV_meta ?= "283939d5c9ebec9750c34982405a39a9864ac10f" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ 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 () { } SRCREV_machine ?= "e6cb812b5532630b6fc6dfd7778d57a4907d3180" -SRCREV_meta ?= "96c82f3d7ab25a3f44e517f9dbbb53e2c4c45729" +SRCREV_meta ?= "7f6e97c357746382d4339e7e0463637e715acd4b" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ 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" SRCREV_machine_qemuarm ?= "b5a2efa31290f31384971494031285d394635938" SRCREV_machine ?= "4ec6f255163da37a4c83528e5835b6b9baccee63" -SRCREV_meta ?= "960be4218436fbbb3500e019f7abf02fa94e6aac" +SRCREV_meta ?= "283939d5c9ebec9750c34982405a39a9864ac10f" PV = "${LINUX_VERSION}+git${SRCPV}" 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" SRCREV_machine_qemuarm ?= "b9001287984b0066814c8739f38d629de73739b7" SRCREV_machine ?= "55dd15336b7301b686a0c183f5372b49c1003d03" -SRCREV_meta ?= "96c82f3d7ab25a3f44e517f9dbbb53e2c4c45729" +SRCREV_meta ?= "7f6e97c357746382d4339e7e0463637e715acd4b" PV = "${LINUX_VERSION}+git${SRCPV}" 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" SRCREV_machine_qemux86-64 ?= "4ec6f255163da37a4c83528e5835b6b9baccee63" SRCREV_machine_qemumips64 ?= "ca47368b698795cd5cada84dbfcceda1f47da1aa" SRCREV_machine ?= "4ec6f255163da37a4c83528e5835b6b9baccee63" -SRCREV_meta ?= "960be4218436fbbb3500e019f7abf02fa94e6aac" +SRCREV_meta ?= "283939d5c9ebec9750c34982405a39a9864ac10f" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ 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" SRCREV_machine_qemux86-64 ?= "55dd15336b7301b686a0c183f5372b49c1003d03" SRCREV_machine_qemumips64 ?= "9d4105b32cf123a861bc754377d2f2e156278a7e" SRCREV_machine ?= "55dd15336b7301b686a0c183f5372b49c1003d03" -SRCREV_meta ?= "96c82f3d7ab25a3f44e517f9dbbb53e2c4c45729" +SRCREV_meta ?= "7f6e97c357746382d4339e7e0463637e715acd4b" # remap qemuarm to qemuarma15 for the 5.0 kernel # KMACHINE_qemuarm ?= "qemuarma15" -- cgit 1.2.3-korg