* [meta-raspberrypi][PATCH 2/4] userland: Upgrade to latest
2016-10-07 2:09 [meta-raspberrypi][PATCH 1/4] linux-raspberrypi_4.4: Upgrade to 4.4.23 Khem Raj
@ 2016-10-07 2:09 ` Khem Raj
2016-10-07 2:09 ` [meta-raspberrypi][PATCH 3/4] firmware: " Khem Raj
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Khem Raj @ 2016-10-07 2:09 UTC (permalink / raw)
To: yocto
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
...-applications-to-set-next-resource-handle.patch | 6 ++---
...ayland-Add-support-for-the-Wayland-winsys.patch | 28 +++++++++++-----------
.../0003-wayland-Add-Wayland-example.patch | 4 ++--
...-wayland-egl-Add-bcm_host-to-dependencies.patch | 4 ++--
...emove-faulty-assert-to-make-weston-happy-.patch | 22 ++++++++---------
...6-zero-out-wl-buffers-in-egl_surface_free.patch | 4 ++--
...007-initialize-front-back-wayland-buffers.patch | 4 ++--
.../userland/userland/0008-Remove-RPC_FLUSH.patch | 4 ++--
.../userland/0009-fix-cmake-dependency-race.patch | 6 ++---
.../0010-Fix-enum-conversion-warnings.patch | 4 ++--
...Fix-for-framerate-with-nested-composition.patch | 6 ++---
.../0012-build-shared-library-for-vchostif.patch | 6 ++---
...nt-buffer-wrapping-interface-for-dispmanx.patch | 4 ++--
recipes-graphics/userland/userland_git.bb | 2 +-
14 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/recipes-graphics/userland/userland/0001-Allow-applications-to-set-next-resource-handle.patch b/recipes-graphics/userland/userland/0001-Allow-applications-to-set-next-resource-handle.patch
index 8c855da..b5bf461 100644
--- a/recipes-graphics/userland/userland/0001-Allow-applications-to-set-next-resource-handle.patch
+++ b/recipes-graphics/userland/userland/0001-Allow-applications-to-set-next-resource-handle.patch
@@ -1,4 +1,4 @@
-From a096ab4b7bbdd8f78d93a54a8da1ca3c9470c2ec Mon Sep 17 00:00:00 2001
+From 2b87c1271a5b2fc60a7bcfcaf902f3ef69ccad24 Mon Sep 17 00:00:00 2001
From: Dom Cobley <dc4@broadcom.com>
Date: Tue, 9 Jul 2013 09:26:26 -0400
Subject: [PATCH 01/13] Allow applications to set next resource handle
@@ -56,7 +56,7 @@ index 8378f4a..ec961e0 100644
#define EGLINTFLUSH_ID 0x400c
#define EGLINTGETCOLORDATA_ID 0x400d
diff --git a/interface/khronos/egl/egl_client.c b/interface/khronos/egl/egl_client.c
-index 472ef0c..234da65 100644
+index 9d617c8..b8bb374 100644
--- a/interface/khronos/egl/egl_client.c
+++ b/interface/khronos/egl/egl_client.c
@@ -162,6 +162,17 @@ static void egl_current_release(CLIENT_PROCESS_STATE_T *process, EGL_CURRENT_T *
@@ -204,5 +204,5 @@ index 8a5734c..51b3580 100644
FN(void, eglIntGetColorData_impl, (EGL_SURFACE_ID_T s, KHRN_IMAGE_FORMAT_T format, uint32_t width, uint32_t height, int32_t stride, uint32_t y_offset, void *data))
--
-2.9.0
+2.10.0
diff --git a/recipes-graphics/userland/userland/0002-wayland-Add-support-for-the-Wayland-winsys.patch b/recipes-graphics/userland/userland/0002-wayland-Add-support-for-the-Wayland-winsys.patch
index 00c96d5..2abe5ce 100644
--- a/recipes-graphics/userland/userland/0002-wayland-Add-support-for-the-Wayland-winsys.patch
+++ b/recipes-graphics/userland/userland/0002-wayland-Add-support-for-the-Wayland-winsys.patch
@@ -1,4 +1,4 @@
-From 75ce950e68a0260ea5da56a83c27eb46331d819f Mon Sep 17 00:00:00 2001
+From 3a0e094a6aac53c9ddc4b28feb77cfc1a319880d Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Date: Tue, 1 Oct 2013 13:19:20 +0200
Subject: [PATCH 02/13] wayland: Add support for the Wayland winsys
@@ -58,17 +58,17 @@ vc_vchi_dispmanx.h
create mode 100644 makefiles/cmake/Wayland.cmake
diff --git a/.gitignore b/.gitignore
-index 8df9393..d0d1387 100644
+index 4a88665..5da71a9 100644
--- a/.gitignore
+++ b/.gitignore
-@@ -10,3 +10,5 @@
+@@ -13,3 +13,5 @@ build/
*.lai
*.la
*.a
+
+*~
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a12e389..f0fde45 100644
+index d3159c7..58eb8f7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,6 +19,17 @@ include(makefiles/cmake/global_settings.cmake)
@@ -102,12 +102,12 @@ index 358d2b4..4da4448 100644
+
+$ BUILD_WAYLAND=1 ./buildme.
diff --git a/buildme b/buildme
-index 9e9d4d7..4e5d0be 100755
+index d778276..f509864 100755
--- a/buildme
+++ b/buildme
@@ -8,6 +8,10 @@ fi
- BUILDSUBDIR=`echo $BUILDTYPE | tr [A-Z] [a-z]`;
+ BUILDSUBDIR=`echo $BUILDTYPE | tr '[A-Z]' '[a-z]'`;
+if [ -n "$BUILD_WAYLAND" ]; then
+ WAYLAND_VARS="-DBUILD_WAYLAND=TRUE"
@@ -340,7 +340,7 @@ index 4f3ce49..84f6ec0 100644
/* OpenGL ES 1.1 and 2.0 functions */
diff --git a/interface/khronos/common/linux/khrn_client_platform_linux.c b/interface/khronos/common/linux/khrn_client_platform_linux.c
-index 3320b33..39fc7cc 100644
+index 710d20f..50d60a6 100644
--- a/interface/khronos/common/linux/khrn_client_platform_linux.c
+++ b/interface/khronos/common/linux/khrn_client_platform_linux.c
@@ -37,6 +37,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
@@ -355,7 +355,7 @@ index 3320b33..39fc7cc 100644
extern VCOS_LOG_CAT_T khrn_client_log;
extern void vc_vchi_khronos_init();
-@@ -462,13 +467,36 @@ EGLDisplay khrn_platform_set_display_id(EGLNativeDisplayType display_id)
+@@ -464,13 +469,36 @@ EGLDisplay khrn_platform_set_display_id(EGLNativeDisplayType display_id)
return EGL_NO_DISPLAY;
}
#else
@@ -394,7 +394,7 @@ index 3320b33..39fc7cc 100644
#endif
#ifdef WANT_X
-@@ -803,22 +831,81 @@ static EGL_DISPMANX_WINDOW_T *check_default(EGLNativeWindowType win)
+@@ -805,22 +833,81 @@ static EGL_DISPMANX_WINDOW_T *check_default(EGLNativeWindowType win)
void platform_get_dimensions(EGLDisplay dpy, EGLNativeWindowType win,
uint32_t *width, uint32_t *height, uint32_t *swapchain_count)
{
@@ -774,7 +774,7 @@ index b723b76..b9bf08c 100644
-#endif
+struct wl_dispmanx_client_buffer *allocate_wl_buffer(struct wl_egl_window *window, KHRN_IMAGE_FORMAT_T color);
diff --git a/interface/khronos/egl/egl_client.c b/interface/khronos/egl/egl_client.c
-index 234da65..024f3ed 100644
+index b8bb374..03fe67b 100644
--- a/interface/khronos/egl/egl_client.c
+++ b/interface/khronos/egl/egl_client.c
@@ -153,6 +153,10 @@ by an attribute value"
@@ -1540,7 +1540,7 @@ index 0000000..8bafc15
+Libs: -L${libdir} -lwayland-egl
+Cflags: -I${includedir}
diff --git a/interface/vmcs_host/CMakeLists.txt b/interface/vmcs_host/CMakeLists.txt
-index 3205cf1..6ef97bd 100755
+index 0b3adc9..f44d01f 100755
--- a/interface/vmcs_host/CMakeLists.txt
+++ b/interface/vmcs_host/CMakeLists.txt
@@ -9,13 +9,24 @@ add_definitions(-fno-strict-aliasing)
@@ -1602,10 +1602,10 @@ index 37fdae1..fe3619a 100755
}
#endif
diff --git a/interface/vmcs_host/vc_vchi_dispmanx.c b/interface/vmcs_host/vc_vchi_dispmanx.c
-index d188068..3e668f5 100755
+index 133e86d..45f4cff 100755
--- a/interface/vmcs_host/vc_vchi_dispmanx.c
+++ b/interface/vmcs_host/vc_vchi_dispmanx.c
-@@ -1316,3 +1316,45 @@ static void *dispmanx_notify_func( void *arg ) {
+@@ -1319,3 +1319,45 @@ static void *dispmanx_notify_func( void *arg ) {
}
return 0;
}
@@ -1883,5 +1883,5 @@ index 0000000..ad90d30
+ set(${_sources} ${${_sources}} PARENT_SCOPE)
+endfunction()
--
-2.9.0
+2.10.0
diff --git a/recipes-graphics/userland/userland/0003-wayland-Add-Wayland-example.patch b/recipes-graphics/userland/userland/0003-wayland-Add-Wayland-example.patch
index 4fcddf8..49a7872 100644
--- a/recipes-graphics/userland/userland/0003-wayland-Add-Wayland-example.patch
+++ b/recipes-graphics/userland/userland/0003-wayland-Add-Wayland-example.patch
@@ -1,4 +1,4 @@
-From ce82c93dfede66447ea9d1195202bf0b0b09fa16 Mon Sep 17 00:00:00 2001
+From 7f52662a4d1965988ee5ada28ce3525c38ebf164 Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Date: Tue, 1 Oct 2013 13:19:20 +0200
Subject: [PATCH 03/13] wayland: Add Wayland example
@@ -862,5 +862,5 @@ index fa4539e..37120ac 100755
-
+make -C hello_wayland
--
-2.9.0
+2.10.0
diff --git a/recipes-graphics/userland/userland/0004-wayland-egl-Add-bcm_host-to-dependencies.patch b/recipes-graphics/userland/userland/0004-wayland-egl-Add-bcm_host-to-dependencies.patch
index b8b8d44..0f9e528 100644
--- a/recipes-graphics/userland/userland/0004-wayland-egl-Add-bcm_host-to-dependencies.patch
+++ b/recipes-graphics/userland/userland/0004-wayland-egl-Add-bcm_host-to-dependencies.patch
@@ -1,4 +1,4 @@
-From 809ea78d19ce21c4f74aeab58394d6c2396e166c Mon Sep 17 00:00:00 2001
+From 5f01581e1288040507154ccc38d8bd99b13ed855 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 10 Aug 2015 02:38:27 -0700
Subject: [PATCH 04/13] wayland-egl: Add bcm_host to dependencies
@@ -24,5 +24,5 @@ index 8bafc15..fd259c9 100644
Libs: -L${libdir} -lwayland-egl
Cflags: -I${includedir}
--
-2.9.0
+2.10.0
diff --git a/recipes-graphics/userland/userland/0005-interface-remove-faulty-assert-to-make-weston-happy-.patch b/recipes-graphics/userland/userland/0005-interface-remove-faulty-assert-to-make-weston-happy-.patch
index 57526f6..9a3aa46 100644
--- a/recipes-graphics/userland/userland/0005-interface-remove-faulty-assert-to-make-weston-happy-.patch
+++ b/recipes-graphics/userland/userland/0005-interface-remove-faulty-assert-to-make-weston-happy-.patch
@@ -1,4 +1,4 @@
-From dc87269edc34616a9adb11147be2d7efef9b25e2 Mon Sep 17 00:00:00 2001
+From 6e333fef608c5738d2d9a812de29fc8b1edd24cc Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sat, 24 Jan 2015 22:07:19 +0100
Subject: [PATCH 05/13] interface: remove faulty assert() to make weston happy
@@ -13,17 +13,17 @@ Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
1 file changed, 1 deletion(-)
diff --git a/interface/vmcs_host/vc_vchi_dispmanx.c b/interface/vmcs_host/vc_vchi_dispmanx.c
-index 3e668f5..8e065dc 100755
+index 45f4cff..5d0368c 100755
--- a/interface/vmcs_host/vc_vchi_dispmanx.c
+++ b/interface/vmcs_host/vc_vchi_dispmanx.c
-@@ -1304,7 +1304,6 @@ static void *dispmanx_notify_func( void *arg ) {
- // Decrement the use count - the corresponding "use" is in vc_dispmanx_update_submit.
- vchi_service_release(dispmanx_client.notify_handle[0]);
- if (dispmanx_client.update_callback ) {
-- vcos_assert( dispmanx_client.pending_update_handle == handle);
- dispmanx_client.update_callback(handle, dispmanx_client.update_callback_param);
- }
- } else {
+@@ -1306,7 +1306,6 @@ static void *dispmanx_notify_func( void *arg ) {
+ // Decrement the use count - the corresponding "use" is in vc_dispmanx_update_submit.
+ vchi_service_release(dispmanx_client.notify_handle[0]);
+ if (dispmanx_client.update_callback ) {
+- vcos_assert( dispmanx_client.pending_update_handle == handle);
+ dispmanx_client.update_callback(handle, dispmanx_client.update_callback_param);
+ }
+ } else {
--
-2.9.0
+2.10.0
diff --git a/recipes-graphics/userland/userland/0006-zero-out-wl-buffers-in-egl_surface_free.patch b/recipes-graphics/userland/userland/0006-zero-out-wl-buffers-in-egl_surface_free.patch
index f040ea4..5ec459e 100644
--- a/recipes-graphics/userland/userland/0006-zero-out-wl-buffers-in-egl_surface_free.patch
+++ b/recipes-graphics/userland/userland/0006-zero-out-wl-buffers-in-egl_surface_free.patch
@@ -1,4 +1,4 @@
-From 9f70762bc0b2d42c45c9206e7b8fb4ce237ba4a3 Mon Sep 17 00:00:00 2001
+From 16b837f5d6e8a62ba11029c005488880d02befbf Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 6 Feb 2016 11:10:47 -0800
Subject: [PATCH 06/13] zero-out wl buffers in egl_surface_free
@@ -29,5 +29,5 @@ index 42350bf..1f923d9 100644
#endif
}
--
-2.9.0
+2.10.0
diff --git a/recipes-graphics/userland/userland/0007-initialize-front-back-wayland-buffers.patch b/recipes-graphics/userland/userland/0007-initialize-front-back-wayland-buffers.patch
index 3d643b3..90f4a84 100644
--- a/recipes-graphics/userland/userland/0007-initialize-front-back-wayland-buffers.patch
+++ b/recipes-graphics/userland/userland/0007-initialize-front-back-wayland-buffers.patch
@@ -1,4 +1,4 @@
-From d0535b7c6108d241ee943eff11c1d62171066d1a Mon Sep 17 00:00:00 2001
+From efe05f6bdb77da027ddc2384e9a9043655a2a03b Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 6 Feb 2016 11:11:41 -0800
Subject: [PATCH 07/13] initialize front back wayland buffers
@@ -30,5 +30,5 @@ index 1f923d9..9a9582c 100644
}
#endif
--
-2.9.0
+2.10.0
diff --git a/recipes-graphics/userland/userland/0008-Remove-RPC_FLUSH.patch b/recipes-graphics/userland/userland/0008-Remove-RPC_FLUSH.patch
index 3243e1b..a5c2ed1 100644
--- a/recipes-graphics/userland/userland/0008-Remove-RPC_FLUSH.patch
+++ b/recipes-graphics/userland/userland/0008-Remove-RPC_FLUSH.patch
@@ -1,4 +1,4 @@
-From 495f4e8d692be8f61966ce2ed54c50d98690fda2 Mon Sep 17 00:00:00 2001
+From bf98ea35dcbf86e7b422c8706efcbc01ddb2f6b9 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 6 Feb 2016 11:09:18 -0800
Subject: [PATCH 08/13] Remove RPC_FLUSH
@@ -23,5 +23,5 @@ index f9b7287..b04ffef 100644
}
#endif
--
-2.9.0
+2.10.0
diff --git a/recipes-graphics/userland/userland/0009-fix-cmake-dependency-race.patch b/recipes-graphics/userland/userland/0009-fix-cmake-dependency-race.patch
index 4da981e..3e5cce8 100644
--- a/recipes-graphics/userland/userland/0009-fix-cmake-dependency-race.patch
+++ b/recipes-graphics/userland/userland/0009-fix-cmake-dependency-race.patch
@@ -1,4 +1,4 @@
-From b83cbbfa7e37c292ce403b44b7e6e2b4c48270a6 Mon Sep 17 00:00:00 2001
+From 028957cc519abf5e52d22966d219973294112e54 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/13] fix cmake dependency race
@@ -42,7 +42,7 @@ index 1d81ca3..d6cd415 100644
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 6ef97bd..f62a9f5 100755
+index f44d01f..9bcc2c3 100755
--- a/interface/vmcs_host/CMakeLists.txt
+++ b/interface/vmcs_host/CMakeLists.txt
@@ -17,14 +17,6 @@ set(VCHOSTIF_SOURCE
@@ -74,5 +74,5 @@ index f0bae30..8c44c58 100644
struct wl_resource *resource;
struct wl_dispmanx *dispmanx;
--
-2.9.0
+2.10.0
diff --git a/recipes-graphics/userland/userland/0010-Fix-enum-conversion-warnings.patch b/recipes-graphics/userland/userland/0010-Fix-enum-conversion-warnings.patch
index b2f09d8..0b03aed 100644
--- a/recipes-graphics/userland/userland/0010-Fix-enum-conversion-warnings.patch
+++ b/recipes-graphics/userland/userland/0010-Fix-enum-conversion-warnings.patch
@@ -1,4 +1,4 @@
-From a00eee4a5464f0add14232e1f9d7a8268c02770e Mon Sep 17 00:00:00 2001
+From 67b00c2b44cec5a7519acfdde43d5ea27c5ff6a8 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 18 Feb 2016 09:04:46 +0000
Subject: [PATCH 10/13] Fix enum conversion warnings
@@ -95,5 +95,5 @@ index f088296..83e3724 100644
omx->pixel_y = mmal->pixel_y;
omx->layer = mmal->layer;
--
-2.9.0
+2.10.0
diff --git a/recipes-graphics/userland/userland/0011-Fix-for-framerate-with-nested-composition.patch b/recipes-graphics/userland/userland/0011-Fix-for-framerate-with-nested-composition.patch
index 9864b49..9d4b930 100644
--- a/recipes-graphics/userland/userland/0011-Fix-for-framerate-with-nested-composition.patch
+++ b/recipes-graphics/userland/userland/0011-Fix-for-framerate-with-nested-composition.patch
@@ -1,4 +1,4 @@
-From 5e36a54cc219e713796e3b16ccd9da7819cfa836 Mon Sep 17 00:00:00 2001
+From 497637d8eff4e83b5ede26733c4f36371b1d2f07 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 29 Mar 2016 20:38:30 -0700
Subject: [PATCH 11/13] Fix for framerate with nested composition
@@ -11,7 +11,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 file changed, 8 insertions(+)
diff --git a/interface/khronos/egl/egl_client.c b/interface/khronos/egl/egl_client.c
-index 024f3ed..83970ec 100644
+index 03fe67b..13a110c 100644
--- a/interface/khronos/egl/egl_client.c
+++ b/interface/khronos/egl/egl_client.c
@@ -2342,6 +2342,9 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffers(EGLDisplay dpy, EGLSurface surf)
@@ -56,5 +56,5 @@ index 024f3ed..83970ec 100644
#ifdef ANDROID
CLIENT_UNLOCK();
--
-2.9.0
+2.10.0
diff --git a/recipes-graphics/userland/userland/0012-build-shared-library-for-vchostif.patch b/recipes-graphics/userland/userland/0012-build-shared-library-for-vchostif.patch
index 705040b..3e3a7f9 100644
--- a/recipes-graphics/userland/userland/0012-build-shared-library-for-vchostif.patch
+++ b/recipes-graphics/userland/userland/0012-build-shared-library-for-vchostif.patch
@@ -1,4 +1,4 @@
-From 452ea70c80a26e83ac33385c00c5c8352117250e Mon Sep 17 00:00:00 2001
+From 18f5ef775b4a367bf7fe972c9a2b4cd29f2f1043 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 2 Apr 2016 10:37:24 -0700
Subject: [PATCH 12/13] build shared library for vchostif
@@ -11,7 +11,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/interface/vmcs_host/CMakeLists.txt b/interface/vmcs_host/CMakeLists.txt
-index f62a9f5..85f78fd 100755
+index 9bcc2c3..0ef753f 100755
--- a/interface/vmcs_host/CMakeLists.txt
+++ b/interface/vmcs_host/CMakeLists.txt
@@ -17,7 +17,7 @@ set(VCHOSTIF_SOURCE
@@ -24,5 +24,5 @@ index f62a9f5..85f78fd 100755
#add_library(bufman vc_vchi_bufman.c )
--
-2.9.0
+2.10.0
diff --git a/recipes-graphics/userland/userland/0013-implement-buffer-wrapping-interface-for-dispmanx.patch b/recipes-graphics/userland/userland/0013-implement-buffer-wrapping-interface-for-dispmanx.patch
index 88f529f..8b5c6b5 100644
--- a/recipes-graphics/userland/userland/0013-implement-buffer-wrapping-interface-for-dispmanx.patch
+++ b/recipes-graphics/userland/userland/0013-implement-buffer-wrapping-interface-for-dispmanx.patch
@@ -1,4 +1,4 @@
-From 4059611f79490606db6d9094263b1c56cd2abc05 Mon Sep 17 00:00:00 2001
+From d692c61077235e7b791f115b3140680580903c95 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 2 Apr 2016 10:54:59 -0700
Subject: [PATCH 13/13] implement buffer wrapping interface for dispmanx
@@ -88,5 +88,5 @@ index c18626d..11ed1ef 100644
</protocol>
--
-2.9.0
+2.10.0
diff --git a/recipes-graphics/userland/userland_git.bb b/recipes-graphics/userland/userland_git.bb
index 05d6cc1..3c63f94 100644
--- a/recipes-graphics/userland/userland_git.bb
+++ b/recipes-graphics/userland/userland_git.bb
@@ -16,7 +16,7 @@ COMPATIBLE_MACHINE = "raspberrypi"
SRCBRANCH = "master"
SRCFORK = "raspberrypi"
-SRCREV = "a63658c5950ce4ac6dc9d125ed977be91896d68c"
+SRCREV = "2350bf2511fa49e177fb35c9613eef1b657a7506"
SRC_URI = "\
git://github.com/${SRCFORK}/userland.git;protocol=git;branch=${SRCBRANCH} \
--
2.10.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [meta-raspberrypi][PATCH 4/4] sdcard_image-rpi.bbclass: Remove redundant RPI_KERNEL_VERSION
2016-10-07 2:09 [meta-raspberrypi][PATCH 1/4] linux-raspberrypi_4.4: Upgrade to 4.4.23 Khem Raj
2016-10-07 2:09 ` [meta-raspberrypi][PATCH 2/4] userland: Upgrade to latest Khem Raj
2016-10-07 2:09 ` [meta-raspberrypi][PATCH 3/4] firmware: " Khem Raj
@ 2016-10-07 2:09 ` Khem Raj
2016-10-10 5:14 ` Gary Thomas
2016-10-14 7:16 ` [meta-raspberrypi][PATCH 1/4] linux-raspberrypi_4.4: Upgrade to 4.4.23 Andrei Gherzan
3 siblings, 1 reply; 6+ messages in thread
From: Khem Raj @ 2016-10-07 2:09 UTC (permalink / raw)
To: yocto
From: Jonathan Liu <net147@gmail.com>
The value of the RPI_KERNEL_VERSION can change between None and the
kernel version which can result in taskhash mismatch errors while
building images.
The taskhash mismatch errors can be reproduced using:
bitbake -c cleansstate virtual/kernel core-image-minimal && bitbake core-image-minimal
The get_dts() and split_overlays() functions are modified so that the
kernel version argument is optional. If the version is not supplied to
these functions, they will fallback to the Python equivalent of the
expression used for RPI_KERNEL_VERSION.
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
classes/linux-raspberrypi-base.bbclass | 4 ++--
classes/sdcard_image-rpi.bbclass | 8 +++-----
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/classes/linux-raspberrypi-base.bbclass b/classes/linux-raspberrypi-base.bbclass
index 930fc44..3a6e33d 100644
--- a/classes/linux-raspberrypi-base.bbclass
+++ b/classes/linux-raspberrypi-base.bbclass
@@ -1,6 +1,6 @@
inherit linux-kernel-base
-def get_dts(d, ver):
+def get_dts(d, ver=None):
import re
staging_dir = d.getVar("STAGING_KERNEL_BUILDDIR", True)
@@ -32,7 +32,7 @@ def get_dts(d, ver):
return dts
-def split_overlays(d, ver, out):
+def split_overlays(d, out, ver=None):
dts = get_dts(d, ver)
if out:
overlays = oe.utils.str_filter_out('\S+\-overlay\.dtb$', dts, d)
diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass
index 2f0daee..0487ef1 100644
--- a/classes/sdcard_image-rpi.bbclass
+++ b/classes/sdcard_image-rpi.bbclass
@@ -71,8 +71,6 @@ SDIMG = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.rpi-sdimg"
# Additional files and/or directories to be copied into the vfat partition from the IMAGE_ROOTFS.
FATPAYLOAD ?= ""
-RPI_KERNEL_VERSION := "${@get_kernelversion_file('${STAGING_KERNEL_BUILDDIR}')}"
-
IMAGE_CMD_rpi-sdimg () {
# Align partitions
@@ -83,7 +81,7 @@ IMAGE_CMD_rpi-sdimg () {
echo "Creating filesystem with Boot partition ${BOOT_SPACE_ALIGNED} KiB and RootFS $ROOTFS_SIZE KiB"
# Check if we are building with device tree support
- DTS="${@get_dts(d, '${RPI_KERNEL_VERSION}')}"
+ DTS="${@get_dts(d)}"
# Initialize sdcard image file
dd if=/dev/zero of=${SDIMG} bs=1024 count=0 seek=${SDIMG_SIZE}
@@ -104,8 +102,8 @@ IMAGE_CMD_rpi-sdimg () {
mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/* ::/
if test -n "${DTS}"; then
# Device Tree Overlays are assumed to be suffixed by '-overlay.dtb' (4.1.x) or by '.dtbo' (4.4.9+) string and will be put in a dedicated folder
- DT_OVERLAYS="${@split_overlays(d, '${RPI_KERNEL_VERSION}', 0)}"
- DT_ROOT="${@split_overlays(d, '${RPI_KERNEL_VERSION}', 1)}"
+ DT_OVERLAYS="${@split_overlays(d, 0)}"
+ DT_ROOT="${@split_overlays(d, 1)}"
# Copy board device trees to root folder
for DTB in ${DT_ROOT}; do
--
2.10.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [meta-raspberrypi][PATCH 1/4] linux-raspberrypi_4.4: Upgrade to 4.4.23
2016-10-07 2:09 [meta-raspberrypi][PATCH 1/4] linux-raspberrypi_4.4: Upgrade to 4.4.23 Khem Raj
` (2 preceding siblings ...)
2016-10-07 2:09 ` [meta-raspberrypi][PATCH 4/4] sdcard_image-rpi.bbclass: Remove redundant RPI_KERNEL_VERSION Khem Raj
@ 2016-10-14 7:16 ` Andrei Gherzan
3 siblings, 0 replies; 6+ messages in thread
From: Andrei Gherzan @ 2016-10-14 7:16 UTC (permalink / raw)
To: Khem Raj; +Cc: yocto
[-- Attachment #1: Type: text/plain, Size: 3404 bytes --]
On Thu, Oct 06, 2016 at 07:09:03PM -0700, Khem Raj wrote:
> Drop upstreamed patch
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> .../0002-vc4-ioctl-rendering-allow.patch | 29 ----------------------
> recipes-kernel/linux/linux-raspberrypi_4.4.bb | 5 ++--
> 2 files changed, 2 insertions(+), 32 deletions(-)
> delete mode 100644 recipes-kernel/linux/linux-raspberrypi-4.4/0002-vc4-ioctl-rendering-allow.patch
>
> diff --git a/recipes-kernel/linux/linux-raspberrypi-4.4/0002-vc4-ioctl-rendering-allow.patch b/recipes-kernel/linux/linux-raspberrypi-4.4/0002-vc4-ioctl-rendering-allow.patch
> deleted file mode 100644
> index 59d0ed7..0000000
> --- a/recipes-kernel/linux/linux-raspberrypi-4.4/0002-vc4-ioctl-rendering-allow.patch
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -This patch has been accepted upstream in kernel 4.7-rc3
> -But it has not yet been backported to 4.4...
> -Upstream-Status: Accepted [http://www.gossamer-threads.com/lists/linux/kernel/2459302]
> -Signed-off-by: Herve Jourdain <herve.jourdain@neuf.fr>
> ----
> -
> -diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c
> -index a5b68c1..14b5ec1 100644
> ---- a/drivers/gpu/drm/vc4/vc4_drv.c
> -+++ b/drivers/gpu/drm/vc4/vc4_drv.c
> -@@ -75,12 +75,12 @@ static const struct file_operations vc4_drm_fops = {
> - };
> -
> - static const struct drm_ioctl_desc vc4_drm_ioctls[] = {
> -- DRM_IOCTL_DEF_DRV(VC4_SUBMIT_CL, vc4_submit_cl_ioctl, 0),
> -- DRM_IOCTL_DEF_DRV(VC4_WAIT_SEQNO, vc4_wait_seqno_ioctl, 0),
> -- DRM_IOCTL_DEF_DRV(VC4_WAIT_BO, vc4_wait_bo_ioctl, 0),
> -- DRM_IOCTL_DEF_DRV(VC4_CREATE_BO, vc4_create_bo_ioctl, 0),
> -- DRM_IOCTL_DEF_DRV(VC4_MMAP_BO, vc4_mmap_bo_ioctl, 0),
> -- DRM_IOCTL_DEF_DRV(VC4_CREATE_SHADER_BO, vc4_create_shader_bo_ioctl, 0),
> -+ DRM_IOCTL_DEF_DRV(VC4_SUBMIT_CL, vc4_submit_cl_ioctl, 0|DRM_RENDER_ALLOW),
> -+ DRM_IOCTL_DEF_DRV(VC4_WAIT_SEQNO, vc4_wait_seqno_ioctl, 0|DRM_RENDER_ALLOW),
> -+ DRM_IOCTL_DEF_DRV(VC4_WAIT_BO, vc4_wait_bo_ioctl, 0|DRM_RENDER_ALLOW),
> -+ DRM_IOCTL_DEF_DRV(VC4_CREATE_BO, vc4_create_bo_ioctl, 0|DRM_RENDER_ALLOW),
> -+ DRM_IOCTL_DEF_DRV(VC4_MMAP_BO, vc4_mmap_bo_ioctl, 0|DRM_RENDER_ALLOW),
> -+ DRM_IOCTL_DEF_DRV(VC4_CREATE_SHADER_BO, vc4_create_shader_bo_ioctl, 0|DRM_RENDER_ALLOW),
> - DRM_IOCTL_DEF_DRV(VC4_GET_HANG_STATE, vc4_get_hang_state_ioctl,
> - DRM_ROOT_ONLY),
> - };
> diff --git a/recipes-kernel/linux/linux-raspberrypi_4.4.bb b/recipes-kernel/linux/linux-raspberrypi_4.4.bb
> index 9a49dc1..4b15f88 100644
> --- a/recipes-kernel/linux/linux-raspberrypi_4.4.bb
> +++ b/recipes-kernel/linux/linux-raspberrypi_4.4.bb
> @@ -1,10 +1,9 @@
> FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
>
> -LINUX_VERSION ?= "4.4.16"
> +LINUX_VERSION ?= "4.4.23"
>
> -SRCREV = "cff67c7e03f4333149f2a8f6eafd3bc44475114a"
> +SRCREV = "c2a1d975537fcac01da80ce34f10bc491620a64e"
> SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-4.4.y \
> file://0001-fix-dtbo-rules.patch \
> - file://0002-vc4-ioctl-rendering-allow.patch \
> "
> require linux-raspberrypi.inc
> --
> 2.10.0
>
> --
> _______________________________________________
> yocto mailing list
> yocto@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto
Merged to master the entire patch set. Thanks.
--
Andrei Gherzan
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 817 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread