diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /poky/meta/recipes-graphics/mesa/files/0005-dri-i965-Add-missing-time.h-include.patch | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-graphics/mesa/files/0005-dri-i965-Add-missing-time.h-include.patch')
-rw-r--r-- | poky/meta/recipes-graphics/mesa/files/0005-dri-i965-Add-missing-time.h-include.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/poky/meta/recipes-graphics/mesa/files/0005-dri-i965-Add-missing-time.h-include.patch b/poky/meta/recipes-graphics/mesa/files/0005-dri-i965-Add-missing-time.h-include.patch deleted file mode 100644 index d40e7b585..000000000 --- a/poky/meta/recipes-graphics/mesa/files/0005-dri-i965-Add-missing-time.h-include.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9e0368af471af3a36e0eb526453f892598120065 Mon Sep 17 00:00:00 2001 -From: Otavio Salvador <otavio@ossystems.com.br> -Date: Wed, 6 Jun 2018 09:50:35 -0300 -Subject: [PATCH 5/6] dri: i965: Add missing time.h include -Organization: O.S. Systems Software LTDA. - -This fixes a build error when using musl: - -,---- -| In file included from .../src/mesa/drivers/dri/i965/intel_upload.c:33:0: -| .../src/mesa/drivers/dri/i965/brw_bufmgr.h:132:4: error: unknown type name 'time_t' -| time_t free_time; -| ^~~~~~ -`---- - -Upstream-Status: Backport [3c288da5eec81ee58b85927df18d9194ead8f5c2] -Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> ---- - src/mesa/drivers/dri/i965/brw_bufmgr.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/mesa/drivers/dri/i965/brw_bufmgr.h b/src/mesa/drivers/dri/i965/brw_bufmgr.h -index 68f5e0c2c8..5b60a23763 100644 ---- a/src/mesa/drivers/dri/i965/brw_bufmgr.h -+++ b/src/mesa/drivers/dri/i965/brw_bufmgr.h -@@ -37,6 +37,7 @@ - #include <stdbool.h> - #include <stdint.h> - #include <stdio.h> -+#include <time.h> - #include "util/u_atomic.h" - #include "util/list.h" - --- -2.18.0 - |