diff options
Diffstat (limited to 'meta/recipes-kernel/linux')
| -rw-r--r-- | meta/recipes-kernel/linux/kernel-devsrc.bb | 14 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-dev.bb | 1 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb | 6 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_5.14.bb | 6 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb | 8 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.14.bb | 8 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.10.bb | 29 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.14.bb | 28 |
8 files changed, 56 insertions, 44 deletions
diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb index d39573965f..264726d08c 100644 --- a/meta/recipes-kernel/linux/kernel-devsrc.bb +++ b/meta/recipes-kernel/linux/kernel-devsrc.bb @@ -72,7 +72,9 @@ do_install() { ( cd ${B} - cp Module.symvers $kerneldir/build + if [ -s Module.symvers ]; then + cp Module.symvers $kerneldir/build + fi cp System.map* $kerneldir/build if [ -s Module.markers ]; then cp Module.markers $kerneldir/build @@ -109,8 +111,8 @@ do_install() { fi fi - if [ "${ARCH}" = "arm64" ]; then - cp -a --parents arch/arm64/kernel/vdso/vdso.lds $kerneldir/build/ + if [ "${ARCH}" = "arm64" -o "${ARCH}" = "riscv" ]; then + cp -a --parents arch/${ARCH}/kernel/vdso/vdso.lds $kerneldir/build/ fi if [ "${ARCH}" = "powerpc" ]; then cp -a --parents arch/powerpc/kernel/vdso32/vdso32.lds $kerneldir/build 2>/dev/null || : @@ -185,6 +187,12 @@ do_install() { cp -a --parents arch/${ARCH}/kernel/vdso32/* $kerneldir/build/ 2>/dev/null || : cp -a --parents arch/${ARCH}/kernel/vdso64/* $kerneldir/build/ 2>/dev/null || : fi + if [ "${ARCH}" = "riscv" ]; then + cp -a --parents arch/riscv/kernel/vdso/*gettimeofday.* $kerneldir/build/ + cp -a --parents arch/riscv/kernel/vdso/note.S $kerneldir/build/ + cp -a --parents arch/riscv/kernel/vdso/gen_vdso_offsets.sh $kerneldir/build/ + cp -a --parents arch/riscv/kernel/vdso/* $kerneldir/build/ 2>/dev/null || : + fi # include the machine specific headers for ARM variants, if available. if [ "${ARCH}" = "arm" ]; then diff --git a/meta/recipes-kernel/linux/linux-yocto-dev.bb b/meta/recipes-kernel/linux/linux-yocto-dev.bb index f58b5ab0b8..005b688778 100644 --- a/meta/recipes-kernel/linux/linux-yocto-dev.bb +++ b/meta/recipes-kernel/linux/linux-yocto-dev.bb @@ -38,6 +38,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" +DEPENDS += "gmp-native libmpc-native" COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemumips64|qemux86-64|qemuriscv64)" diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb index e35a91d254..62d7494b88 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "42d1c4e85643d634bddd98e5c4d8a9bcc61b3e18" -SRCREV_meta ?= "f8afd84b117f336477846b9e22178ebefb26c08d" +SRCREV_machine ?= "88b754b80392e1f1ac7df46595f9712edc8aec02" +SRCREV_meta ?= "7767ab05bd3e525a287a7f9bfd780005b5eb25a3" 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.10;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.10.70" +LINUX_VERSION ?= "5.10.113" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.14.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.14.bb index 0baffe6f2f..6f22173b1e 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.14.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "ca5b19aa3996eb1907f546fce7a7fa55053fbead" -SRCREV_meta ?= "884dfea956ec6b166d1f99a295c47338573a974c" +SRCREV_machine ?= "b18aaa90f5ce15336aacf4cc24c7a086aeb4bc84" +SRCREV_meta ?= "f9e349e174542980f72dcd087445d0106b7a5e75" 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.14;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.14.9" +LINUX_VERSION ?= "5.14.21" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb index c92a149d85..e0c693fed2 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.10.70" +LINUX_VERSION ?= "5.10.113" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 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 ?= "71ff272be9e9436f27088fbd494da2de613121ea" -SRCREV_machine ?= "4d1eeccd06dd8d310b238d6350cb0f7d937f4427" -SRCREV_meta ?= "f8afd84b117f336477846b9e22178ebefb26c08d" +SRCREV_machine:qemuarm ?= "7dacc8332b0bc5600d97583f45b841c9724f2191" +SRCREV_machine ?= "8dc46fa883d7b9a3412791f6731096e2e516d949" +SRCREV_meta ?= "7767ab05bd3e525a287a7f9bfd780005b5eb25a3" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.14.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.14.bb index 5ca45ad894..d44fac6094 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.14.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.14.9" +LINUX_VERSION ?= "5.14.21" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 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 ?= "66b3eb63900447948655628e141b54ce0dc3a009" -SRCREV_machine ?= "c4def465fc44a7f5311d9b942d6cdd33cb4804ca" -SRCREV_meta ?= "884dfea956ec6b166d1f99a295c47338573a974c" +SRCREV_machine:qemuarm ?= "159f57f8e022351d5193e51c02c951f2e255db1a" +SRCREV_machine ?= "9d5572038eacda2e2a86e3f743f35ec415319fb4" +SRCREV_meta ?= "f9e349e174542980f72dcd087445d0106b7a5e75" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb index b4ccdb26dc..e05a4769d1 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb @@ -13,17 +13,17 @@ KBRANCH:qemux86 ?= "v5.10/standard/base" KBRANCH:qemux86-64 ?= "v5.10/standard/base" KBRANCH:qemumips64 ?= "v5.10/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "011882741f10bd0c725139baa383eb5a4d833bca" -SRCREV_machine:qemuarm64 ?= "098464b7c0c3d6f2a5b9226aab3245c3fcfb4797" -SRCREV_machine:qemumips ?= "88494c005ab76864e706097056557b5616da65c6" -SRCREV_machine:qemuppc ?= "a2b9c27f431a20ebfcd4146971c9422f4216aa90" -SRCREV_machine:qemuriscv64 ?= "7dda2a9f69de7f80e572d38236896e97be79f39d" -SRCREV_machine:qemuriscv32 ?= "7dda2a9f69de7f80e572d38236896e97be79f39d" -SRCREV_machine:qemux86 ?= "7dda2a9f69de7f80e572d38236896e97be79f39d" -SRCREV_machine:qemux86-64 ?= "7dda2a9f69de7f80e572d38236896e97be79f39d" -SRCREV_machine:qemumips64 ?= "80da62cff32617711767cd6b01f64f1dc14f94d8" -SRCREV_machine ?= "7dda2a9f69de7f80e572d38236896e97be79f39d" -SRCREV_meta ?= "f8afd84b117f336477846b9e22178ebefb26c08d" +SRCREV_machine:qemuarm ?= "6092497574895b1179a3c7a9e07c7f40c2d4c136" +SRCREV_machine:qemuarm64 ?= "97ad6c5f9ffdb6b108cbbf99d9061dd0fe03e4e8" +SRCREV_machine:qemumips ?= "e53b2d1867f7bdc2c0cc904a15992178688c3ad4" +SRCREV_machine:qemuppc ?= "b12ed76165bfc9fe2b99fcc224b5e0134b7b533f" +SRCREV_machine:qemuriscv64 ?= "a8b4c628f382412e5e7df5750f2be711df95fa06" +SRCREV_machine:qemuriscv32 ?= "a8b4c628f382412e5e7df5750f2be711df95fa06" +SRCREV_machine:qemux86 ?= "a8b4c628f382412e5e7df5750f2be711df95fa06" +SRCREV_machine:qemux86-64 ?= "a8b4c628f382412e5e7df5750f2be711df95fa06" +SRCREV_machine:qemumips64 ?= "07580586b738406b4dec9bf91d4eecdb933f2a07" +SRCREV_machine ?= "a8b4c628f382412e5e7df5750f2be711df95fa06" +SRCREV_meta ?= "7767ab05bd3e525a287a7f9bfd780005b5eb25a3" # remap qemuarm to qemuarma15 for the 5.8 kernel # KMACHINE:qemuarm ?= "qemuarma15" @@ -32,11 +32,11 @@ 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.10;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "5.10.70" +LINUX_VERSION ?= "5.10.113" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -DEPENDS += "gmp-native" +DEPENDS += "gmp-native libmpc-native" PV = "${LINUX_VERSION}+git${SRCPV}" @@ -53,6 +53,9 @@ KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}" 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:powerpc =" arch/powerpc/powerpc-debug.scc" +KERNEL_FEATURES:append:powerpc64 =" arch/powerpc/powerpc-debug.scc" +KERNEL_FEATURES:append:powerpc64le =" arch/powerpc/powerpc-debug.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/meta/recipes-kernel/linux/linux-yocto_5.14.bb b/meta/recipes-kernel/linux/linux-yocto_5.14.bb index f1d353072c..b5be96b7c9 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.14.bb @@ -13,17 +13,17 @@ KBRANCH:qemux86 ?= "v5.14/standard/base" KBRANCH:qemux86-64 ?= "v5.14/standard/base" KBRANCH:qemumips64 ?= "v5.14/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "c3a887f62f231d6b31f0209712014f9cbc7fd77e" -SRCREV_machine:qemuarm64 ?= "c4def465fc44a7f5311d9b942d6cdd33cb4804ca" -SRCREV_machine:qemumips ?= "77174bdf6581bdb93f0f458601364800670f8531" -SRCREV_machine:qemuppc ?= "c4def465fc44a7f5311d9b942d6cdd33cb4804ca" -SRCREV_machine:qemuriscv64 ?= "c4def465fc44a7f5311d9b942d6cdd33cb4804ca" -SRCREV_machine:qemuriscv32 ?= "c4def465fc44a7f5311d9b942d6cdd33cb4804ca" -SRCREV_machine:qemux86 ?= "c4def465fc44a7f5311d9b942d6cdd33cb4804ca" -SRCREV_machine:qemux86-64 ?= "c4def465fc44a7f5311d9b942d6cdd33cb4804ca" -SRCREV_machine:qemumips64 ?= "e86c3a6ad2fde78ad03e0b899286bf603756207d" -SRCREV_machine ?= "c4def465fc44a7f5311d9b942d6cdd33cb4804ca" -SRCREV_meta ?= "884dfea956ec6b166d1f99a295c47338573a974c" +SRCREV_machine:qemuarm ?= "5ca7fd91b258a07ed1b6f38593ff8c48cc574b1c" +SRCREV_machine:qemuarm64 ?= "9d5572038eacda2e2a86e3f743f35ec415319fb4" +SRCREV_machine:qemumips ?= "1e7a6d0d29015bf1f383cf5f52fc451c1969561d" +SRCREV_machine:qemuppc ?= "9d5572038eacda2e2a86e3f743f35ec415319fb4" +SRCREV_machine:qemuriscv64 ?= "9d5572038eacda2e2a86e3f743f35ec415319fb4" +SRCREV_machine:qemuriscv32 ?= "9d5572038eacda2e2a86e3f743f35ec415319fb4" +SRCREV_machine:qemux86 ?= "9d5572038eacda2e2a86e3f743f35ec415319fb4" +SRCREV_machine:qemux86-64 ?= "9d5572038eacda2e2a86e3f743f35ec415319fb4" +SRCREV_machine:qemumips64 ?= "f6646a344afbf6cacc91cbeaaec4240b372dd192" +SRCREV_machine ?= "9d5572038eacda2e2a86e3f743f35ec415319fb4" +SRCREV_meta ?= "f9e349e174542980f72dcd087445d0106b7a5e75" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the <version>/base branch, which is pure upstream -stable, and the same @@ -31,7 +31,7 @@ SRCREV_meta ?= "884dfea956ec6b166d1f99a295c47338573a974c" # normal PREFERRED_VERSION settings. BBCLASSEXTEND = "devupstream:target" DEFAULT_PREFERENCE:class-devupstream = "-1" -SRCREV_machine:class-devupstream ?= "70248e7b378b96f208d5544ee25b808a8ef2ddc2" +SRCREV_machine:class-devupstream ?= "545728d9e08593767dd55192b0324dd4f9b71151" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v5.14/base" @@ -42,11 +42,11 @@ 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.14;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "5.14.9" +LINUX_VERSION ?= "5.14.21" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -DEPENDS += "gmp-native" +DEPENDS += "gmp-native libmpc-native" PV = "${LINUX_VERSION}+git${SRCPV}" |