From 193236933b0f4ab91b1625b64e2187e2db4e0e8f Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 5 Apr 2019 15:28:33 -0400 Subject: reset upstream subtrees to HEAD Reset the following subtrees on HEAD: poky: 8217b477a1(master) meta-xilinx: 64aa3d35ae(master) meta-openembedded: 0435c9e193(master) meta-raspberrypi: 490a4441ac(master) meta-security: cb6d1c85ee(master) Squashed patches: meta-phosphor: drop systemd 239 patches meta-phosphor: mrw-api: use correct install path Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d Signed-off-by: Brad Bishop --- .../recipes-kernel/linux/linux-yocto_4.14.bbappend | 27 ---------------------- .../recipes-kernel/linux/linux-yocto_4.18.bbappend | 8 +++---- .../recipes-kernel/linux/linux-yocto_4.19.bbappend | 27 ++++++++++++++++++++++ .../recipes-kernel/linux/linux-yocto_5.0.bbappend | 27 ++++++++++++++++++++++ 4 files changed, 58 insertions(+), 31 deletions(-) delete mode 100644 poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.14.bbappend create mode 100644 poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.19.bbappend create mode 100644 poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.0.bbappend (limited to 'poky/meta-yocto-bsp/recipes-kernel/linux') diff --git a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.14.bbappend b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.14.bbappend deleted file mode 100644 index 502485a94..000000000 --- a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.14.bbappend +++ /dev/null @@ -1,27 +0,0 @@ -KBRANCH_genericx86 = "v4.14/standard/base" -KBRANCH_genericx86-64 = "v4.14/standard/base" -KBRANCH_edgerouter = "v4.14/standard/edgerouter" -KBRANCH_beaglebone-yocto = "v4.14/standard/beaglebone" -KBRANCH_mpc8315e-rdb = "v4.14/standard/fsl-mpc8315e-rdb" - -KMACHINE_genericx86 ?= "common-pc" -KMACHINE_genericx86-64 ?= "common-pc-64" -KMACHINE_beaglebone-yocto ?= "beaglebone" - -SRCREV_machine_genericx86 ?= "2c5caa7e84311f2a0097974a697ac1f59030530e" -SRCREV_machine_genericx86-64 ?= "2c5caa7e84311f2a0097974a697ac1f59030530e" -SRCREV_machine_edgerouter ?= "e06bfa18c727bd0e6e10cf26d9f161e4c791f52b" -SRCREV_machine_beaglebone-yocto ?= "b8805de77dcf8f59d8368fee4921c146c1300a6a" -SRCREV_machine_mpc8315e-rdb ?= "f88e87360b10f8fbd853a7d412982e6620f3f96d" - -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.14.76" -LINUX_VERSION_genericx86-64 = "4.14.76" -LINUX_VERSION_edgerouter = "4.14.71" -LINUX_VERSION_beaglebone-yocto = "4.14.71" -LINUX_VERSION_mpc8315e-rdb = "4.14.71" diff --git a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.18.bbappend b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.18.bbappend index 7f15843f3..e53bb51f2 100644 --- a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.18.bbappend +++ b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.18.bbappend @@ -8,8 +8,8 @@ KMACHINE_genericx86 ?= "common-pc" KMACHINE_genericx86-64 ?= "common-pc-64" KMACHINE_beaglebone-yocto ?= "beaglebone" -SRCREV_machine_genericx86 ?= "db2d813869a0501782469ecdb17e277a501c9f57" -SRCREV_machine_genericx86-64 ?= "db2d813869a0501782469ecdb17e277a501c9f57" +SRCREV_machine_genericx86 ?= "62f0a3acffffd555f68ed97d5e4faade2b28f3c0" +SRCREV_machine_genericx86-64 ?= "62f0a3acffffd555f68ed97d5e4faade2b28f3c0" SRCREV_machine_edgerouter ?= "28e7781d57a59227bf1c08c7f3dbdfee16aa0dc2" SRCREV_machine_beaglebone-yocto ?= "28e7781d57a59227bf1c08c7f3dbdfee16aa0dc2" SRCREV_machine_mpc8315e-rdb ?= "99071a599d8650b069fb8135866fca203f375350" @@ -20,8 +20,8 @@ COMPATIBLE_MACHINE_edgerouter = "edgerouter" COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" -LINUX_VERSION_genericx86 = "4.18.22" -LINUX_VERSION_genericx86-64 = "4.18.22" +LINUX_VERSION_genericx86 = "4.18.27" +LINUX_VERSION_genericx86-64 = "4.18.27" LINUX_VERSION_edgerouter = "4.18.25" LINUX_VERSION_beaglebone-yocto = "4.18.25" LINUX_VERSION_mpc8315e-rdb = "4.18.25" 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 new file mode 100644 index 000000000..8e708cb66 --- /dev/null +++ b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.19.bbappend @@ -0,0 +1,27 @@ +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 ?= "eebb51300a07804a020ec468b5f8c5bf720198d9" +SRCREV_machine_genericx86-64 ?= "eebb51300a07804a020ec468b5f8c5bf720198d9" +SRCREV_machine_edgerouter ?= "eebb51300a07804a020ec468b5f8c5bf720198d9" +SRCREV_machine_beaglebone-yocto ?= "eebb51300a07804a020ec468b5f8c5bf720198d9" +SRCREV_machine_mpc8315e-rdb ?= "8b60f968823256f5d2889c4520d70299ca21411b" + +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.14" +LINUX_VERSION_genericx86-64 = "4.19.14" +LINUX_VERSION_edgerouter = "4.19.14" +LINUX_VERSION_beaglebone-yocto = "4.19.14" +LINUX_VERSION_mpc8315e-rdb = "4.19.14" diff --git a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.0.bbappend b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.0.bbappend new file mode 100644 index 000000000..5cf6e1f06 --- /dev/null +++ b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.0.bbappend @@ -0,0 +1,27 @@ +KBRANCH_genericx86 = "v5.0/standard/base" +KBRANCH_genericx86-64 = "v5.0/standard/base" +KBRANCH_edgerouter = "v5.0/standard/edgerouter" +KBRANCH_beaglebone-yocto = "v5.0/standard/beaglebone" +KBRANCH_mpc8315e-rdb = "v5.0/standard/fsl-mpc8315e-rdb" + +KMACHINE_genericx86 ?= "common-pc" +KMACHINE_genericx86-64 ?= "common-pc-64" +KMACHINE_beaglebone-yocto ?= "beaglebone" + +SRCREV_machine_genericx86 ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d" +SRCREV_machine_genericx86-64 ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d" +SRCREV_machine_edgerouter ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d" +SRCREV_machine_beaglebone-yocto ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d" +SRCREV_machine_mpc8315e-rdb ?= "8b62af7f252af10588276802c4c6d7c502e875be" + +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.0.3" +LINUX_VERSION_genericx86-64 = "5.0.3" +LINUX_VERSION_edgerouter = "5.0.3" +LINUX_VERSION_beaglebone-yocto = "5.0.3" +LINUX_VERSION_mpc8315e-rdb = "5.0.3" -- cgit v1.2.3