diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2023-10-19 11:41:57 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-10-19 17:01:04 +0100 |
commit | 482c4d0a95115581de545d917885b7ef923680d8 (patch) | |
tree | 9ce8516d7fa313a6ec3c71d69416df7afad4cebf /meta | |
parent | 53c006ba1a4982db8af3e7b4ff91cd1f64f9f2d4 (diff) | |
download | poky-482c4d0a95115581de545d917885b7ef923680d8.tar.gz |
linux-yocto/6.5: config: remove VIDEO_STK1160_COMMON
Integrating the following commit(s) to linux-yocto/.:
4531e74daf0 media/media-usb-tv.cfg: remove VIDEO_STK1160_COMMON
(From OE-Core rev: 40f2edd66afe5e5af607e110da78eb0a4a0b9cb9)
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_6.5.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_6.5.bb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb index ff61a33db6..985490e5e5 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb | |||
@@ -15,7 +15,7 @@ python () { | |||
15 | } | 15 | } |
16 | 16 | ||
17 | SRCREV_machine ?= "541ff832e9f2a168145f96ff41857a6cf1c74289" | 17 | SRCREV_machine ?= "541ff832e9f2a168145f96ff41857a6cf1c74289" |
18 | SRCREV_meta ?= "7686d2c442df26daa77f91098f7fac8fdf5b35d7" | 18 | SRCREV_meta ?= "9af846da534077c91e3c42242fceba7aef8dd784" |
19 | 19 | ||
20 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ | 20 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ |
21 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.5;destsuffix=${KMETA};protocol=https" | 21 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.5;destsuffix=${KMETA};protocol=https" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb index 6ed9972549..e2214851ab 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb | |||
@@ -18,7 +18,7 @@ KMETA = "kernel-meta" | |||
18 | KCONF_BSP_AUDIT_LEVEL = "2" | 18 | KCONF_BSP_AUDIT_LEVEL = "2" |
19 | 19 | ||
20 | SRCREV_machine ?= "8ad515e79001700d5e3d36e6ffe37ebdae2b5cd4" | 20 | SRCREV_machine ?= "8ad515e79001700d5e3d36e6ffe37ebdae2b5cd4" |
21 | SRCREV_meta ?= "7686d2c442df26daa77f91098f7fac8fdf5b35d7" | 21 | SRCREV_meta ?= "9af846da534077c91e3c42242fceba7aef8dd784" |
22 | 22 | ||
23 | PV = "${LINUX_VERSION}+git" | 23 | PV = "${LINUX_VERSION}+git" |
24 | 24 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.5.bb b/meta/recipes-kernel/linux/linux-yocto_6.5.bb index f63b93ce49..bd99b54bce 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.5.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.5.bb | |||
@@ -29,7 +29,7 @@ SRCREV_machine:qemux86 ?= "79a314e29b53062b4dfd316569d5480ee0d19249" | |||
29 | SRCREV_machine:qemux86-64 ?= "79a314e29b53062b4dfd316569d5480ee0d19249" | 29 | SRCREV_machine:qemux86-64 ?= "79a314e29b53062b4dfd316569d5480ee0d19249" |
30 | SRCREV_machine:qemumips64 ?= "59ac3aaf836bd355d0f9f734e7bcca3dde44573a" | 30 | SRCREV_machine:qemumips64 ?= "59ac3aaf836bd355d0f9f734e7bcca3dde44573a" |
31 | SRCREV_machine ?= "79a314e29b53062b4dfd316569d5480ee0d19249" | 31 | SRCREV_machine ?= "79a314e29b53062b4dfd316569d5480ee0d19249" |
32 | SRCREV_meta ?= "7686d2c442df26daa77f91098f7fac8fdf5b35d7" | 32 | SRCREV_meta ?= "9af846da534077c91e3c42242fceba7aef8dd784" |
33 | 33 | ||
34 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll | 34 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll |
35 | # get the <version>/base branch, which is pure upstream -stable, and the same | 35 | # get the <version>/base branch, which is pure upstream -stable, and the same |