diff options
author | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2020-04-27 17:32:16 +0200 |
---|---|---|
committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2020-04-27 17:32:33 +0200 |
commit | b16f1f6b8bdd7b0cef4aad3a6714798b66d8b0a5 (patch) | |
tree | 61c5df69bed7810e988b06434e8efc7ab9071acd /templates/machine | |
parent | 40213738bcd84fc542cda3ec6336b0e394b28dcc (diff) | |
parent | c24cdffea9dfa3904fc3ea9da0bc80e5515b078d (diff) |
Merge branch 'next'
* next:
Temporary workarounds for h3ulcb and bbe
[RCAR] use omx-user-module as libomxil provider
meta-agl-bsp: dra7xx-evm/beaglebone updates for dunfell
meta-agl-bsp: remove obsolete linux-fslc-imx bbappend
meta-agl-profile-graphical-qt5: remove Chromium specific bits from SDK
meta-agl-profile-graphical: disable memfd usage in weston
meta-agl-bsp: update raspberrypi configuration for dunfell
meta-agl-{bsp,distro}: update kernel configuration for dunfell
meta-agl-profile-core: update psplash for dunfell
meta-agl-profile-core: update systemd for dunfell
meta-app-framework: set DISTRO_FEATURES_NATIVE
meta-agl-profile-core: update bluez5 for dunfell
meta-agl-profile-graphical: update weston for dunfell
meta-agl-profile-graphical: update wayland-ivi-extension for dunfell
meta-agl-profile-graphical: update wayland for dunfell
meta-agl-profile-core: update pulseaudio for dunfell
meta-security: update to audit 2.8.5
Update distro_features_check usage
meta-agl-bsp: remove vboxguestdrivers recipe
Declare layer compatibility for dunfell
Change-Id: I879ad3040ed6f2fca3f21d189ccce7f1614013b5
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'templates/machine')
l--------- | templates/machine/bbe | 1 | ||||
-rw-r--r-- | templates/machine/bbe-sancloud/50_bblayers.conf.inc (renamed from templates/machine/bbe/50_bblayers.conf.inc) | 1 | ||||
-rw-r--r-- | templates/machine/bbe-sancloud/50_local.conf.inc (renamed from templates/machine/bbe/50_local.conf.inc) | 0 | ||||
-rw-r--r-- | templates/machine/bbe-sancloud/README_machine_bbe.md (renamed from templates/machine/bbe/README_machine_bbe.md) | 0 | ||||
-rw-r--r-- | templates/machine/beaglebone/50_bblayers.conf.inc | 5 | ||||
-rw-r--r-- | templates/machine/dra7xx-evm/50_bblayers.conf.inc | 5 | ||||
-rw-r--r-- | templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc | 5 | ||||
-rw-r--r-- | templates/machine/h3ulcb-nogfx/50_local.conf.inc | 2 | ||||
-rw-r--r-- | templates/machine/h3ulcb/50_bblayers.conf.inc | 5 | ||||
-rw-r--r-- | templates/machine/h3ulcb/50_local.conf.inc | 2 |
10 files changed, 20 insertions, 6 deletions
diff --git a/templates/machine/bbe b/templates/machine/bbe new file mode 120000 index 000000000..985856b9d --- /dev/null +++ b/templates/machine/bbe @@ -0,0 +1 @@ +beaglebone
\ No newline at end of file diff --git a/templates/machine/bbe/50_bblayers.conf.inc b/templates/machine/bbe-sancloud/50_bblayers.conf.inc index 0b42c9bff..b2fffb9dd 100644 --- a/templates/machine/bbe/50_bblayers.conf.inc +++ b/templates/machine/bbe-sancloud/50_bblayers.conf.inc @@ -1,4 +1,5 @@ BBLAYERS =+ " \ + ${METADIR}/bsp/meta-arm/meta-arm \ ${METADIR}/bsp/meta-ti \ ${METADIR}/bsp/meta-sancloud \ ${METADIR}/bsp/meta-rtlwifi \ diff --git a/templates/machine/bbe/50_local.conf.inc b/templates/machine/bbe-sancloud/50_local.conf.inc index 7f378e5cb..7f378e5cb 100644 --- a/templates/machine/bbe/50_local.conf.inc +++ b/templates/machine/bbe-sancloud/50_local.conf.inc diff --git a/templates/machine/bbe/README_machine_bbe.md b/templates/machine/bbe-sancloud/README_machine_bbe.md index c32f23d4f..c32f23d4f 100644 --- a/templates/machine/bbe/README_machine_bbe.md +++ b/templates/machine/bbe-sancloud/README_machine_bbe.md diff --git a/templates/machine/beaglebone/50_bblayers.conf.inc b/templates/machine/beaglebone/50_bblayers.conf.inc index f116ca28b..6b9323262 100644 --- a/templates/machine/beaglebone/50_bblayers.conf.inc +++ b/templates/machine/beaglebone/50_bblayers.conf.inc @@ -1 +1,4 @@ -BBLAYERS =+ "${METADIR}/bsp/meta-ti" +BBLAYERS =+ "\ + ${METADIR}/bsp/meta-arm/meta-arm \ + ${METADIR}/bsp/meta-ti \ + " diff --git a/templates/machine/dra7xx-evm/50_bblayers.conf.inc b/templates/machine/dra7xx-evm/50_bblayers.conf.inc index f116ca28b..6b9323262 100644 --- a/templates/machine/dra7xx-evm/50_bblayers.conf.inc +++ b/templates/machine/dra7xx-evm/50_bblayers.conf.inc @@ -1 +1,4 @@ -BBLAYERS =+ "${METADIR}/bsp/meta-ti" +BBLAYERS =+ "\ + ${METADIR}/bsp/meta-arm/meta-arm \ + ${METADIR}/bsp/meta-ti \ + " diff --git a/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc b/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc index 5f410f0ff..794f66cc6 100644 --- a/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc +++ b/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc @@ -1,4 +1,7 @@ BBLAYERS =+ "\ ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \ - ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \ " + +# disable kingfisher until fixed +# ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \ +# " diff --git a/templates/machine/h3ulcb-nogfx/50_local.conf.inc b/templates/machine/h3ulcb-nogfx/50_local.conf.inc index 4403e6ea9..1f3c72521 100644 --- a/templates/machine/h3ulcb-nogfx/50_local.conf.inc +++ b/templates/machine/h3ulcb-nogfx/50_local.conf.inc @@ -4,4 +4,4 @@ require conf/include/agl_h3ulcb-nogfx.inc # custom inclusion of cogent layer #see meta-agl/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc -require conf/include/rcar-gen3-adas.inc +#require conf/include/rcar-gen3-adas.inc diff --git a/templates/machine/h3ulcb/50_bblayers.conf.inc b/templates/machine/h3ulcb/50_bblayers.conf.inc index 5f410f0ff..794f66cc6 100644 --- a/templates/machine/h3ulcb/50_bblayers.conf.inc +++ b/templates/machine/h3ulcb/50_bblayers.conf.inc @@ -1,4 +1,7 @@ BBLAYERS =+ "\ ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \ - ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \ " + +# disable kingfisher until fixed +# ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \ +# " diff --git a/templates/machine/h3ulcb/50_local.conf.inc b/templates/machine/h3ulcb/50_local.conf.inc index 43e117372..6377a1e82 100644 --- a/templates/machine/h3ulcb/50_local.conf.inc +++ b/templates/machine/h3ulcb/50_local.conf.inc @@ -3,5 +3,5 @@ MACHINE = "h3ulcb" require conf/include/agl_h3ulcb.inc #see meta-agl/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc -require conf/include/rcar-gen3-adas.inc +#require conf/include/rcar-gen3-adas.inc |