diff options
Diffstat (limited to 'poky/meta/recipes-kernel/linux')
-rw-r--r-- | poky/meta/recipes-kernel/linux/kernel-devsrc.bb | 2 | ||||
-rw-r--r-- | poky/meta/recipes-kernel/linux/linux-dummy.bb | 2 | ||||
-rw-r--r-- | poky/meta/recipes-kernel/linux/linux-yocto-dev.bb | 2 | ||||
-rw-r--r-- | poky/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb (renamed from poky/meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb) | 13 | ||||
-rw-r--r-- | poky/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 7 | ||||
-rw-r--r-- | poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb (renamed from poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb) | 14 | ||||
-rw-r--r-- | poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 8 | ||||
-rw-r--r-- | poky/meta/recipes-kernel/linux/linux-yocto_5.10.bb (renamed from poky/meta/recipes-kernel/linux/linux-yocto_5.8.bb) | 45 | ||||
-rw-r--r-- | poky/meta/recipes-kernel/linux/linux-yocto_5.4.bb | 23 |
9 files changed, 60 insertions, 56 deletions
diff --git a/poky/meta/recipes-kernel/linux/kernel-devsrc.bb b/poky/meta/recipes-kernel/linux/kernel-devsrc.bb index 8a900ed18..dadeade3a 100644 --- a/poky/meta/recipes-kernel/linux/kernel-devsrc.bb +++ b/poky/meta/recipes-kernel/linux/kernel-devsrc.bb @@ -186,7 +186,7 @@ do_install() { cp -a --parents $SYSCALL_TOOLS $kerneldir/build/ fi - cp -a --parents arch/arm/kernel/module.lds $kerneldir/build/ + cp -a --parents arch/arm/kernel/module.lds $kerneldir/build/ 2>/dev/null || : fi if [ -d arch/${ARCH}/include ]; then diff --git a/poky/meta/recipes-kernel/linux/linux-dummy.bb b/poky/meta/recipes-kernel/linux/linux-dummy.bb index 649fc04dd..95dc85ff2 100644 --- a/poky/meta/recipes-kernel/linux/linux-dummy.bb +++ b/poky/meta/recipes-kernel/linux/linux-dummy.bb @@ -26,7 +26,7 @@ DESCRIPTION_kernel-vmlinux = "Kernel vmlinux meta package" INHIBIT_DEFAULT_DEPS = "1" -#COMPATIBLE_MACHINE = "your_machine" +COMPATIBLE_HOST = ".*-linux" PR = "r1" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb b/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb index 6272af625..95ac6e0a4 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb @@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name SRCREV_machine ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}' SRCREV_meta ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}' -LINUX_VERSION ?= "5.10-rc+" +LINUX_VERSION ?= "5.11-rc+" LINUX_VERSION_EXTENSION ?= "-yoctodev-${LINUX_KERNEL_TYPE}" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb index 033dfc76a..1f1745c63 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb @@ -1,4 +1,4 @@ -KBRANCH ?= "v5.8/standard/preempt-rt/base" +KBRANCH ?= "v5.10/standard/preempt-rt/base" require recipes-kernel/linux/linux-yocto.inc @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "3c5d210805d61bea8f8a8081e0e3a89ea8a61f3f" -SRCREV_meta ?= "7883b60d324029d26020c0b3f826b35c52fd9674" +SRCREV_machine ?= "1033d642fd93675a91beae3c594d1e1078191ece" +SRCREV_meta ?= "5833ca701711d487c9094bd1efc671e8ef7d001e" 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.8;destsuffix=${KMETA}" + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.8.18" +LINUX_VERSION ?= "5.10.12" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" @@ -27,7 +27,7 @@ DEPENDS += "openssl-native util-linux-native" PV = "${LINUX_VERSION}+git${SRCPV}" KMETA = "kernel-meta" -KCONF_BSP_AUDIT_LEVEL = "2" +KCONF_BSP_AUDIT_LEVEL = "1" LINUX_KERNEL_TYPE = "preempt-rt" @@ -42,3 +42,4 @@ KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}" +KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb index 104ada2db..b7b986acd 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "97576fb7447efba82eb025bde3ae9ceb29939d5e" -SRCREV_meta ?= "d626f9108d590d41e82b97cbffc380aa699e86e1" +SRCREV_machine ?= "84a6ec1f97d6b6afebe3514e772536342a4189fc" +SRCREV_meta ?= "e120076c07e69166ebeac0eee011c085bbde2139" 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.4;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.4.78" +LINUX_VERSION ?= "5.4.94" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" @@ -42,3 +42,4 @@ KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}" +KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb index 50cee0762..9c0ac98a9 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb @@ -1,12 +1,12 @@ -KBRANCH ?= "v5.8/standard/tiny/base" -KBRANCH_qemuarm ?= "v5.8/standard/tiny/arm-versatile-926ejs" +KBRANCH ?= "v5.10/standard/tiny/base" +KBRANCH_qemuarm ?= "v5.10/standard/tiny/arm-versatile-926ejs" LINUX_KERNEL_TYPE = "tiny" KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.8.18" +LINUX_VERSION ?= "5.10.12" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,14 +15,14 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "9509db6e3ed6a23b1f7495b53248d1cbfe22710b" -SRCREV_machine ?= "3c5d210805d61bea8f8a8081e0e3a89ea8a61f3f" -SRCREV_meta ?= "7883b60d324029d26020c0b3f826b35c52fd9674" +SRCREV_machine_qemuarm ?= "acfa890cd51fe66cdcee10c0eb031a07da423a3c" +SRCREV_machine ?= "cdca78778415b4b3bd64e8390ee8adf04bf7e17a" +SRCREV_meta ?= "5833ca701711d487c9094bd1efc671e8ef7d001e" PV = "${LINUX_VERSION}+git${SRCPV}" 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.8;destsuffix=${KMETA}" + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarmv5" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb index d8784c49a..bd21c619c 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.4.78" +LINUX_VERSION ?= "5.4.94" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "6cf3b1d30bc7ac9bd86190129b3cbbdd04b8b236" -SRCREV_machine ?= "370ef947d5b1470e858bae5a300110566c994b9f" -SRCREV_meta ?= "d626f9108d590d41e82b97cbffc380aa699e86e1" +SRCREV_machine_qemuarm ?= "768311f24c5d817e7cb9ee0803790ee284e9ff30" +SRCREV_machine ?= "31db2b47ac7d8508080fbb7344399b501216de66" +SRCREV_meta ?= "e120076c07e69166ebeac0eee011c085bbde2139" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto_5.8.bb b/poky/meta/recipes-kernel/linux/linux-yocto_5.10.bb index af576891e..b56dadea6 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto_5.8.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto_5.10.bb @@ -1,36 +1,36 @@ -KBRANCH ?= "v5.8/standard/base" +KBRANCH ?= "v5.10/standard/base" require recipes-kernel/linux/linux-yocto.inc # board specific branches -KBRANCH_qemuarm ?= "v5.8/standard/arm-versatile-926ejs" -KBRANCH_qemuarm64 ?= "v5.8/standard/qemuarm64" -KBRANCH_qemumips ?= "v5.8/standard/mti-malta32" -KBRANCH_qemuppc ?= "v5.8/standard/qemuppc" -KBRANCH_qemuriscv64 ?= "v5.8/standard/base" -KBRANCH_qemux86 ?= "v5.8/standard/base" -KBRANCH_qemux86-64 ?= "v5.8/standard/base" -KBRANCH_qemumips64 ?= "v5.8/standard/mti-malta64" - -SRCREV_machine_qemuarm ?= "14b463d0e5c1e2ff354244420f9bbc7f0ab80533" -SRCREV_machine_qemuarm64 ?= "3c5d210805d61bea8f8a8081e0e3a89ea8a61f3f" -SRCREV_machine_qemumips ?= "8d8d9afb396f154f366f32948fdff3cf4e269841" -SRCREV_machine_qemuppc ?= "3c5d210805d61bea8f8a8081e0e3a89ea8a61f3f" -SRCREV_machine_qemuriscv64 ?= "3c5d210805d61bea8f8a8081e0e3a89ea8a61f3f" -SRCREV_machine_qemux86 ?= "3c5d210805d61bea8f8a8081e0e3a89ea8a61f3f" -SRCREV_machine_qemux86-64 ?= "3c5d210805d61bea8f8a8081e0e3a89ea8a61f3f" -SRCREV_machine_qemumips64 ?= "01a02b058f9a8941032b298b8d25c673526152f4" -SRCREV_machine ?= "3c5d210805d61bea8f8a8081e0e3a89ea8a61f3f" -SRCREV_meta ?= "7883b60d324029d26020c0b3f826b35c52fd9674" +KBRANCH_qemuarm ?= "v5.10/standard/arm-versatile-926ejs" +KBRANCH_qemuarm64 ?= "v5.10/standard/qemuarm64" +KBRANCH_qemumips ?= "v5.10/standard/mti-malta32" +KBRANCH_qemuppc ?= "v5.10/standard/qemuppc" +KBRANCH_qemuriscv64 ?= "v5.10/standard/base" +KBRANCH_qemux86 ?= "v5.10/standard/base" +KBRANCH_qemux86-64 ?= "v5.10/standard/base" +KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64" + +SRCREV_machine_qemuarm ?= "3ea1273f3112f558eb8176bfc67b8dd65a3b16ac" +SRCREV_machine_qemuarm64 ?= "cdca78778415b4b3bd64e8390ee8adf04bf7e17a" +SRCREV_machine_qemumips ?= "9685593f232f431e8fc3a756d4fcb50ee3c6dea1" +SRCREV_machine_qemuppc ?= "cdca78778415b4b3bd64e8390ee8adf04bf7e17a" +SRCREV_machine_qemuriscv64 ?= "cdca78778415b4b3bd64e8390ee8adf04bf7e17a" +SRCREV_machine_qemux86 ?= "cdca78778415b4b3bd64e8390ee8adf04bf7e17a" +SRCREV_machine_qemux86-64 ?= "cdca78778415b4b3bd64e8390ee8adf04bf7e17a" +SRCREV_machine_qemumips64 ?= "3bf957724edd501fbb634e271224b49aaf186bba" +SRCREV_machine ?= "cdca78778415b4b3bd64e8390ee8adf04bf7e17a" +SRCREV_meta ?= "5833ca701711d487c9094bd1efc671e8ef7d001e" # remap qemuarm to qemuarma15 for the 5.8 kernel # KMACHINE_qemuarm ?= "qemuarma15" 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-5.8;destsuffix=${KMETA}" + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "5.8.18" +LINUX_VERSION ?= "5.10.12" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" @@ -53,3 +53,4 @@ KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}" KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}" +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/poky/meta/recipes-kernel/linux/linux-yocto_5.4.bb index c24e5ddc8..656f97c03 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto_5.4.bb @@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.4/standard/base" KBRANCH_qemux86-64 ?= "v5.4/standard/base" KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "b3bafed66cf1be24caaa9c876d7d9a8298df831b" -SRCREV_machine_qemuarm64 ?= "370ef947d5b1470e858bae5a300110566c994b9f" -SRCREV_machine_qemumips ?= "36c2a0b1caef0b2dd6b5777d1939c383238536a8" -SRCREV_machine_qemuppc ?= "370ef947d5b1470e858bae5a300110566c994b9f" -SRCREV_machine_qemuriscv64 ?= "370ef947d5b1470e858bae5a300110566c994b9f" -SRCREV_machine_qemux86 ?= "370ef947d5b1470e858bae5a300110566c994b9f" -SRCREV_machine_qemux86-64 ?= "370ef947d5b1470e858bae5a300110566c994b9f" -SRCREV_machine_qemumips64 ?= "971a3cedf9a2a7774fa072b9a13380fb59fd605b" -SRCREV_machine ?= "370ef947d5b1470e858bae5a300110566c994b9f" -SRCREV_meta ?= "d626f9108d590d41e82b97cbffc380aa699e86e1" +SRCREV_machine_qemuarm ?= "17b04c3b496d6a89d5de8ef97ce8c2675ac19814" +SRCREV_machine_qemuarm64 ?= "31db2b47ac7d8508080fbb7344399b501216de66" +SRCREV_machine_qemumips ?= "4b4534a5bb1e765574349baf31dddceb521e6bec" +SRCREV_machine_qemuppc ?= "31db2b47ac7d8508080fbb7344399b501216de66" +SRCREV_machine_qemuriscv64 ?= "31db2b47ac7d8508080fbb7344399b501216de66" +SRCREV_machine_qemux86 ?= "31db2b47ac7d8508080fbb7344399b501216de66" +SRCREV_machine_qemux86-64 ?= "31db2b47ac7d8508080fbb7344399b501216de66" +SRCREV_machine_qemumips64 ?= "a3b16f0dc7b90e68e5a7d38e0ab70cbe290ec9a6" +SRCREV_machine ?= "31db2b47ac7d8508080fbb7344399b501216de66" +SRCREV_meta ?= "e120076c07e69166ebeac0eee011c085bbde2139" # remap qemuarm to qemuarma15 for the 5.4 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "5.4.78" +LINUX_VERSION ?= "5.4.94" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" @@ -52,3 +52,4 @@ KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}" KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}" +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}" |