diff options
| author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-06-07 09:59:35 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-06-18 16:34:40 +0100 |
| commit | e939a933d3c59761a6071b6aa983f113d59bff3a (patch) | |
| tree | 3864923ff80ff1e09c893c02d319fa7c5f446018 | |
| parent | cc852b651e5366ac1a55414a3883a121819a8b4c (diff) | |
| download | poky-e939a933d3c59761a6071b6aa983f113d59bff3a.tar.gz | |
linux-yocto/5.15: cfg/xen: Move x86 configs to separate file
Integrating the following commit(s) to linux-yocto/.:
ad633e22764 features/xen: Move x86 configs to separate file
(From OE-Core rev: 6b82997af3b2dae330c804e5bb3da973cf8fdb28)
Signed-off-by: Kamil Dziezyk <kamil.dziezyk@arm.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit a13622703747eb1d7bc4085693d468c2772441b5)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.15.bb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb index 059c0e9a99..034656017c 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb | |||
| @@ -12,7 +12,7 @@ python () { | |||
| 12 | } | 12 | } |
| 13 | 13 | ||
| 14 | SRCREV_machine ?= "0349dadc971ea2a9ad780b9be95df3c7b9f08eac" | 14 | SRCREV_machine ?= "0349dadc971ea2a9ad780b9be95df3c7b9f08eac" |
| 15 | SRCREV_meta ?= "529199264800b52ae173fc91241c8e64615850e3" | 15 | SRCREV_meta ?= "ad633e2276497d00ecc9b7dab7ce03e429cb2f39" |
| 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.15;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb index 40212beed9..e9991a66fa 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb | |||
| @@ -15,7 +15,7 @@ KMETA = "kernel-meta" | |||
| 15 | KCONF_BSP_AUDIT_LEVEL = "2" | 15 | KCONF_BSP_AUDIT_LEVEL = "2" |
| 16 | 16 | ||
| 17 | SRCREV_machine ?= "bec753cf26f9924ed9e4e583032687e4a2a947f4" | 17 | SRCREV_machine ?= "bec753cf26f9924ed9e4e583032687e4a2a947f4" |
| 18 | SRCREV_meta ?= "529199264800b52ae173fc91241c8e64615850e3" | 18 | SRCREV_meta ?= "ad633e2276497d00ecc9b7dab7ce03e429cb2f39" |
| 19 | 19 | ||
| 20 | PV = "${LINUX_VERSION}+git${SRCPV}" | 20 | PV = "${LINUX_VERSION}+git${SRCPV}" |
| 21 | 21 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb index 2128f85355..b7fdaebd3e 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb | |||
| @@ -23,7 +23,7 @@ SRCREV_machine:qemux86 ?= "41470215f97ee60487e6c36b562c5b7ecb8a8c7d" | |||
| 23 | SRCREV_machine:qemux86-64 ?= "41470215f97ee60487e6c36b562c5b7ecb8a8c7d" | 23 | SRCREV_machine:qemux86-64 ?= "41470215f97ee60487e6c36b562c5b7ecb8a8c7d" |
| 24 | SRCREV_machine:qemumips64 ?= "cc95aac05d6fb9f0fbe1c336127568df916e2fed" | 24 | SRCREV_machine:qemumips64 ?= "cc95aac05d6fb9f0fbe1c336127568df916e2fed" |
| 25 | SRCREV_machine ?= "41470215f97ee60487e6c36b562c5b7ecb8a8c7d" | 25 | SRCREV_machine ?= "41470215f97ee60487e6c36b562c5b7ecb8a8c7d" |
| 26 | SRCREV_meta ?= "529199264800b52ae173fc91241c8e64615850e3" | 26 | SRCREV_meta ?= "ad633e2276497d00ecc9b7dab7ce03e429cb2f39" |
| 27 | 27 | ||
| 28 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll | 28 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll |
| 29 | # get the <version>/base branch, which is pure upstream -stable, and the same | 29 | # get the <version>/base branch, which is pure upstream -stable, and the same |
