diff options
Diffstat (limited to 'external/poky/meta/recipes-kernel/linux')
12 files changed, 136 insertions, 233 deletions
diff --git a/external/poky/meta/recipes-kernel/linux/kernel-devsrc.bb b/external/poky/meta/recipes-kernel/linux/kernel-devsrc.bb index ec5cf099..5940cc90 100644 --- a/external/poky/meta/recipes-kernel/linux/kernel-devsrc.bb +++ b/external/poky/meta/recipes-kernel/linux/kernel-devsrc.bb @@ -32,7 +32,7 @@ B = "${STAGING_KERNEL_BUILDDIR}" PACKAGE_ARCH = "${MACHINE_ARCH}" -KERNEL_BUILD_ROOT="/lib/modules/" +KERNEL_BUILD_ROOT="${nonarch_base_libdir}/modules/" do_install() { kerneldir=${D}${KERNEL_BUILD_ROOT}${KERNEL_VERSION} @@ -48,7 +48,7 @@ do_install() { mkdir -p ${D}/usr/src ( cd ${D}/usr/src - ln -s ${KERNEL_BUILD_ROOT}${KERNEL_VERSION}/source kernel + lnr ${D}${KERNEL_BUILD_ROOT}${KERNEL_VERSION}/source kernel ) # for on target purposes, we unify build and source @@ -62,16 +62,9 @@ do_install() { cd ${S} cp --parents $(find -type f -name "Makefile*" -o -name "Kconfig*") $kerneldir/build cp --parents $(find -type f -name "Build" -o -name "Build.include") $kerneldir/build - - # Copy localversion file if any to keep correct version magic after - # modules_prepare. - if [ -f *localversion* ]; then - cp *localversion* $kerneldir/build - fi ) # then drop all but the needed Makefiles/Kconfig files - rm -rf $kerneldir/build/Documentation rm -rf $kerneldir/build/scripts rm -rf $kerneldir/build/include @@ -85,7 +78,7 @@ do_install() { cp Module.markers $kerneldir/build fi - cp .config $kerneldir/build + cp -a .config $kerneldir/build # This scripts copy blow up QA, so for now, we require a more # complex 'make scripts' to restore these, versus copying them @@ -135,11 +128,12 @@ do_install() { # extra files, just in case cp -a --parents tools/objtool/* $kerneldir/build/ - cp -a --parents tools/lib/str_error_r.c $kerneldir/build/ - cp -a --parents tools/lib/string.c $kerneldir/build/ + cp -a --parents tools/lib/* $kerneldir/build/ cp -a --parents tools/lib/subcmd/* $kerneldir/build/ cp -a --parents tools/include/* $kerneldir/build/ + + cp -a --parents $(find tools/arch/${ARCH}/ -type f) $kerneldir/build/ fi if [ "${ARCH}" = "arm64" ]; then @@ -148,12 +142,19 @@ do_install() { # arch/arm64/include/asm/opcodes.h references arch/arm cp -a --parents arch/arm/include/asm/opcodes.h $kerneldir/build/ - cp -a --parents arch/arm64/kernel/vdso/gettimeofday.S $kerneldir/build/ + cp -a --parents arch/arm64/kernel/vdso/*gettimeofday.* $kerneldir/build/ cp -a --parents arch/arm64/kernel/vdso/sigreturn.S $kerneldir/build/ cp -a --parents arch/arm64/kernel/vdso/note.S $kerneldir/build/ cp -a --parents arch/arm64/kernel/vdso/gen_vdso_offsets.sh $kerneldir/build/ - cp -a --parents arch/arm64/kernel/module.lds $kerneldir/build/ + cp -a --parents arch/arm64/kernel/module.lds $kerneldir/build/ 2>/dev/null || : + fi + + if [ "${ARCH}" = "powerpc" ]; then + # 5.0 needs these files, but don't error if they aren't present in the source + cp -a --parents arch/${ARCH}/kernel/syscalls/syscall.tbl $kerneldir/build/ 2>/dev/null || : + cp -a --parents arch/${ARCH}/kernel/syscalls/syscalltbl.sh $kerneldir/build/ 2>/dev/null || : + cp -a --parents arch/${ARCH}/kernel/syscalls/syscallhdr.sh $kerneldir/build/ 2>/dev/null || : fi # include the machine specific headers for ARM variants, if available. @@ -163,7 +164,12 @@ do_install() { # include a few files for 'make prepare' cp -a --parents arch/arm/tools/gen-mach-types $kerneldir/build/ cp -a --parents arch/arm/tools/mach-types $kerneldir/build/ - cp -a --parents arch/arm/tools/syscall* $kerneldir/build/ + + # ARM syscall table tools only exist for kernels v4.10 or later + SYSCALL_TOOLS=$(find arch/arm/tools -name "syscall*") + if [ -n "$SYSCALL_TOOLS" ] ; then + cp -a --parents $SYSCALL_TOOLS $kerneldir/build/ + fi cp -a --parents arch/arm/kernel/module.lds $kerneldir/build/ fi @@ -174,23 +180,27 @@ do_install() { cp -a include $kerneldir/build + cp -a --parents lib/vdso/* $kerneldir/build/ 2>/dev/null || : + cp -a --parents tools/include/tools/le_byteshift.h $kerneldir/build/ cp -a --parents tools/include/tools/be_byteshift.h $kerneldir/build/ # required for generate missing syscalls prepare phase - cp -a --parents arch/x86/entry/syscalls/syscall_32.tbl $kerneldir/build + cp -a --parents $(find arch/x86 -type f -name "syscall_32.tbl") $kerneldir/build + cp -a --parents $(find arch/arm -type f -name "*.tbl") $kerneldir/build 2>/dev/null || : if [ "${ARCH}" = "x86" ]; then # files for 'make prepare' to succeed with kernel-devel - cp -a --parents arch/x86/entry/syscalls/syscall_32.tbl $kerneldir/build/ - cp -a --parents arch/x86/entry/syscalls/syscalltbl.sh $kerneldir/build/ - cp -a --parents arch/x86/entry/syscalls/syscallhdr.sh $kerneldir/build/ - cp -a --parents arch/x86/entry/syscalls/syscall_64.tbl $kerneldir/build/ + cp -a --parents $(find arch/x86 -type f -name "syscall_32.tbl") $kerneldir/build/ + cp -a --parents $(find arch/x86 -type f -name "syscalltbl.sh") $kerneldir/build/ + cp -a --parents $(find arch/x86 -type f -name "syscallhdr.sh") $kerneldir/build/ + cp -a --parents $(find arch/x86 -type f -name "syscall_64.tbl") $kerneldir/build/ cp -a --parents arch/x86/tools/relocs_32.c $kerneldir/build/ cp -a --parents arch/x86/tools/relocs_64.c $kerneldir/build/ cp -a --parents arch/x86/tools/relocs.c $kerneldir/build/ cp -a --parents arch/x86/tools/relocs_common.c $kerneldir/build/ cp -a --parents arch/x86/tools/relocs.h $kerneldir/build/ + cp -a --parents arch/x86/tools/gen-insn-attr-x86.awk $kerneldir/build/ 2>/dev/null || : cp -a --parents arch/x86/purgatory/purgatory.c $kerneldir/build/ # 4.18 + have unified the purgatory files, so we ignore any errors if @@ -199,12 +209,17 @@ do_install() { cp -a --parents arch/x86/purgatory/sha256.c $kerneldir/build/ 2>/dev/null || : cp -a --parents arch/x86/purgatory/stack.S $kerneldir/build/ - cp -a --parents arch/x86/purgatory/string.c $kerneldir/build/ + cp -a --parents arch/x86/purgatory/string.c $kerneldir/build/ 2>/dev/null || : cp -a --parents arch/x86/purgatory/setup-x86_64.S $kerneldir/build/ cp -a --parents arch/x86/purgatory/entry64.S $kerneldir/build/ cp -a --parents arch/x86/boot/string.h $kerneldir/build/ cp -a --parents arch/x86/boot/string.c $kerneldir/build/ + cp -a --parents arch/x86/boot/compressed/string.c $kerneldir/build/ 2>/dev/null || : cp -a --parents arch/x86/boot/ctype.h $kerneldir/build/ + + # objtool requires these files + cp -a --parents arch/x86/lib/inat.c $kerneldir/build/ 2>/dev/null || : + cp -a --parents arch/x86/lib/insn.c $kerneldir/build/ 2>/dev/null || : fi if [ "${ARCH}" = "mips" ]; then @@ -215,6 +230,9 @@ do_install() { cp -a --parents kernel/time/timeconst.bc $kerneldir/build cp -a --parents kernel/bounds.c $kerneldir/build cp -a --parents Kbuild $kerneldir/build + cp -a --parents arch/mips/kernel/syscalls/*.sh $kerneldir/build 2>/dev/null || : + cp -a --parents arch/mips/kernel/syscalls/*.tbl $kerneldir/build 2>/dev/null || : + cp -a --parents arch/mips/tools/elf-entry.c $kerneldir/build 2>/dev/null || : fi # required to build scripts/selinux/genheaders/genheaders @@ -231,6 +249,15 @@ do_install() { # Copy .config to include/config/auto.conf so "make prepare" is unnecessary. cp $kerneldir/build/.config $kerneldir/build/include/config/auto.conf + # make the scripts python3 safe. We won't be running these, and if they are + # left as /usr/bin/python rootfs assembly will fail, since we only have python3 + # in the RDEPENDS (and the python3 package does not include /usr/bin/python) + for ss in $(find $kerneldir/build/scripts -type f -name '*'); do + sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "$ss" + sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "$ss" + sed -i 's,/usr/bin/python,/usr/bin/env python3,' "$ss" + done + chown -R root:root ${D} } @@ -240,7 +267,7 @@ do_install[lockfiles] = "${TMPDIR}/kernel-scripts.lock" FILES_${PN} = "${KERNEL_BUILD_ROOT} ${KERNEL_SRC_PATH}" FILES_${PN}-dbg += "${KERNEL_BUILD_ROOT}*/build/scripts/*/.debug/*" -RDEPENDS_${PN} = "bc python flex bison ${TCLIBC}-utils" +RDEPENDS_${PN} = "bc python3 flex bison ${TCLIBC}-utils" # 4.15+ needs these next two RDEPENDS RDEPENDS_${PN} += "openssl-dev util-linux" # and x86 needs a bit more for 4.15+ diff --git a/external/poky/meta/recipes-kernel/linux/linux-dtb.inc b/external/poky/meta/recipes-kernel/linux/linux-dtb.inc deleted file mode 100644 index f1912775..00000000 --- a/external/poky/meta/recipes-kernel/linux/linux-dtb.inc +++ /dev/null @@ -1,3 +0,0 @@ -python() { - bb.warn("You are using the linux-dtb.inc which is deprecated. You can safely remove it as the Device Tree support is automatically enabled when KERNEL_DEVICETREE is set.") -} diff --git a/external/poky/meta/recipes-kernel/linux/linux-dummy.bb b/external/poky/meta/recipes-kernel/linux/linux-dummy.bb index e1c7f767..62cf6f5e 100644 --- a/external/poky/meta/recipes-kernel/linux/linux-dummy.bb +++ b/external/poky/meta/recipes-kernel/linux/linux-dummy.bb @@ -39,6 +39,10 @@ do_compile () { : } +do_compile_kernelmodules() { + : +} + do_shared_workdir () { : } @@ -58,3 +62,4 @@ do_deploy() { addtask bundle_initramfs after do_install before do_deploy addtask deploy after do_install addtask shared_workdir after do_compile before do_install +addtask compile_kernelmodules diff --git a/external/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb b/external/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb index 23cb355b..06a9108f 100644 --- a/external/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb +++ b/external/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb @@ -30,25 +30,25 @@ 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 ?= "4.19-rc+" +LINUX_VERSION ?= "5.6-rc+" LINUX_VERSION_EXTENSION ?= "-yoctodev-${LINUX_KERNEL_TYPE}" PV = "${LINUX_VERSION}+git${SRCPV}" -LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemumips64|qemux86-64)" +COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemumips64|qemux86-64|qemuriscv64)" -KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb" +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" # Functionality flags KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" -KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc" +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" +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_VERSION_SANITY_SKIP = "1" diff --git a/external/poky/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb b/external/poky/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb deleted file mode 100644 index de6f5c98..00000000 --- a/external/poky/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb +++ /dev/null @@ -1,41 +0,0 @@ -KBRANCH ?= "v4.14/standard/preempt-rt/base" - -require recipes-kernel/linux/linux-yocto.inc - -# Skip processing of this recipe if it is not explicitly specified as the -# PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying -# to build multiple virtual/kernel providers, e.g. as dependency of -# core-image-rt-sdk, core-image-rt. -python () { - if d.getVar("KERNEL_PACKAGE_NAME") == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt": - raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") -} - -SRCREV_machine ?= "3aa9671ae072f45665e72591be5636522c8a6215" -SRCREV_meta ?= "a889c43359ca8bee705601817c50edf3c209bc09" - -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.14;destsuffix=${KMETA}" - -LINUX_VERSION ?= "4.14.154" - -DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" -DEPENDS += "openssl-native util-linux-native" - -PV = "${LINUX_VERSION}+git${SRCPV}" - -KMETA = "kernel-meta" -KCONF_BSP_AUDIT_LEVEL = "2" - -LINUX_KERNEL_TYPE = "preempt-rt" - -COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuppc|qemumips)" - -KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb" - -# Functionality flags -KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" -KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" -KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc" -KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" -KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" diff --git a/external/poky/meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb b/external/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb index 91bb5765..24cc5353 100644 --- a/external/poky/meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb +++ b/external/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -1,4 +1,4 @@ -KBRANCH ?= "v4.18/standard/preempt-rt/base" +KBRANCH ?= "v5.4/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 ?= "60b23779def52cac86267bdef0da0f2750dce287" -SRCREV_meta ?= "865683fc87deee7030cd168f295e8afd70894d6c" +SRCREV_machine ?= "9b7e1eef068382c132768964ccac22d35ac05d7b" +SRCREV_meta ?= "4aeda12f7f7eb84613ae1fe6e22cd9cd9790c20b" 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.18;destsuffix=${KMETA}" + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" -LINUX_VERSION ?= "4.18.33" +LINUX_VERSION ?= "5.4.57" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" @@ -31,13 +31,14 @@ KCONF_BSP_AUDIT_LEVEL = "2" LINUX_KERNEL_TYPE = "preempt-rt" -COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarm64|qemuppc|qemumips)" +COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)" -KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb" +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" # Functionality flags KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" -KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc" +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)}" diff --git a/external/poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb b/external/poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb deleted file mode 100644 index 52c02cad..00000000 --- a/external/poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb +++ /dev/null @@ -1,28 +0,0 @@ -KBRANCH ?= "v4.14/standard/tiny/base" -LINUX_KERNEL_TYPE = "tiny" -KCONFIG_MODE = "--allnoconfig" - -require recipes-kernel/linux/linux-yocto.inc - -LINUX_VERSION ?= "4.14.154" - -DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" -DEPENDS += "openssl-native util-linux-native" - -KMETA = "kernel-meta" -KCONF_BSP_AUDIT_LEVEL = "2" - -SRCREV_machine ?= "38c3a6549d60a3b4a5ab0cb6a440929ba8502f7f" -SRCREV_meta ?= "a889c43359ca8bee705601817c50edf3c209bc09" - -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-4.14;destsuffix=${KMETA}" - -COMPATIBLE_MACHINE = "qemux86|qemux86-64" - -# Functionality flags -KERNEL_FEATURES = "" - -KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb" diff --git a/external/poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb b/external/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb index c986eb8b..c4bdfd61 100644 --- a/external/poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb +++ b/external/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb @@ -1,12 +1,12 @@ -KBRANCH ?= "v4.18/standard/tiny/base" -KBRANCH_qemuarm ?= "v4.18/standard/tiny/arm-versatile-926ejs" +KBRANCH ?= "v5.4/standard/tiny/base" +KBRANCH_qemuarm ?= "v5.4/standard/tiny/arm-versatile-926ejs" LINUX_KERNEL_TYPE = "tiny" KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "4.18.33" +LINUX_VERSION ?= "5.4.57" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,18 +15,18 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "bc69d96021b7407a636cb7bc56334bf95a525e76" -SRCREV_machine ?= "1a564c76f41cff5c9e9011c4dbb5ef8453836b5d" -SRCREV_meta ?= "865683fc87deee7030cd168f295e8afd70894d6c" +SRCREV_machine_qemuarm ?= "afcbe2154b65d2ab1da70eaf38388b3c64366f8f" +SRCREV_machine ?= "d3100abbe1a46aeefdf62d6a31fed31e94b9537d" +SRCREV_meta ?= "4aeda12f7f7eb84613ae1fe6e22cd9cd9790c20b" 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-4.18;destsuffix=${KMETA}" + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" -COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm" +COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarmv5" # Functionality flags KERNEL_FEATURES = "" -KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb" +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" diff --git a/external/poky/meta/recipes-kernel/linux/linux-yocto.inc b/external/poky/meta/recipes-kernel/linux/linux-yocto.inc index 1ebfb606..91df9c1c 100644 --- a/external/poky/meta/recipes-kernel/linux/linux-yocto.inc +++ b/external/poky/meta/recipes-kernel/linux/linux-yocto.inc @@ -26,6 +26,10 @@ DEPENDS_append_nios2 = " libgcc" KERNEL_CC_append_nios2 = " ${TOOLCHAIN_OPTIONS}" KERNEL_LD_append_nios2 = " ${TOOLCHAIN_OPTIONS}" +DEPENDS_append_arc = " libgcc" +KERNEL_CC_append_arc = " ${TOOLCHAIN_OPTIONS}" +KERNEL_LD_append_arc = " ${TOOLCHAIN_OPTIONS}" + KERNEL_FEATURES_append_qemuall=" features/debug/printk.scc" KERNEL_FEATURES_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'numa', 'features/numa/numa.scc', '', d)}" @@ -35,22 +39,6 @@ KERNEL_FEATURES_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'numa', 'fea # and it can be specific to the machine or shared # KMACHINE = "UNDEFINED" -# The distro or local.conf should set this, but if nobody cares... -LINUX_KERNEL_TYPE ??= "standard" - -# KMETA ?= "" -KBRANCH ?= "master" -KMACHINE ?= "${MACHINE}" -SRCREV_FORMAT ?= "meta_machine" - -# LEVELS: -# 0: no reporting -# 1: report options that are specified, but not in the final config -# 2: report options that are not hardware related, but set by a BSP -KCONF_AUDIT_LEVEL ?= "1" -KCONF_BSP_AUDIT_LEVEL ?= "0" -KMETA_AUDIT ?= "yes" - LINUX_VERSION_EXTENSION ??= "-yocto-${LINUX_KERNEL_TYPE}" # Pick up shared functions @@ -65,10 +53,5 @@ do_install_append(){ fi } -# extra tasks -addtask kernel_version_sanity_check after do_kernel_metadata do_kernel_checkout before do_compile -addtask validate_branches before do_patch after do_kernel_checkout -addtask kernel_configcheck after do_configure before do_compile - # enable kernel-sample for oeqa/runtime/cases's ksample.py test KERNEL_FEATURES_append_qemuall=" features/kernel-sample/kernel-sample.scc" diff --git a/external/poky/meta/recipes-kernel/linux/linux-yocto_4.14.bb b/external/poky/meta/recipes-kernel/linux/linux-yocto_4.14.bb deleted file mode 100644 index 0048735c..00000000 --- a/external/poky/meta/recipes-kernel/linux/linux-yocto_4.14.bb +++ /dev/null @@ -1,47 +0,0 @@ -KBRANCH ?= "v4.14/standard/base" - -require recipes-kernel/linux/linux-yocto.inc - -# board specific branches -KBRANCH_qemuarm ?= "v4.14/standard/arm-versatile-926ejs" -KBRANCH_qemuarm64 ?= "v4.14/standard/qemuarm64" -KBRANCH_qemumips ?= "v4.14/standard/mti-malta32" -KBRANCH_qemuppc ?= "v4.14/standard/qemuppc" -KBRANCH_qemux86 ?= "v4.14/standard/base" -KBRANCH_qemux86-64 ?= "v4.14/standard/base" -KBRANCH_qemumips64 ?= "v4.14/standard/mti-malta64" - -SRCREV_machine_qemuarm ?= "e4e2990af921c2d1544d18efa5f7183f95289cd0" -SRCREV_machine_qemuarm64 ?= "51c9e69ebef5d2d15dfbcdf098269d86e0e38317" -SRCREV_machine_qemumips ?= "e70c76a3fe9cc785619d9e4c8e28cb4d4d76ecaf" -SRCREV_machine_qemuppc ?= "6b6eab44d3a04294c233e0b47d6b7c6cbb6e9ffb" -SRCREV_machine_qemux86 ?= "57278e88a6b0f7c6230f7429cab7e74229f2b7ce" -SRCREV_machine_qemux86-64 ?= "57278e88a6b0f7c6230f7429cab7e74229f2b7ce" -SRCREV_machine_qemumips64 ?= "4e099e87d223bfc1526543a5e4c5383cb2edda70" -SRCREV_machine ?= "57278e88a6b0f7c6230f7429cab7e74229f2b7ce" -SRCREV_meta ?= "a889c43359ca8bee705601817c50edf3c209bc09" - -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.14;destsuffix=${KMETA}" - -LINUX_VERSION ?= "4.14.154" - -DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" -DEPENDS += "openssl-native util-linux-native" - -PV = "${LINUX_VERSION}+git${SRCPV}" - -KMETA = "kernel-meta" -KCONF_BSP_AUDIT_LEVEL = "2" - -KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb" - -COMPATIBLE_MACHINE = "qemuarm|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64" - -# Functionality flags -KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" -KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" -KERNEL_FEATURES_append_qemuall=" cfg/virtio.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("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" diff --git a/external/poky/meta/recipes-kernel/linux/linux-yocto_4.18.bb b/external/poky/meta/recipes-kernel/linux/linux-yocto_4.18.bb deleted file mode 100644 index 3be72a3a..00000000 --- a/external/poky/meta/recipes-kernel/linux/linux-yocto_4.18.bb +++ /dev/null @@ -1,48 +0,0 @@ -KBRANCH ?= "v4.18/standard/base" - -require recipes-kernel/linux/linux-yocto.inc - -# board specific branches -KBRANCH_qemuarm ?= "v4.18/standard/arm-versatile-926ejs" -KBRANCH_qemuarm64 ?= "v4.18/standard/qemuarm64" -KBRANCH_qemumips ?= "v4.18/standard/mti-malta32" -KBRANCH_qemuppc ?= "v4.18/standard/qemuppc" -KBRANCH_qemux86 ?= "v4.18/standard/base" -KBRANCH_qemux86-64 ?= "v4.18/standard/base" -KBRANCH_qemumips64 ?= "v4.18/standard/mti-malta64" - -SRCREV_machine_qemuarm ?= "813d81df5defc4e552b7c3085673437eaba4eea7" -SRCREV_machine_qemuarm64 ?= "1a564c76f41cff5c9e9011c4dbb5ef8453836b5d" -SRCREV_machine_qemumips ?= "12620f16df220007dfda3b70cc5044ec2322142c" -SRCREV_machine_qemuppc ?= "1a564c76f41cff5c9e9011c4dbb5ef8453836b5d" -SRCREV_machine_qemux86 ?= "1a564c76f41cff5c9e9011c4dbb5ef8453836b5d" -SRCREV_machine_qemux86-64 ?= "1a564c76f41cff5c9e9011c4dbb5ef8453836b5d" -SRCREV_machine_qemumips64 ?= "104cdfbbf95981e31a32dfe3bdeaff3afb517ad4" -SRCREV_machine ?= "1a564c76f41cff5c9e9011c4dbb5ef8453836b5d" -SRCREV_meta ?= "865683fc87deee7030cd168f295e8afd70894d6c" - -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.18;destsuffix=${KMETA}" - -LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "4.18.33" - -DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" -DEPENDS += "openssl-native util-linux-native" - -PV = "${LINUX_VERSION}+git${SRCPV}" - -KMETA = "kernel-meta" -KCONF_BSP_AUDIT_LEVEL = "2" - -KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb" - -COMPATIBLE_MACHINE = "qemuarm|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64" - -# Functionality flags -KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" -KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" -KERNEL_FEATURES_append_qemuall=" cfg/virtio.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("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" diff --git a/external/poky/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/external/poky/meta/recipes-kernel/linux/linux-yocto_5.4.bb new file mode 100644 index 00000000..8014d2ec --- /dev/null +++ b/external/poky/meta/recipes-kernel/linux/linux-yocto_5.4.bb @@ -0,0 +1,54 @@ +KBRANCH ?= "v5.4/standard/base" + +require recipes-kernel/linux/linux-yocto.inc + +# board specific branches +KBRANCH_qemuarm ?= "v5.4/standard/arm-versatile-926ejs" +KBRANCH_qemuarm64 ?= "v5.4/standard/qemuarm64" +KBRANCH_qemumips ?= "v5.4/standard/mti-malta32" +KBRANCH_qemuppc ?= "v5.4/standard/qemuppc" +KBRANCH_qemuriscv64 ?= "v5.4/standard/base" +KBRANCH_qemux86 ?= "v5.4/standard/base" +KBRANCH_qemux86-64 ?= "v5.4/standard/base" +KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" + +SRCREV_machine_qemuarm ?= "69c2cb15ed433d0c54548167b771aa86edf731b0" +SRCREV_machine_qemuarm64 ?= "d3100abbe1a46aeefdf62d6a31fed31e94b9537d" +SRCREV_machine_qemumips ?= "f0d91ff7f58bb7b6e6676abce3b2e56d8031c7a5" +SRCREV_machine_qemuppc ?= "d3100abbe1a46aeefdf62d6a31fed31e94b9537d" +SRCREV_machine_qemuriscv64 ?= "d3100abbe1a46aeefdf62d6a31fed31e94b9537d" +SRCREV_machine_qemux86 ?= "d3100abbe1a46aeefdf62d6a31fed31e94b9537d" +SRCREV_machine_qemux86-64 ?= "d3100abbe1a46aeefdf62d6a31fed31e94b9537d" +SRCREV_machine_qemumips64 ?= "053475d8f61a47f2aa66f2be0ca6c668a73ff784" +SRCREV_machine ?= "d3100abbe1a46aeefdf62d6a31fed31e94b9537d" +SRCREV_meta ?= "4aeda12f7f7eb84613ae1fe6e22cd9cd9790c20b" + +# remap qemuarm to qemuarma15 for the 5.4 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.4;destsuffix=${KMETA}" + +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" +LINUX_VERSION ?= "5.4.57" + +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" +DEPENDS += "openssl-native util-linux-native" + +PV = "${LINUX_VERSION}+git${SRCPV}" + +KMETA = "kernel-meta" +KCONF_BSP_AUDIT_LEVEL = "2" + +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" + +COMPATIBLE_MACHINE = "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64|qemuriscv64" + +# Functionality flags +KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" +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 = " ${@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)}" |