diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-09-28 20:46:50 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-09-28 20:46:50 +0300 |
commit | d73e39703a0260c8911cb439b579e1c2bada4b20 (patch) | |
tree | 4fa9f965ae954c587ab773ecaced6b8f8e18d359 /poky/meta-yocto-bsp/recipes-kernel/linux | |
parent | 6f106a0a4ce15fe0678d4ffefd572e6978c72597 (diff) | |
parent | 6d8c5d2c6204714ca6b7a43f04348162b683cdbc (diff) | |
download | openbmc-d73e39703a0260c8911cb439b579e1c2bada4b20.tar.xz |
Merge tag '0.75' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'poky/meta-yocto-bsp/recipes-kernel/linux')
4 files changed, 53 insertions, 53 deletions
diff --git a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend index 6e5a129dd..a90958f54 100644 --- a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend @@ -1,13 +1,13 @@ -KBRANCH_genericx86 = "standard/base" -KBRANCH_genericx86-64 = "standard/base" -KBRANCH_edgerouter = "standard/edgerouter" -KBRANCH_beaglebone-yocto = "standard/beaglebone" +KBRANCH:genericx86 = "standard/base" +KBRANCH:genericx86-64 = "standard/base" +KBRANCH:edgerouter = "standard/edgerouter" +KBRANCH:beaglebone-yocto = "standard/beaglebone" -KMACHINE_genericx86 ?= "common-pc" -KMACHINE_genericx86-64 ?= "common-pc-64" -KMACHINE_beaglebone-yocto ?= "beaglebone" +KMACHINE:genericx86 ?= "common-pc" +KMACHINE:genericx86-64 ?= "common-pc-64" +KMACHINE:beaglebone-yocto ?= "beaglebone" -COMPATIBLE_MACHINE_genericx86 = "genericx86" -COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" -COMPATIBLE_MACHINE_edgerouter = "edgerouter" -COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" +COMPATIBLE_MACHINE:genericx86 = "genericx86" +COMPATIBLE_MACHINE:genericx86-64 = "genericx86-64" +COMPATIBLE_MACHINE:edgerouter = "edgerouter" +COMPATIBLE_MACHINE:beaglebone-yocto = "beaglebone-yocto" 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 index f8362b663..1e14229c2 100644 --- 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 @@ -1,23 +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" +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" +KMACHINE:genericx86 ?= "common-pc" +KMACHINE:genericx86-64 ?= "common-pc-64" +KMACHINE:beaglebone-yocto ?= "beaglebone" -SRCREV_machine_genericx86 ?= "ab49d2db98bdee2c8c6e17fb59ded9e5292b0f41" -SRCREV_machine_genericx86-64 ?= "ab49d2db98bdee2c8c6e17fb59ded9e5292b0f41" -SRCREV_machine_edgerouter ?= "274d63799465eebfd201b3e8251f16d29e93a978" -SRCREV_machine_beaglebone-yocto ?= "ab49d2db98bdee2c8c6e17fb59ded9e5292b0f41" +SRCREV_machine:genericx86 ?= "c274623910704eefcc98380a17649889ac7e9408" +SRCREV_machine:genericx86-64 ?= "c274623910704eefcc98380a17649889ac7e9408" +SRCREV_machine:edgerouter ?= "ac089d661362ba857e235c5630242039b150ae26" +SRCREV_machine:beaglebone-yocto ?= "a6df693a45f5787d4254e0998f52b4465b2a5efe" -COMPATIBLE_MACHINE_genericx86 = "genericx86" -COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" -COMPATIBLE_MACHINE_edgerouter = "edgerouter" -COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" +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.43" -LINUX_VERSION_genericx86-64 = "5.10.43" -LINUX_VERSION_edgerouter = "5.10.43" -LINUX_VERSION_beaglebone-yocto = "5.10.43" +LINUX_VERSION:genericx86 = "5.10.55" +LINUX_VERSION:genericx86-64 = "5.10.55" +LINUX_VERSION:edgerouter = "5.10.55" +LINUX_VERSION:beaglebone-yocto = "5.10.55" diff --git a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.13.bbappend b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.13.bbappend new file mode 100644 index 000000000..6089a94d7 --- /dev/null +++ b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.13.bbappend @@ -0,0 +1,23 @@ +KBRANCH:genericx86 = "v5.13/standard/base" +KBRANCH:genericx86-64 = "v5.13/standard/base" +KBRANCH:edgerouter = "v5.13/standard/edgerouter" +KBRANCH:beaglebone-yocto = "v5.13/standard/beaglebone" + +KMACHINE:genericx86 ?= "common-pc" +KMACHINE:genericx86-64 ?= "common-pc-64" +KMACHINE:beaglebone-yocto ?= "beaglebone" + +SRCREV_machine:genericx86 ?= "fe64083abac67ac736aa0133f3a4088286aece40" +SRCREV_machine:genericx86-64 ?= "fe64083abac67ac736aa0133f3a4088286aece40" +SRCREV_machine:edgerouter ?= "7b80606f7484fb1967a261e7e262de9adeb7ed59" +SRCREV_machine:beaglebone-yocto ?= "e486ea86794d62e7e6adbb3a2b2fd65222f323f7" + +COMPATIBLE_MACHINE:genericx86 = "genericx86" +COMPATIBLE_MACHINE:genericx86-64 = "genericx86-64" +COMPATIBLE_MACHINE:edgerouter = "edgerouter" +COMPATIBLE_MACHINE:beaglebone-yocto = "beaglebone-yocto" + +LINUX_VERSION:genericx86 = "5.13.11" +LINUX_VERSION:genericx86-64 = "5.13.11" +LINUX_VERSION:edgerouter = "5.13.11" +LINUX_VERSION:beaglebone-yocto = "5.13.11" 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 deleted file mode 100644 index 35147d2da..000000000 --- a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend +++ /dev/null @@ -1,23 +0,0 @@ -KBRANCH_genericx86 = "v5.4/standard/base" -KBRANCH_genericx86-64 = "v5.4/standard/base" -KBRANCH_edgerouter = "v5.4/standard/edgerouter" -KBRANCH_beaglebone-yocto = "v5.4/standard/beaglebone" - -KMACHINE_genericx86 ?= "common-pc" -KMACHINE_genericx86-64 ?= "common-pc-64" -KMACHINE_beaglebone-yocto ?= "beaglebone" - -SRCREV_machine_genericx86 ?= "31db2b47ac7d8508080fbb7344399b501216de66" -SRCREV_machine_genericx86-64 ?= "31db2b47ac7d8508080fbb7344399b501216de66" -SRCREV_machine_edgerouter ?= "706efec4c1e270ec5dda92275898cd465dfdc7dd" -SRCREV_machine_beaglebone-yocto ?= "706efec4c1e270ec5dda92275898cd465dfdc7dd" - -COMPATIBLE_MACHINE_genericx86 = "genericx86" -COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" -COMPATIBLE_MACHINE_edgerouter = "edgerouter" -COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" - -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" |