Skip to content

Commit

Permalink
Merge pull request #337 from YoeDistro/kraj/dunfell
Browse files Browse the repository at this point in the history
Update layers and backport doc changes
  • Loading branch information
cbrake authored Apr 16, 2020
2 parents d3fe118 + 794770b commit a8daecc
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 9 deletions.
13 changes: 9 additions & 4 deletions docs/layer-management.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/<topic>` - 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/<topic>` - 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/<branch>-next` which
are used for regular CI builds.

- `<user>/<topic>` - This namespace is reserved for developers, these are also
short lived branches primarily used for development which are deleted after
Expand Down
2 changes: 1 addition & 1 deletion sources/meta-atmel
Submodule meta-atmel updated 49 files
+0 −40 dynamic-layers/qt4-layer/recipes-qt4/apps/applicationlauncher_1.4.bb
+0 −41 dynamic-layers/qt4-layer/recipes-qt4/apps/homeautomation_1.5.bb
+0 −43 dynamic-layers/qt4-layer/recipes-qt4/apps/minehunt_1.2.bb
+0 −36 dynamic-layers/qt4-layer/recipes-qt4/apps/qmlbrowser_1.2.bb
+0 −39 dynamic-layers/qt4-layer/recipes-qt4/apps/samegame_1.1.bb
+0 −47 dynamic-layers/qt4-layer/recipes-qt4/apps/smartrefrigerator_1.2.bb
+0 −119 dynamic-layers/qt4-layer/recipes-qt4/images/atmel-qt4e-demo-image.bb
+0 −4 dynamic-layers/qt4-layer/recipes-qt4/meta/meta-toolchain-qte.bbappend
+0 −2 dynamic-layers/qt4-layer/recipes-qt4/qt4/nativesdk-qt4-tools_%.bbappend
+0 −26 dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-embedded-4.8.7/qt-embedded-linux-4.8.4-phonon-colors-fix.patch
+0 −2 dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-embedded_4.8.7.bbappend
+0 −5 dynamic-layers/qt5-layer/recipes-python/pyqt5/python3-pyqt5_%.bbappend
+0 −33 dynamic-layers/qt5-layer/recipes-qt/apps/applicationlauncher.inc
+0 −16 dynamic-layers/qt5-layer/recipes-qt/apps/applicationlauncher_git.bb
+0 −23 dynamic-layers/qt5-layer/recipes-qt/apps/files/0001-whiteboard.pro-Add-qt-to-CONFIG-in-project.patch
+0 −28 dynamic-layers/qt5-layer/recipes-qt/apps/files/0001-wildwest.pro-Add-builddir-to-install-files.patch
+0 −23 dynamic-layers/qt5-layer/recipes-qt/apps/files/applicationlauncher_videoplayer.patch
+0 −60 dynamic-layers/qt5-layer/recipes-qt/apps/files/fs-overlay/etc/mchp_qtdemo
+0 −4 dynamic-layers/qt5-layer/recipes-qt/apps/files/fs-overlay/etc/qtprofile.sh
+0 −2 dynamic-layers/qt5-layer/recipes-qt/apps/files/fs-overlay/opt/ApplicationLauncher/demo.config
+0 −22 dynamic-layers/qt5-layer/recipes-qt/apps/files/header.patch
+0 −42 dynamic-layers/qt5-layer/recipes-qt/apps/homeautomation_1.10.bb
+0 −38 dynamic-layers/qt5-layer/recipes-qt/apps/homeautomation_git.bb
+0 −33 dynamic-layers/qt5-layer/recipes-qt/apps/iocontrol_1.2.bb
+0 −27 dynamic-layers/qt5-layer/recipes-qt/apps/mchp-qt-demo-init_1.0.bb
+0 −42 dynamic-layers/qt5-layer/recipes-qt/apps/minehunt_1.7.bb
+0 −44 dynamic-layers/qt5-layer/recipes-qt/apps/ptpdemo_1.5.bb
+0 −46 dynamic-layers/qt5-layer/recipes-qt/apps/qmlbrowser_1.7.bb
+0 −32 dynamic-layers/qt5-layer/recipes-qt/apps/qtviewplanes_1.0.bb
+0 −38 dynamic-layers/qt5-layer/recipes-qt/apps/samegame_1.6.bb
+0 −55 dynamic-layers/qt5-layer/recipes-qt/apps/smartrefrigerator_1.6.bb
+0 −32 dynamic-layers/qt5-layer/recipes-qt/apps/spacetouch_1.0.bb
+0 −42 dynamic-layers/qt5-layer/recipes-qt/apps/videoplayer_git.bb
+0 −38 dynamic-layers/qt5-layer/recipes-qt/apps/whiteboard_1.0.bb
+0 −34 dynamic-layers/qt5-layer/recipes-qt/apps/wildwest_1.0.bb
+0 −4 dynamic-layers/qt5-layer/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bbappend
+0 −22 dynamic-layers/qt5-layer/recipes-qt/qt5/files/0001-make-QGraphicsItem-update-virtual.patch
+0 −103 dynamic-layers/qt5-layer/recipes-qt/qt5/files/0004-Provide-access-to-linuxfb-dri-fd-through-platform.patch
+0 −71 dynamic-layers/qt5-layer/recipes-qt/qt5/files/0005-Support-DRM-KMS-planes-in-linuxfb-DRM-backend.patch
+0 −11 dynamic-layers/qt5-layer/recipes-qt/qt5/files/atmel-color-format-force.patch
+0 −39 dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
+0 −39 ...s/qt5-layer/recipes-qt/qt5/qtmultimedia/0001-fix-qt5.12.4-compile-issue-when-no-opengl-in-QVideoSurfa.patch
+0 −4 dynamic-layers/qt5-layer/recipes-qt/qt5/qtmultimedia_%.bbappend
+1 −0 recipes-atmel/images/microchip-graphics-image.bb
+1 −1 recipes-egt/apps/egt-launcher_1.0.bb
+1 −1 recipes-egt/apps/egt-samples_1.0.bb
+7 −2 recipes-egt/apps/egt-thermostat_1.0.bb
+1 −1 recipes-graphics/libegt/libegt_1.0.bb
+2 −3 recipes-kernel/linux/mchp-wireless-firmware_15.4.bb
2 changes: 1 addition & 1 deletion sources/meta-freescale
Submodule meta-freescale updated 49 files
+54 −6 EULA
+5 −1 classes/fsl-eula-unpack.bbclass
+17 −8 conf/machine/imx6qdlsabresd.conf
+1 −1 conf/machine/imx6sxsabreauto.conf
+10 −3 conf/machine/imx6ulevk.conf
+8 −3 conf/machine/imx6ullevk.conf
+11 −5 conf/machine/imx7dsabresd.conf
+14 −5 conf/machine/imx7ulpevk.conf
+17 −6 conf/machine/imx8mmevk.conf
+12 −6 conf/machine/imx8mnevk.conf
+18 −13 conf/machine/imx8mqevk.conf
+18 −13 conf/machine/imx8qmmek.conf
+22 −10 conf/machine/imx8qxpmek.conf
+21 −26 conf/machine/include/imx-base.inc
+2 −2 recipes-bsp/imx-atf/imx-atf_2.0.bb
+1 −1 recipes-bsp/imx-mkimage/imx-mkimage_git.inc
+4 −2 recipes-bsp/imx-test/imx-test_git.bb
+2 −2 recipes-bsp/u-boot/u-boot-imx-common.inc
+1 −1 recipes-graphics/drm/libdrm_2.4.99.imx.bb
+5 −5 recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.4.0.p2.0.bb
+22 −23 recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+0 −6 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p1.0-aarch64.bb
+3 −3 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.0-aarch32.bb
+6 −0 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.0-aarch64.bb
+2 −2 recipes-graphics/wayland/wayland-protocols_1.18.imx.bb
+0 −78 recipes-graphics/wayland/weston/0001-make-error-portable.patch
+75 −51 recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
+0 −30 recipes-graphics/wayland/weston/0003-weston-touch-calibrator-Advertise-the-touchscreen-ca.patch
+37 −43 recipes-graphics/wayland/weston_8.0.0.imx.bb
+2 −2 recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.0.p2.0.bb
+2 −2 recipes-kernel/kernel-modules/kernel-module-qcacld-lea.inc
+0 −98 recipes-kernel/linux/linux-imx-4.19.35/0001-Compiler-Attributes-add-support-for-__copy-gcc-9.patch
+0 −83 recipes-kernel/linux/linux-imx-4.19.35/0002-include-linux-module.h-copy-__init-__exit-attrs-to-i.patch
+0 −0 recipes-kernel/linux/linux-imx-5.4.3/0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch
+162 −72 recipes-kernel/linux/linux-imx-5.4.3/imx/defconfig
+392 −144 recipes-kernel/linux/linux-imx-5.4.3/mx8/defconfig
+0 −57 recipes-kernel/linux/linux-imx-headers_4.19.35.bb
+67 −0 recipes-kernel/linux/linux-imx-headers_5.4.3.bb
+0 −466 recipes-kernel/linux/linux-imx-mfgtool-4.19.35/defconfig
+0 −0 recipes-kernel/linux/linux-imx-mfgtool_5.4.3.bb
+5 −7 recipes-kernel/linux/linux-imx_5.4.3.bb
+2 −2 recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb
+2 −2 recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb
+1 −1 recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.imx.bb
+1 −1 recipes-multimedia/gstreamer/gstreamer1.0_1.16.imx.bb
+2 −2 recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.5.3.bb
+1 −3 recipes-security/optee-imx/optee-client_3.2.0.imx.bb
+3 −6 recipes-security/optee-imx/optee-os_3.2.0.imx.bb
+2 −4 recipes-security/optee-imx/optee-test_3.2.0.imx.bb
2 changes: 1 addition & 1 deletion sources/meta-intel

0 comments on commit a8daecc

Please sign in to comment.