diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2019-04-23 22:56:10 +0000 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2019-04-23 22:56:10 +0000 |
| commit | 9f9d25d0932d220291c02aa626c1ebd3503d8ce1 (patch) | |
| tree | b075f84165b223ffd9aeb9dd0b3b01f7579058d2 | |
| parent | ebbdd16b668e5415c5f828c5b18551b9719b3ef6 (diff) | |
| parent | 81860a2b53d3c45ac17ebf9e9e5645b1b692b8c3 (diff) | |
Merge branch 'thud-next' into 'thud-next'
Thud next, new features, drop colibri-vf
See merge request rd/linux-bsp/meta-toradex-distro!2
| -rw-r--r-- | buildconf/local.conf | 4 | ||||
| -rw-r--r-- | conf/distro/include/tdx-base.inc | 6 | ||||
| -rw-r--r-- | conf/distro/tdx-xwayland.conf | 9 |
3 files changed, 14 insertions, 5 deletions
diff --git a/buildconf/local.conf b/buildconf/local.conf index 0eebbd9..be6ae82 100644 --- a/buildconf/local.conf +++ b/buildconf/local.conf @@ -46,7 +46,6 @@ MACHINE ?= "colibri-imx6" #MACHINE ?= "colibri-imx6ull" #MACHINE ?= "colibri-imx7" #MACHINE ?= "colibri-imx7-emmc" -#MACHINE ?= "colibri-vf" # # There are also a selection of emulated machines available which can boot and run @@ -256,9 +255,6 @@ INHERIT += "toradex-mirrors" # Use this distro DISTRO = "tdx-x11" -# What image type(s) are to be built? -IMAGE_FSTYPES_append = " tar.bz2" - # Don't generate the mirror tarball for SCM repos, the snapshot is enough # BB_GENERATE_MIRROR_TARBALLS = "0" diff --git a/conf/distro/include/tdx-base.inc b/conf/distro/include/tdx-base.inc index 6b7457e..6a6141f 100644 --- a/conf/distro/include/tdx-base.inc +++ b/conf/distro/include/tdx-base.inc @@ -48,4 +48,8 @@ DISTRO_FEATURES_remove = "sysvinit" VIRTUAL-RUNTIME_init_manager = "systemd" PACKAGECONFIG_append_pn-qemu-native = " libusb" -hostname_pn-base-files = "" +# Use i.MX Gstreamer Version (for PXP DMA-ENGINE Driver) +PREFERRED_VERSION_gstreamer1.0_imx = "1.14.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-base_imx = "1.14.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-good_imx = "1.14.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-bad_imx = "1.14.imx" diff --git a/conf/distro/tdx-xwayland.conf b/conf/distro/tdx-xwayland.conf new file mode 100644 index 0000000..5c71a95 --- /dev/null +++ b/conf/distro/tdx-xwayland.conf @@ -0,0 +1,9 @@ +# Toradex Distro for Wayland with XWayland. +# Using the downstream kernel flavour + +require conf/distro/include/tdx-base.inc + +DISTRO = "tdx-xwayland" +DISTRO_NAME = "TDX Wayland with XWayland" + +DISTRO_FEATURES_append = " wayland x11" |