diff options
Diffstat (limited to 'poky/meta-yocto-bsp')
8 files changed, 31 insertions, 36 deletions
diff --git a/poky/meta-yocto-bsp/conf/layer.conf b/poky/meta-yocto-bsp/conf/layer.conf index eb9f55ea9..bf0c1bfec 100644 --- a/poky/meta-yocto-bsp/conf/layer.conf +++ b/poky/meta-yocto-bsp/conf/layer.conf @@ -5,12 +5,6 @@ BBPATH .= ":${LAYERDIR}" BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" - -PREFERRED_VERSION_linux-yocto_genericx86 ?= "5.8%" -PREFERRED_VERSION_linux-yocto_genericx86-64 ?= "5.8%" -PREFERRED_VERSION_linux-yocto_edgerouter ?= "5.8%" -PREFERRED_VERSION_linux-yocto_beaglebone-yocto ?= "5.8%" - BBFILE_COLLECTIONS += "yoctobsp" BBFILE_PATTERN_yoctobsp = "^${LAYERDIR}/" BBFILE_PRIORITY_yoctobsp = "5" diff --git a/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf b/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf index 523472ab1..f8368ebd0 100644 --- a/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf +++ b/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf @@ -24,7 +24,7 @@ SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyO0 115200;ttyAMA0" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "5.8%" +PREFERRED_VERSION_linux-yocto ?= "5.10%" KERNEL_IMAGETYPE = "zImage" KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb" diff --git a/poky/meta-yocto-bsp/conf/machine/edgerouter.conf b/poky/meta-yocto-bsp/conf/machine/edgerouter.conf index 75bc5e5f2..fbe33be9d 100644 --- a/poky/meta-yocto-bsp/conf/machine/edgerouter.conf +++ b/poky/meta-yocto-bsp/conf/machine/edgerouter.conf @@ -11,7 +11,7 @@ KERNEL_ALT_IMAGETYPE = "vmlinux.bin" KERNEL_IMAGE_STRIP_EXTRA_SECTIONS = ".comment" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "5.8%" +PREFERRED_VERSION_linux-yocto ?= "5.10%" SERIAL_CONSOLES = "115200;ttyS0" USE_VT ?= "0" diff --git a/poky/meta-yocto-bsp/conf/machine/include/genericx86-common.inc b/poky/meta-yocto-bsp/conf/machine/include/genericx86-common.inc index a6c396c79..1de069011 100644 --- a/poky/meta-yocto-bsp/conf/machine/include/genericx86-common.inc +++ b/poky/meta-yocto-bsp/conf/machine/include/genericx86-common.inc @@ -2,6 +2,7 @@ include conf/machine/include/x86-base.inc require conf/machine/include/qemuboot-x86.inc MACHINE_FEATURES += "wifi efi pcbios" +PREFERRED_VERSION_linux-yocto ?= "5.10%" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" XSERVER ?= "${XSERVER_X86_BASE} \ diff --git a/poky/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check_1.0.bb b/poky/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check_1.0.bb index 00680de89..8f10bd239 100644 --- a/poky/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check_1.0.bb +++ b/poky/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check_1.0.bb @@ -1,7 +1,7 @@ SUMMARY = "Intel gma500_gfx fix for certain hardware" DESCRIPTION = "Avoid inserting gma500_gfx module for certain hardware devices." LICENSE="GPLv2" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" SRC_URI = "file://gma500-gfx-check.conf \ file://gma500-gfx-check.sh " diff --git a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.10.bbappend b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.10.bbappend new file mode 100644 index 000000000..87e47352a --- /dev/null +++ b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.10.bbappend @@ -0,0 +1,23 @@ +KBRANCH_genericx86 = "v5.10/standard/base" +KBRANCH_genericx86-64 = "v5.10/standard/base" +KBRANCH_edgerouter = "v5.10/standard/edgerouter" +KBRANCH_beaglebone-yocto = "v5.10/standard/beaglebone" + +KMACHINE_genericx86 ?= "common-pc" +KMACHINE_genericx86-64 ?= "common-pc-64" +KMACHINE_beaglebone-yocto ?= "beaglebone" + +SRCREV_machine_genericx86 ?= "cdca78778415b4b3bd64e8390ee8adf04bf7e17a" +SRCREV_machine_genericx86-64 ?= "cdca78778415b4b3bd64e8390ee8adf04bf7e17a" +SRCREV_machine_edgerouter ?= "2e1fb8f84f09ca768eb531f33a126a40bb90e791" +SRCREV_machine_beaglebone-yocto ?= "cdca78778415b4b3bd64e8390ee8adf04bf7e17a" + +COMPATIBLE_MACHINE_genericx86 = "genericx86" +COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" +COMPATIBLE_MACHINE_edgerouter = "edgerouter" +COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" + +LINUX_VERSION_genericx86 = "5.10.12" +LINUX_VERSION_genericx86-64 = "5.10.12" +LINUX_VERSION_edgerouter = "5.10.12" +LINUX_VERSION_beaglebone-yocto = "5.10.12" diff --git a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend index 4ee895dbd..35147d2da 100644 --- a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend +++ b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend @@ -7,8 +7,8 @@ KMACHINE_genericx86 ?= "common-pc" KMACHINE_genericx86-64 ?= "common-pc-64" KMACHINE_beaglebone-yocto ?= "beaglebone" -SRCREV_machine_genericx86 ?= "cfcdd63145c0d741e57ee3e3e58f794229c6c09c" -SRCREV_machine_genericx86-64 ?= "cfcdd63145c0d741e57ee3e3e58f794229c6c09c" +SRCREV_machine_genericx86 ?= "31db2b47ac7d8508080fbb7344399b501216de66" +SRCREV_machine_genericx86-64 ?= "31db2b47ac7d8508080fbb7344399b501216de66" SRCREV_machine_edgerouter ?= "706efec4c1e270ec5dda92275898cd465dfdc7dd" SRCREV_machine_beaglebone-yocto ?= "706efec4c1e270ec5dda92275898cd465dfdc7dd" @@ -17,7 +17,7 @@ COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" COMPATIBLE_MACHINE_edgerouter = "edgerouter" COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" -LINUX_VERSION_genericx86 = "5.4.69" -LINUX_VERSION_genericx86-64 = "5.4.69" +LINUX_VERSION_genericx86 = "5.4.94" +LINUX_VERSION_genericx86-64 = "5.4.94" LINUX_VERSION_edgerouter = "5.4.58" LINUX_VERSION_beaglebone-yocto = "5.4.58" diff --git a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.8.bbappend b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.8.bbappend deleted file mode 100644 index a04f332cf..000000000 --- a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.8.bbappend +++ /dev/null @@ -1,23 +0,0 @@ -KBRANCH_genericx86 = "v5.8/standard/base" -KBRANCH_genericx86-64 = "v5.8/standard/base" -KBRANCH_edgerouter = "v5.8/standard/edgerouter" -KBRANCH_beaglebone-yocto = "v5.8/standard/beaglebone" - -KMACHINE_genericx86 ?= "common-pc" -KMACHINE_genericx86-64 ?= "common-pc-64" -KMACHINE_beaglebone-yocto ?= "beaglebone" - -SRCREV_machine_genericx86 ?= "5981001bf03f0d0c1cf641a2287ab6368baf628a" -SRCREV_machine_genericx86-64 ?= "5981001bf03f0d0c1cf641a2287ab6368baf628a" -SRCREV_machine_edgerouter ?= "912adf166eb0688e011154048f5fa0e5863249c3" -SRCREV_machine_beaglebone-yocto ?= "912adf166eb0688e011154048f5fa0e5863249c3" - -COMPATIBLE_MACHINE_genericx86 = "genericx86" -COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" -COMPATIBLE_MACHINE_edgerouter = "edgerouter" -COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" - -LINUX_VERSION_genericx86 = "5.8.13" -LINUX_VERSION_genericx86-64 = "5.8.13" -LINUX_VERSION_edgerouter = "5.8.2" -LINUX_VERSION_beaglebone-yocto = "5.8.2" |