From 677cc78161fe18b5e922f9928b5fc11cad014caa Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sun, 17 May 2020 11:17:39 +0200 Subject: apalis-tk1-mainline: rename machine to apalis-tk1 Rename the apalis-tk1-mainline machine to the now dropped apalis-tk1 machine name. Related-to: ELB-2733 Signed-off-by: Max Krummenacher (cherry picked from commit 0bf55088d1f34338dd04f83d6b90b7a72f6867de) --- recipes-graphics/drm/libdrm_%.bbappend | 2 +- recipes-graphics/mesa/mesa-demos_%.bbappend | 2 +- recipes-graphics/mesa/mesa_%.bbappend | 14 +++++--------- recipes-graphics/xorg-xserver/xserver-xorg_1.20%.bbappend | 9 +++------ 4 files changed, 10 insertions(+), 17 deletions(-) (limited to 'recipes-graphics') diff --git a/recipes-graphics/drm/libdrm_%.bbappend b/recipes-graphics/drm/libdrm_%.bbappend index 556cd85..f6e2376 100644 --- a/recipes-graphics/drm/libdrm_%.bbappend +++ b/recipes-graphics/drm/libdrm_%.bbappend @@ -1,4 +1,4 @@ PACKAGES += " ${PN}-tegra" FILES_${PN}-tegra = "${libdir}/libdrm_tegra.so.*" -PACKAGECONFIG_append_tegra124m = " tegra" +PACKAGECONFIG_append_tegra124 = " tegra" diff --git a/recipes-graphics/mesa/mesa-demos_%.bbappend b/recipes-graphics/mesa/mesa-demos_%.bbappend index 6521e73..1f384c1 100644 --- a/recipes-graphics/mesa/mesa-demos_%.bbappend +++ b/recipes-graphics/mesa/mesa-demos_%.bbappend @@ -1 +1 @@ -PACKAGECONFIG_append_apalis-tk1-mainline = " glut" +PACKAGECONFIG_append_apalis-tk1 = " glut" diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend index 7b44575..f2f791c 100644 --- a/recipes-graphics/mesa/mesa_%.bbappend +++ b/recipes-graphics/mesa/mesa_%.bbappend @@ -1,10 +1,6 @@ -##### -## Tegra TK1 mainline kernel +PACKAGECONFIG_append_tegra124 = " dri3 egl gles gallium gbm " +EXTRA_OECONF_append_tegra124 = " --enable-texture-float --without-dri-drivers --enable-glx --enable-osmesa --enable-debug" +DRIDRIVERS_tegra124 = " " +GALLIUMDRIVERS_tegra124 = "nouveau,tegra" -PACKAGECONFIG_append_tegra124m = " dri3 egl gles gallium gbm " -EXTRA_OECONF_append_tegra124m = " --enable-texture-float --without-dri-drivers --enable-glx --enable-osmesa --enable-debug" -DRIDRIVERS_tegra124m = " " -GALLIUMDRIVERS_tegra124m = "nouveau,tegra" - -PACKAGE_ARCH_tegra124m = "${MACHINE_ARCH}" -PE_tegra124m = "99" +PACKAGE_ARCH_tegra124 = "${MACHINE_ARCH}" diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_1.20%.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_1.20%.bbappend index e33bf18..66e0628 100644 --- a/recipes-graphics/xorg-xserver/xserver-xorg_1.20%.bbappend +++ b/recipes-graphics/xorg-xserver/xserver-xorg_1.20%.bbappend @@ -1,8 +1,5 @@ -# always latest and greatest. -PE_tegra124m = "99" +COMPATIBLE_MACHINE_tegra124 = "(tegra124)" -PACKAGE_ARCH_tegra124m = "${MACHINE_ARCH}" +PACKAGE_ARCH_tegra124 = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE_tegra124m = "(apalis-tk1-mainline)" - -PACKAGECONFIG_tegra124m ?= "dri2 dri3 xshmfence glamor glx xwayland udev ${XORG_CRYPTO} " +PACKAGECONFIG_tegra124 ?= "dri2 dri3 xshmfence glamor glx xwayland udev ${XORG_CRYPTO} " -- cgit v1.2.3