From 1fc5c153e5eb8cc5b4b83a9eac088d232b2de4a8 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 15 Apr 2020 10:49:08 -0700 Subject: [PATCH 1/3] doc: Improve layer-management.md to reflect current branching strategy Signed-off-by: Khem Raj --- docs/layer-management.md | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/docs/layer-management.md b/docs/layer-management.md index d1bdeac2b..64f75c676 100644 --- a/docs/layer-management.md +++ b/docs/layer-management.md @@ -7,10 +7,15 @@ space on github. These layers are synced every two hours with upstream since the global namespace is kept intact, there are no conflicts. We reserve namespaces for local branches -- `yoe/` - Distro Specific branch, needed when we have to do distro - speicific fixes which are not upstreamable, this is rare situation, secondly, - we create additional layers e.g. yoe/mut ( mut stands for "Master-Under-Test) - branches which are used for regular CI builds. +- `yoe/` - Distro Specific branch, created for yoe release we support this + has speicific fixes which are not + + - upstreamable, this is rare situation + - Required for yoe and are in flight for upstream inclusion - Submissions + from yoe community + + we also create additional integration branches e.g. `yoe/-next` which + are used for regular CI builds. - `/` - This namespace is reserved for developers, these are also short lived branches primarily used for development which are deleted after From 836603592c5c32c26d4c03ce1e8bee6893c9349f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 15 Apr 2020 11:53:13 -0700 Subject: [PATCH 2/3] Layer Updates: sources/meta-atmel sources/meta-raspberrypi sources/meta-webkit * sources/meta-atmel 17bb214...9b22188 (1): > mchp-wireless-firmware: Bump to version 15.4.rc1 * sources/meta-raspberrypi 8d163dd...0917b60 (3): > rpi-base.inc: Add kernel modules to all images > raspberrypi3: Switch to vc4-fkms-v3d. > linux-raspberrypi_5.4.bb: Backport the patch to use CHECK macro instead of RET_IF * sources/meta-webkit 3f258d3...3152bc3 (3): > Revert "wpewebkit: Include cmake_qt5 only when qtwpe is in packageconfigs" > wpebackend-fdo: Simplification of the DEPENDS definition > wpebackend-rdk: Add xkbcommon as depend (#50) Signed-off-by: Khem Raj --- sources/meta-atmel | 2 +- sources/meta-raspberrypi | 2 +- sources/meta-webkit | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sources/meta-atmel b/sources/meta-atmel index 17bb21475..9b2218867 160000 --- a/sources/meta-atmel +++ b/sources/meta-atmel @@ -1 +1 @@ -Subproject commit 17bb214751a0554eec98e13c5a04cc2ab6eb1d91 +Subproject commit 9b22188674cd330b11a546c779ea146ee81e08b7 diff --git a/sources/meta-raspberrypi b/sources/meta-raspberrypi index 8d163dd84..0917b6052 160000 --- a/sources/meta-raspberrypi +++ b/sources/meta-raspberrypi @@ -1 +1 @@ -Subproject commit 8d163dd844c3737d1557395c1eb512ebac86bdc0 +Subproject commit 0917b60527242d3668efc2d3b918df64b13e7b6f diff --git a/sources/meta-webkit b/sources/meta-webkit index 3f258d359..3152bc388 160000 --- a/sources/meta-webkit +++ b/sources/meta-webkit @@ -1 +1 @@ -Subproject commit 3f258d359f683d268f9a2a2159243a2feb338469 +Subproject commit 3152bc388d10bbe687953482d3366c5ed07cd3da From befb6d59e915033c854ec919960099593e110e05 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 15 Apr 2020 19:12:12 -0700 Subject: [PATCH 3/3] Layer Updates: sources/meta-freescale sources/meta-ti * sources/meta-freescale 27a886bd...f02d6921 (4): > mx8qxp: Use cortexa35-crypto tuning for i.MX 8 QXP default > Finally fix the mainline BSP vs NXP BSP dynamic change > imx-test: Restrict recipe to NXP BSP only > imx-base.inc: Avoid imx-alsa-plugins use on mainline BSP * sources/meta-ti b86df50c...568f3294 (7): > ti-pdk: SRCREV update to 2020.4.13 > ipc-lld: Update examples to build only select examples > starterware-inc: SRCREV update to 02.01.01.12A > sa-lld:SRCREV update to 04.00.00.03C > pm-lld-rtos:SRCREV update to 01.08.00.23A > common-csl-ip:SRCREV update to 03.03.00.17A > ti-pdk:SRCREV update to 2020.4.5 Signed-off-by: Khem Raj --- sources/meta-freescale | 2 +- sources/meta-ti | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/meta-freescale b/sources/meta-freescale index 27a886bd3..f02d6921b 160000 --- a/sources/meta-freescale +++ b/sources/meta-freescale @@ -1 +1 @@ -Subproject commit 27a886bd30fd22b7efbf492a5572ea9fc3cdbf09 +Subproject commit f02d6921bacee8396579330999d57f2381e89402 diff --git a/sources/meta-ti b/sources/meta-ti index b86df50ce..568f32945 160000 --- a/sources/meta-ti +++ b/sources/meta-ti @@ -1 +1 @@ -Subproject commit b86df50cefa49c10f1dd340e16a74b3191074fb5 +Subproject commit 568f329454885ec93ec56a0205c08f01bbaedbcf