diff options
| author | Ming Liu <ming.liu@toradex.com> | 2020-04-17 17:29:46 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2020-06-01 11:57:00 +0200 |
| commit | 84a7ab6926ceab490f6f912b5cd8b87556000b3f (patch) | |
| tree | 7ac1d44fc1ce1b0bc02636fca4412fb3a69dc937 | |
| parent | d1c25d0ca76d3b0c32a5ffce0285572c13f0166f (diff) | |
meta: avoid overridding DISTROOVERRIDES
'DISTRO' is in DISTROOVERRIDES by default, we should not use "=" to
override that when adding 'tdx' to DISTROOVERRIDES, use ".=" to append
to it.
With the above change, we do not need to append 'tdx-x11' and
'tdx-xwayland' to DISTROOVERRIDES, drop them.
Signed-off-by: Ming Liu <ming.liu@toradex.com>
(cherry picked from commit 9a93acdeda3fed168b74c33788f385ac42702ed4)
| -rw-r--r-- | conf/distro/include/tdx-base.inc | 2 | ||||
| -rw-r--r-- | conf/distro/tdx-x11.conf | 1 | ||||
| -rw-r--r-- | conf/distro/tdx-xwayland.conf | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/conf/distro/include/tdx-base.inc b/conf/distro/include/tdx-base.inc index e6ae418..1156b47 100644 --- a/conf/distro/include/tdx-base.inc +++ b/conf/distro/include/tdx-base.inc @@ -39,7 +39,7 @@ MAINTAINER = "Toradex <yocto-patches@toradex.com>" TARGET_VENDOR = "-tdx" -DISTROOVERRIDES = "tdx" +DISTROOVERRIDES .= ":tdx" # create etc/build in the rootfs INHERIT += "image-buildinfo" diff --git a/conf/distro/tdx-x11.conf b/conf/distro/tdx-x11.conf index c809571..37ae401 100644 --- a/conf/distro/tdx-x11.conf +++ b/conf/distro/tdx-x11.conf @@ -5,7 +5,6 @@ require conf/distro/include/tdx-base.inc DISTRO = "tdx-x11" DISTRO_NAME = "TDX X11" -DISTROOVERRIDES .= ":tdx-x11" DISTRO_FLAVOUR = "" # Remove conflicting backends. diff --git a/conf/distro/tdx-xwayland.conf b/conf/distro/tdx-xwayland.conf index fa11461..40bdda3 100644 --- a/conf/distro/tdx-xwayland.conf +++ b/conf/distro/tdx-xwayland.conf @@ -5,7 +5,6 @@ require conf/distro/include/tdx-base.inc DISTRO = "tdx-xwayland" DISTRO_NAME = "TDX Wayland with XWayland" -DISTROOVERRIDES .= ":tdx-wayland" DISTRO_FLAVOUR = "" # we use graphics, so set opengl |