From 82c905dc58a36aeae40b1b273a12f63fb1973cf4 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 13 Apr 2020 13:39:40 -0500 Subject: meta-openembedded and poky: subtree updates Squash of the following due to dependencies among them and OpenBMC changes: meta-openembedded: subtree update:d0748372d2..9201611135 meta-openembedded: subtree update:9201611135..17fd382f34 poky: subtree update:9052e5b32a..2e11d97b6c poky: subtree update:2e11d97b6c..a8544811d7 The change log was too large for the jenkins plugin to handle therefore it has been removed. Here is the first and last commit of each subtree: meta-openembedded:d0748372d2 cppzmq: bump to version 4.6.0 meta-openembedded:17fd382f34 mpv: Remove X11 dependency poky:9052e5b32a package_ipk: Remove pointless comment to trigger rebuild poky:a8544811d7 pbzip2: Fix license warning Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6 Signed-off-by: Andrew Geissler --- .../recipes-kernel/linux/linux-yocto-dev.bbappend | 2 -- .../recipes-kernel/linux/linux-yocto_4.19.bbappend | 27 ---------------------- .../recipes-kernel/linux/linux-yocto_5.2.bbappend | 27 ---------------------- .../recipes-kernel/linux/linux-yocto_5.4.bbappend | 23 ++++++++++++++++++ 4 files changed, 23 insertions(+), 56 deletions(-) delete mode 100644 poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.19.bbappend delete mode 100644 poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.2.bbappend create mode 100644 poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend (limited to 'poky/meta-yocto-bsp/recipes-kernel/linux') 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 f044dafb4..6e5a129dd 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 @@ -2,7 +2,6 @@ KBRANCH_genericx86 = "standard/base" KBRANCH_genericx86-64 = "standard/base" KBRANCH_edgerouter = "standard/edgerouter" KBRANCH_beaglebone-yocto = "standard/beaglebone" -KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb" KMACHINE_genericx86 ?= "common-pc" KMACHINE_genericx86-64 ?= "common-pc-64" @@ -12,4 +11,3 @@ COMPATIBLE_MACHINE_genericx86 = "genericx86" COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" COMPATIBLE_MACHINE_edgerouter = "edgerouter" COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" -COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" diff --git a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.19.bbappend b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.19.bbappend deleted file mode 100644 index ec269d905..000000000 --- a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.19.bbappend +++ /dev/null @@ -1,27 +0,0 @@ -KBRANCH_genericx86 = "v4.19/standard/base" -KBRANCH_genericx86-64 = "v4.19/standard/base" -KBRANCH_edgerouter = "v4.19/standard/edgerouter" -KBRANCH_beaglebone-yocto = "v4.19/standard/beaglebone" -KBRANCH_mpc8315e-rdb = "v4.19/standard/fsl-mpc8315e-rdb" - -KMACHINE_genericx86 ?= "common-pc" -KMACHINE_genericx86-64 ?= "common-pc-64" -KMACHINE_beaglebone-yocto ?= "beaglebone" - -SRCREV_machine_genericx86 ?= "5664dc14399edcaad210bbeb6343d84561fb3ea8" -SRCREV_machine_genericx86-64 ?= "5664dc14399edcaad210bbeb6343d84561fb3ea8" -SRCREV_machine_edgerouter ?= "5664dc14399edcaad210bbeb6343d84561fb3ea8" -SRCREV_machine_beaglebone-yocto ?= "5664dc14399edcaad210bbeb6343d84561fb3ea8" -SRCREV_machine_mpc8315e-rdb ?= "d419f4ca6ba4b097b8ad710a93b89510f5b2998c" - -COMPATIBLE_MACHINE_genericx86 = "genericx86" -COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" -COMPATIBLE_MACHINE_edgerouter = "edgerouter" -COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" -COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" - -LINUX_VERSION_genericx86 = "4.19.34" -LINUX_VERSION_genericx86-64 = "4.19.34" -LINUX_VERSION_edgerouter = "4.19.34" -LINUX_VERSION_beaglebone-yocto = "4.19.34" -LINUX_VERSION_mpc8315e-rdb = "4.19.34" diff --git a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.2.bbappend b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.2.bbappend deleted file mode 100644 index f15bccbaf..000000000 --- a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.2.bbappend +++ /dev/null @@ -1,27 +0,0 @@ -KBRANCH_genericx86 = "v5.2/standard/base" -KBRANCH_genericx86-64 = "v5.2/standard/base" -KBRANCH_edgerouter = "v5.2/standard/edgerouter" -KBRANCH_beaglebone-yocto = "v5.2/standard/beaglebone" -KBRANCH_mpc8315e-rdb = "v5.2/standard/fsl-mpc8315e-rdb" - -KMACHINE_genericx86 ?= "common-pc" -KMACHINE_genericx86-64 ?= "common-pc-64" -KMACHINE_beaglebone-yocto ?= "beaglebone" - -SRCREV_machine_genericx86 ?= "25b14cdf9659c68ab32d66616dfdbbe2ece3fd94" -SRCREV_machine_genericx86-64 ?= "25b14cdf9659c68ab32d66616dfdbbe2ece3fd94" -SRCREV_machine_edgerouter ?= "25b14cdf9659c68ab32d66616dfdbbe2ece3fd94" -SRCREV_machine_beaglebone-yocto ?= "25b14cdf9659c68ab32d66616dfdbbe2ece3fd94" -SRCREV_machine_mpc8315e-rdb ?= "77f031b182885c177b3a96098ae61271911a7954" - -COMPATIBLE_MACHINE_genericx86 = "genericx86" -COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" -COMPATIBLE_MACHINE_edgerouter = "edgerouter" -COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" -COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" - -LINUX_VERSION_genericx86 = "5.2.17" -LINUX_VERSION_genericx86-64 = "5.2.17" -LINUX_VERSION_edgerouter = "5.2.17" -LINUX_VERSION_beaglebone-yocto = "5.2.17" -LINUX_VERSION_mpc8315e-rdb = "5.2.17" 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 new file mode 100644 index 000000000..9734cd571 --- /dev/null +++ b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend @@ -0,0 +1,23 @@ +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 ?= "f4d7dbafb103e4f782323017c239c548871c1567" +SRCREV_machine_genericx86-64 ?= "f4d7dbafb103e4f782323017c239c548871c1567" +SRCREV_machine_edgerouter ?= "f4d7dbafb103e4f782323017c239c548871c1567" +SRCREV_machine_beaglebone-yocto ?= "f4d7dbafb103e4f782323017c239c548871c1567" + +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.20" +LINUX_VERSION_genericx86-64 = "5.4.20" +LINUX_VERSION_edgerouter = "5.4.20" +LINUX_VERSION_beaglebone-yocto = "5.4.20" -- cgit v1.2.3