diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /poky/meta-yocto-bsp/recipes-kernel | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta-yocto-bsp/recipes-kernel')
5 files changed, 52 insertions, 65 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 new file mode 100644 index 000000000..f044dafb4 --- /dev/null +++ b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend @@ -0,0 +1,15 @@ +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" +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_mpc8315e-rdb = "mpc8315e-rdb" diff --git a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.12.bbappend b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.12.bbappend deleted file mode 100644 index 642809a38..000000000 --- a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.12.bbappend +++ /dev/null @@ -1,28 +0,0 @@ -KBRANCH_genericx86 = "standard/base" -KBRANCH_genericx86-64 = "standard/base" - -KMACHINE_genericx86 ?= "common-pc" -KMACHINE_genericx86-64 ?= "common-pc-64" -KBRANCH_edgerouter = "standard/edgerouter" -KBRANCH_beaglebone-yocto = "standard/beaglebone" -KMACHINE_beaglebone-yocto = "beaglebone" -KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb" - -SRCREV_machine_genericx86 ?= "7e7ac3f0fda9707e94b3311a4510ae080cd86238" -SRCREV_machine_genericx86-64 ?= "7e7ac3f0fda9707e94b3311a4510ae080cd86238" -SRCREV_machine_edgerouter ?= "89e003746eee54e86bc78e1170e7029d6597b583" -SRCREV_machine_beaglebone-yocto ?= "89e003746eee54e86bc78e1170e7029d6597b583" -SRCREV_machine_mpc8315e-rdb ?= "7080a5fe6af338576207fff999ea2ca35e689997" - - -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.12.24" -LINUX_VERSION_genericx86-64 = "4.12.24" -LINUX_VERSION_edgerouter = "4.12.24" -LINUX_VERSION_beaglebone-yocto = "4.12.24" -LINUX_VERSION_mpc8315e-rdb = "4.12.24" 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 index feb8d2e49..502485a94 100644 --- 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 @@ -8,11 +8,11 @@ KMACHINE_genericx86 ?= "common-pc" KMACHINE_genericx86-64 ?= "common-pc-64" KMACHINE_beaglebone-yocto ?= "beaglebone" -SRCREV_machine_genericx86 ?= "084af9624d268ddf4fd65b2f9e8e50ca2f22e62b" -SRCREV_machine_genericx86-64 ?= "084af9624d268ddf4fd65b2f9e8e50ca2f22e62b" -SRCREV_machine_edgerouter ?= "65d1c849534179bbfa494f77947f8be615e9871a" -SRCREV_machine_beaglebone-yocto ?= "d62ddfa26a59c83f6128790b7aa2baadc04d2960" -SRCREV_machine_mpc8315e-rdb ?= "80a106ecf737b69864e07b955eccb62f809cf120" +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" @@ -20,8 +20,8 @@ COMPATIBLE_MACHINE_edgerouter = "edgerouter" COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" -LINUX_VERSION_genericx86 = "4.14.67" -LINUX_VERSION_genericx86-64 = "4.14.67" -LINUX_VERSION_edgerouter = "4.14.48" -LINUX_VERSION_beaglebone-yocto = "4.14.48" -LINUX_VERSION_mpc8315e-rdb = "4.14.48" +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.15.bbappend b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.15.bbappend deleted file mode 100644 index 461daa050..000000000 --- a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.15.bbappend +++ /dev/null @@ -1,27 +0,0 @@ -KBRANCH_genericx86 = "v4.15/standard/base" -KBRANCH_genericx86-64 = "v4.15/standard/base" -KBRANCH_edgerouter = "v4.15/standard/edgerouter" -KBRANCH_beaglebone-yocto = "v4.15/standard/beaglebone" -KBRANCH_mpc8315e-rdb = "v4.15/standard/fsl-mpc8315e-rdb" - -KMACHINE_genericx86 ?= "common-pc" -KMACHINE_genericx86-64 ?= "common-pc-64" -KMACHINE_beaglebone-yocto ?= "beaglebone" - -SRCREV_machine_genericx86 ?= "51273ff79f4ad930f4a788257f58e1266cb236e3" -SRCREV_machine_genericx86-64 ?= "51273ff79f4ad930f4a788257f58e1266cb236e3" -SRCREV_machine_edgerouter ?= "e25dbfe95302eeaa1a03a828d05c09479574488a" -SRCREV_machine_beaglebone-yocto ?= "e25dbfe95302eeaa1a03a828d05c09479574488a" -SRCREV_machine_mpc8315e-rdb ?= "0b32edc46dfe7c40bf5451e9b7533c823bb2c6c4" - -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.15.18" -LINUX_VERSION_genericx86-64 = "4.15.18" -LINUX_VERSION_edgerouter = "4.15.18" -LINUX_VERSION_beaglebone-yocto = "4.15.18" -LINUX_VERSION_mpc8315e-rdb = "4.15.18" 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 new file mode 100644 index 000000000..bb599d8c5 --- /dev/null +++ b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.18.bbappend @@ -0,0 +1,27 @@ +KBRANCH_genericx86 = "v4.18/standard/base" +KBRANCH_genericx86-64 = "v4.18/standard/base" +KBRANCH_edgerouter = "v4.18/standard/edgerouter" +KBRANCH_beaglebone-yocto = "v4.18/standard/beaglebone" +KBRANCH_mpc8315e-rdb = "v4.18/standard/fsl-mpc8315e-rdb" + +KMACHINE_genericx86 ?= "common-pc" +KMACHINE_genericx86-64 ?= "common-pc-64" +KMACHINE_beaglebone-yocto ?= "beaglebone" + +SRCREV_machine_genericx86 ?= "33859b3077c83d8a024946ba06a59990546fcbc7" +SRCREV_machine_genericx86-64 ?= "33859b3077c83d8a024946ba06a59990546fcbc7" +SRCREV_machine_edgerouter ?= "0cdc8564c61958a39704d97e008120bd7c762f60" +SRCREV_machine_beaglebone-yocto ?= "0cdc8564c61958a39704d97e008120bd7c762f60" +SRCREV_machine_mpc8315e-rdb ?= "20be2231bb047b02248d7f965c1c3af0c6be3a5e" + +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.18.14" +LINUX_VERSION_genericx86-64 = "4.18.14" +LINUX_VERSION_edgerouter = "4.18.9" +LINUX_VERSION_beaglebone-yocto = "4.18.9" +LINUX_VERSION_mpc8315e-rdb = "4.18.9" |