From 3d6217e8d41dee73fe79e9f8dd5fa1b53ff06da0 Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Sat, 16 Sep 2017 17:32:30 +0200 Subject: Fix rpm metadata clash due to change of rpm backend MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The rpm backend used in pyro changed behaviour and if multiple packages 'own' a directory the installation will fail. Inject a flag to mitigate this and avoid the break. Conflicting packages libgbm-dev and ti-sgx-ddk-um-dev on /usr/lib/pkgconfig . Change-Id: I52439d94c230a9314a543e00edd247f29d10e113 Signed-off-by: Jan-Simon Möller Reviewed-on: https://gerrit.automotivelinux.org/gerrit/10927 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account --- meta-agl-bsp/meta-ti/recipes-graphics/gbm/libgbm_%.bbappend | 2 ++ .../meta-ti/recipes-graphics/libgles/ti-sgx-ddk-um_%.bbappend | 4 ++++ 2 files changed, 6 insertions(+) create mode 100644 meta-agl-bsp/meta-ti/recipes-graphics/gbm/libgbm_%.bbappend (limited to 'meta-agl-bsp/meta-ti') diff --git a/meta-agl-bsp/meta-ti/recipes-graphics/gbm/libgbm_%.bbappend b/meta-agl-bsp/meta-ti/recipes-graphics/gbm/libgbm_%.bbappend new file mode 100644 index 000000000..7a16fbfe6 --- /dev/null +++ b/meta-agl-bsp/meta-ti/recipes-graphics/gbm/libgbm_%.bbappend @@ -0,0 +1,2 @@ +# Hotfix for rpm metadata clash with ti-sgx-ddk-um-dev +DIRFILES = "1" diff --git a/meta-agl-bsp/meta-ti/recipes-graphics/libgles/ti-sgx-ddk-um_%.bbappend b/meta-agl-bsp/meta-ti/recipes-graphics/libgles/ti-sgx-ddk-um_%.bbappend index 21142df59..fe93f1a6b 100644 --- a/meta-agl-bsp/meta-ti/recipes-graphics/libgles/ti-sgx-ddk-um_%.bbappend +++ b/meta-agl-bsp/meta-ti/recipes-graphics/libgles/ti-sgx-ddk-um_%.bbappend @@ -16,3 +16,7 @@ do_install_append() { install -d ${D}/etc/ti-sgx install -m 0755 ${D}/etc/init.d/rc.pvr ${D}/etc/ti-sgx } + + +# Fix for rpm metadata clash with libgbm-dev +DIRFILES = "1" -- cgit 1.2.3-korg