diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /meta-raspberrypi/recipes-graphics/userland/files/0009-fix-cmake-dependency-race.patch | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-raspberrypi/recipes-graphics/userland/files/0009-fix-cmake-dependency-race.patch')
-rw-r--r-- | meta-raspberrypi/recipes-graphics/userland/files/0009-fix-cmake-dependency-race.patch | 78 |
1 files changed, 78 insertions, 0 deletions
diff --git a/meta-raspberrypi/recipes-graphics/userland/files/0009-fix-cmake-dependency-race.patch b/meta-raspberrypi/recipes-graphics/userland/files/0009-fix-cmake-dependency-race.patch new file mode 100644 index 000000000..4609455a3 --- /dev/null +++ b/meta-raspberrypi/recipes-graphics/userland/files/0009-fix-cmake-dependency-race.patch @@ -0,0 +1,78 @@ +From e510be221276d06e630ab93452ecb712d3921790 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 6 Feb 2016 13:12:47 -0800 +Subject: [PATCH 09/18] fix cmake dependency race + +Fixes errors like + +/a/builder/mnt/build-oe/tmp-glibc/work/raspberrypi2-oe-linux-gnueabi/userland/git-r5/git/interface/vmcs_host/vc_vchi_dispmanx.h:72:66: +fatal error: interface/vmcs_host/wayland-dispmanx-server-protocol.h: No +such file or directory +compilation terminated. +interface/khronos/CMakeFiles/EGL_static.dir/build.make:773: recipe for +target 'interface/khronos/CMakeFiles/EGL_static.dir/ext/egl_wayland.c.o' +failed +make[2]: *** +[interface/khronos/CMakeFiles/EGL_static.dir/ext/egl_wayland.c.o] Error 1 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + interface/vcos/pthreads/CMakeLists.txt | 8 ++++++++ + interface/vmcs_host/CMakeLists.txt | 8 -------- + interface/vmcs_host/vc_vchi_dispmanx.h | 2 +- + 3 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/interface/vcos/pthreads/CMakeLists.txt b/interface/vcos/pthreads/CMakeLists.txt +index 1d81ca3..d6cd415 100644 +--- a/interface/vcos/pthreads/CMakeLists.txt ++++ b/interface/vcos/pthreads/CMakeLists.txt +@@ -33,6 +33,14 @@ set (SOURCES + ../generic/vcos_generic_blockpool.c + ) + ++if (BUILD_WAYLAND) ++wayland_add_protocol_server( ++ SOURCES ++ ../../../interface/wayland/dispmanx.xml ++ dispmanx ++) ++endif () ++ + if (VCOS_PTHREADS_BUILD_SHARED) + add_library (vcos SHARED ${SOURCES}) + target_link_libraries (vcos pthread dl rt) +diff --git a/interface/vmcs_host/CMakeLists.txt b/interface/vmcs_host/CMakeLists.txt +index 6718215..c415176 100755 +--- a/interface/vmcs_host/CMakeLists.txt ++++ b/interface/vmcs_host/CMakeLists.txt +@@ -17,14 +17,6 @@ set(VCHOSTIF_SOURCE + # ${VMCS_TARGET}/vmcs_main.c + # vc_vchi_haud.c + +-if (BUILD_WAYLAND) +-wayland_add_protocol_server( +- VCHOSTIF_SOURCE +- ../../interface/wayland/dispmanx.xml +- dispmanx +-) +-endif () +- + add_library(vchostif ${VCHOSTIF_SOURCE}) + + #add_library(bufman vc_vchi_bufman.c ) +diff --git a/interface/vmcs_host/vc_vchi_dispmanx.h b/interface/vmcs_host/vc_vchi_dispmanx.h +index f0bae30..8c44c58 100644 +--- a/interface/vmcs_host/vc_vchi_dispmanx.h ++++ b/interface/vmcs_host/vc_vchi_dispmanx.h +@@ -69,7 +69,7 @@ typedef struct { + #ifdef BUILD_WAYLAND + /* XXX: This should be in a private header that can be included from EGL and vc_* */ + #include <wayland-server.h> +-#include "interface/vmcs_host/wayland-dispmanx-server-protocol.h" ++#include "interface/vcos/pthreads/wayland-dispmanx-server-protocol.h" + struct wl_dispmanx_server_buffer { + struct wl_resource *resource; + struct wl_dispmanx *dispmanx; +-- +2.19.1 + |