From f86532f8ac81d1c7dae63ed242f54473aa1b1dda Mon Sep 17 00:00:00 2001 From: Kenta Date: Thu, 3 Oct 2024 10:32:55 +0900 Subject: Unified HMI: Remove rpath tweaks Now we don't use LD_LIBRARY_PATH hook to achive remote rendering, so that we can just remove rpath tweaks in weston binaries. Bug-AGL: SPEC-5253 Change-Id: I3909c6714a0bdf5bc5ca7eb83d03dbdd426f900b Signed-off-by: Kenta --- meta-uhmi/meta-rvgpu/conf/include/agl-rvgpu.inc | 5 ----- meta-uhmi/meta-rvgpu/recipes-graphics/wayland/weston_%.bbappend | 1 - .../meta-rvgpu/recipes-graphics/wayland/weston_rvgpuproxy.inc | 7 ------- templates/feature/agl-rvgpu/50_local.conf.inc | 2 -- 4 files changed, 15 deletions(-) delete mode 100644 meta-uhmi/meta-rvgpu/conf/include/agl-rvgpu.inc delete mode 100644 meta-uhmi/meta-rvgpu/recipes-graphics/wayland/weston_%.bbappend delete mode 100644 meta-uhmi/meta-rvgpu/recipes-graphics/wayland/weston_rvgpuproxy.inc delete mode 100644 templates/feature/agl-rvgpu/50_local.conf.inc diff --git a/meta-uhmi/meta-rvgpu/conf/include/agl-rvgpu.inc b/meta-uhmi/meta-rvgpu/conf/include/agl-rvgpu.inc deleted file mode 100644 index 3fd99823..00000000 --- a/meta-uhmi/meta-rvgpu/conf/include/agl-rvgpu.inc +++ /dev/null @@ -1,5 +0,0 @@ -# As of now, we'd unconditionally append agl-rvgpu-proxy -# to all images belong to agl-rvgpu feature. In future -# it will be handled properly via multiconfig etc. - -AGL_FEATURES:append = " agl-rvgpu-proxy" diff --git a/meta-uhmi/meta-rvgpu/recipes-graphics/wayland/weston_%.bbappend b/meta-uhmi/meta-rvgpu/recipes-graphics/wayland/weston_%.bbappend deleted file mode 100644 index 133a34e3..00000000 --- a/meta-uhmi/meta-rvgpu/recipes-graphics/wayland/weston_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -require ${@bb.utils.contains('AGL_FEATURES', 'agl-rvgpu-proxy', 'weston_rvgpuproxy.inc', '', d)} diff --git a/meta-uhmi/meta-rvgpu/recipes-graphics/wayland/weston_rvgpuproxy.inc b/meta-uhmi/meta-rvgpu/recipes-graphics/wayland/weston_rvgpuproxy.inc deleted file mode 100644 index 5b7536df..00000000 --- a/meta-uhmi/meta-rvgpu/recipes-graphics/wayland/weston_rvgpuproxy.inc +++ /dev/null @@ -1,7 +0,0 @@ -# Remove the RPATH variable, to be able to use LD_LIBRARY_PATH, -# to run render apps using /usr/lib/mesa-virtio -do_install:append() { - chrpath --delete ${D}${libdir}/libweston-10/*.so - chrpath --delete ${D}${libdir}/weston/*.so - chrpath --delete ${D}${libdir}/*.so -} diff --git a/templates/feature/agl-rvgpu/50_local.conf.inc b/templates/feature/agl-rvgpu/50_local.conf.inc deleted file mode 100644 index 46351825..00000000 --- a/templates/feature/agl-rvgpu/50_local.conf.inc +++ /dev/null @@ -1,2 +0,0 @@ -#see meta-rvgpu/conf/include/agl-rvgpu.inc -require conf/include/agl-rvgpu.inc -- cgit 1.2.3-korg