diff options
Diffstat (limited to 'poky/meta/recipes-kernel/linux')
-rw-r--r-- | poky/meta/recipes-kernel/linux/kernel-devsrc.bb | 15 | ||||
-rw-r--r-- | poky/meta/recipes-kernel/linux/linux-dtb.inc | 3 | ||||
-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.2.bb (renamed from poky/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb) | 10 | ||||
-rw-r--r-- | poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb (renamed from poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb) | 14 | ||||
-rw-r--r-- | poky/meta/recipes-kernel/linux/linux-yocto_5.2.bb (renamed from poky/meta/recipes-kernel/linux/linux-yocto_5.0.bb) | 48 |
6 files changed, 50 insertions, 42 deletions
diff --git a/poky/meta/recipes-kernel/linux/kernel-devsrc.bb b/poky/meta/recipes-kernel/linux/kernel-devsrc.bb index 3900489ac..b68d945a8 100644 --- a/poky/meta/recipes-kernel/linux/kernel-devsrc.bb +++ b/poky/meta/recipes-kernel/linux/kernel-devsrc.bb @@ -141,7 +141,7 @@ 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/ @@ -179,6 +179,8 @@ 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/ @@ -240,6 +242,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} } @@ -249,7 +260,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/poky/meta/recipes-kernel/linux/linux-dtb.inc b/poky/meta/recipes-kernel/linux/linux-dtb.inc deleted file mode 100644 index f1912775c..000000000 --- a/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/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb b/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb index 2268faf51..163f28056 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb @@ -39,7 +39,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" 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_qemuarmv5 = "versatile-pb.dtb" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb index 22f3bf195..cf5142cf8 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb @@ -1,4 +1,4 @@ -KBRANCH ?= "v5.0/standard/preempt-rt/base" +KBRANCH ?= "v5.2/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 ?= "e6cb812b5532630b6fc6dfd7778d57a4907d3180" -SRCREV_meta ?= "7f6e97c357746382d4339e7e0463637e715acd4b" +SRCREV_machine ?= "c6eb169e914def00c37cc2917486c637d800d404" +SRCREV_meta ?= "a36c82128d9ccec878d1c0c4542b87d6cf5e9a7c" 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.0;destsuffix=${KMETA}" + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.0.19" +LINUX_VERSION ?= "5.2.10" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb index 33672c6d4..c2193c0c7 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb @@ -1,12 +1,12 @@ -KBRANCH ?= "v5.0/standard/tiny/base" -KBRANCH_qemuarm ?= "v5.0/standard/tiny/arm-versatile-926ejs" +KBRANCH ?= "v5.2/standard/tiny/base" +KBRANCH_qemuarm ?= "v5.2/standard/tiny/arm-versatile-926ejs" LINUX_KERNEL_TYPE = "tiny" KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.0.19" +LINUX_VERSION ?= "5.2.10" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" 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 ?= "b9001287984b0066814c8739f38d629de73739b7" -SRCREV_machine ?= "55dd15336b7301b686a0c183f5372b49c1003d03" -SRCREV_meta ?= "7f6e97c357746382d4339e7e0463637e715acd4b" +SRCREV_machine_qemuarm ?= "94d03154067049b417526f46429729d4ba1e09b7" +SRCREV_machine ?= "8d8bf56b2373bfdb1a9702b96a0e91e6706f62d4" +SRCREV_meta ?= "a36c82128d9ccec878d1c0c4542b87d6cf5e9a7c" 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.0;destsuffix=${KMETA}" + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarmv5" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto_5.0.bb b/poky/meta/recipes-kernel/linux/linux-yocto_5.2.bb index 887e88e08..9a75f1781 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto_5.0.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto_5.2.bb @@ -1,36 +1,36 @@ -KBRANCH ?= "v5.0/standard/base" +KBRANCH ?= "v5.2/standard/base" require recipes-kernel/linux/linux-yocto.inc # board specific branches -KBRANCH_qemuarm ?= "v5.0/standard/arm-versatile-926ejs" -KBRANCH_qemuarm64 ?= "v5.0/standard/qemuarm64" -KBRANCH_qemumips ?= "v5.0/standard/mti-malta32" -KBRANCH_qemuppc ?= "v5.0/standard/qemuppc" -KBRANCH_qemuriscv64 ?= "v5.0/standard/base" -KBRANCH_qemux86 ?= "v5.0/standard/base" -KBRANCH_qemux86-64 ?= "v5.0/standard/base" -KBRANCH_qemumips64 ?= "v5.0/standard/mti-malta64" - -SRCREV_machine_qemuarm ?= "d1ed980ad989252d42386c8bc63b2f5f11985ea4" -SRCREV_machine_qemuarm64 ?= "55dd15336b7301b686a0c183f5372b49c1003d03" -SRCREV_machine_qemumips ?= "1520e78195e64f27be46a46a8d6711c8470fb083" -SRCREV_machine_qemuppc ?= "55dd15336b7301b686a0c183f5372b49c1003d03" -SRCREV_machine_qemuriscv64 ?= "00638cdd8f92869a0f89ebe3289fdbd856ba9458" -SRCREV_machine_qemux86 ?= "55dd15336b7301b686a0c183f5372b49c1003d03" -SRCREV_machine_qemux86-64 ?= "55dd15336b7301b686a0c183f5372b49c1003d03" -SRCREV_machine_qemumips64 ?= "9d4105b32cf123a861bc754377d2f2e156278a7e" -SRCREV_machine ?= "55dd15336b7301b686a0c183f5372b49c1003d03" -SRCREV_meta ?= "7f6e97c357746382d4339e7e0463637e715acd4b" - -# remap qemuarm to qemuarma15 for the 5.0 kernel +KBRANCH_qemuarm ?= "v5.2/standard/arm-versatile-926ejs" +KBRANCH_qemuarm64 ?= "v5.2/standard/qemuarm64" +KBRANCH_qemumips ?= "v5.2/standard/mti-malta32" +KBRANCH_qemuppc ?= "v5.2/standard/qemuppc" +KBRANCH_qemuriscv64 ?= "v5.2/standard/base" +KBRANCH_qemux86 ?= "v5.2/standard/base" +KBRANCH_qemux86-64 ?= "v5.2/standard/base" +KBRANCH_qemumips64 ?= "v5.2/standard/mti-malta64" + +SRCREV_machine_qemuarm ?= "d329dc7256dfef66dedb604cafea5b5685c57f9d" +SRCREV_machine_qemuarm64 ?= "8d8bf56b2373bfdb1a9702b96a0e91e6706f62d4" +SRCREV_machine_qemumips ?= "6a46b8261433131ea99e5725d3fd75969004617c" +SRCREV_machine_qemuppc ?= "8d8bf56b2373bfdb1a9702b96a0e91e6706f62d4" +SRCREV_machine_qemuriscv64 ?= "8d8bf56b2373bfdb1a9702b96a0e91e6706f62d4" +SRCREV_machine_qemux86 ?= "8d8bf56b2373bfdb1a9702b96a0e91e6706f62d4" +SRCREV_machine_qemux86-64 ?= "8d8bf56b2373bfdb1a9702b96a0e91e6706f62d4" +SRCREV_machine_qemumips64 ?= "06bd563009ffc480befa0d116faed18e63785739" +SRCREV_machine ?= "8d8bf56b2373bfdb1a9702b96a0e91e6706f62d4" +SRCREV_meta ?= "a36c82128d9ccec878d1c0c4542b87d6cf5e9a7c" + +# remap qemuarm to qemuarma15 for the 5.2 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.0;destsuffix=${KMETA}" + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "5.0.19" +LINUX_VERSION ?= "5.2.10" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" |