meta-intel-iot-main: 24 February 2023 update

PreetiSachan · PreetiSachan · commit 138f1270da13 · 2023-02-24T01:16:50.000-05:00
Signed-off-by: Preeti Sachan &lt;preeti.sachan@intel.com&gt;
diff --git a/classes/ese-ptcm-image.bbclass b/classes/ese-ptcm-image.bbclass
@@ -16,7 +16,7 @@ do_ese_copy_rtcm_slimboot(){
 		auth=""
 	fi
 	${PYTHON} ${STAGING_DIR_NATIVE}/${libexecdir}/slimboot/Tools/GenContainer.py create \
-		-cl RTCM:${DEPLOY_DIR_IMAGE}/sbl-rtcm/sbl-rtcm.efi -o ${WORKDIR}/sbl_rtcm \
+		-cl RTCM:${DEPLOY_DIR_IMAGE}/sbl-rtcm/sbl-rtcm.efi -o ${WORKDIR}/sbl_rtcm -t NORMAL \
 		-k ${DEPLOY_DIR_IMAGE}/secure-boot-certificates-slimboot/SigningKey.pem ${auth}
 	install -m644 ${WORKDIR}/sbl_rtcm "${IMAGE_ROOTFS}/boot"
 }
diff --git a/recipes-devtools/qemu/qemu.inc b/recipes-devtools/qemu/qemu.inc
@@ -57,6 +57,9 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
            file://0031-ui-gtk-handling-placement-of-QEMU-windows-when-monit.patch \
            file://0032-hw-virtio-Adds-support-for-VIRTIO_GPU_FORMAT_R8G8B8A.patch \
            file://0033-ui-gtk-WA-for-Yocto-IceWM.patch \
+           file://0001-ui-gtk-fix-windows-state-event-call.patch \
+           file://0002-ui-gtk-set-the-default-size-of-new-window-to-vc-gfx..patch \
+           file://0001-ui-gtk-vc-page-number-correction.patch \
            "
 BAR = "           file://0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch "
 UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
diff --git a/recipes-devtools/qemu/qemu/0001-ui-gtk-fix-windows-state-event-call.patch b/recipes-devtools/qemu/qemu/0001-ui-gtk-fix-windows-state-event-call.patch
@@ -0,0 +1,72 @@
+From 332be8c5ad2ab111a9661a37c81a0e338dfc5a41 Mon Sep 17 00:00:00 2001
+From: Dongwon Kim <dongwon.kim@intel.com>
+Date: Fri, 13 Jan 2023 11:16:24 -0800
+Subject: [PATCH 1/3] ui/gtk: fix windows state event call
+
+fixing windows state change to make it work on window minimize/reactivate
+
+Signed-off-by: Dongwon Kim <dongwon.kim@intel.com>
+---
+ ui/gtk.c | 25 ++++++++++++++++++++-----
+ 1 file changed, 20 insertions(+), 5 deletions(-)
+
+diff --git a/ui/gtk.c b/ui/gtk.c
+index b9aaba2d7c..b4c47e1b24 100644
+--- a/ui/gtk.c
++++ b/ui/gtk.c
+@@ -1524,8 +1524,19 @@ static gboolean gd_window_state_event(GtkWidget *widget, GdkEvent *event,
+     }
+ 
+     if (event->window_state.new_window_state & GDK_WINDOW_STATE_ICONIFIED) {
+-	vc->gfx.visible = false;
+-    } else {
++        vc->gfx.visible = false;
++        gd_set_ui_size(vc, 0, 0);
++        if (vc->gfx.guest_fb.dmabuf &&
++            vc->gfx.guest_fb.dmabuf->draw_submitted) {
++            vc->gfx.guest_fb.dmabuf->draw_submitted = false;
++            graphic_hw_gl_block(vc->gfx.dcl.con, false);
++        }
++    } else if (event->window_state.new_window_state & GDK_WINDOW_STATE_FOCUSED) {
++        GdkWindow *window;
++        window = gtk_widget_get_window(vc->gfx.drawing_area);
++        gd_set_ui_size(vc, gdk_window_get_width(window),
++                       gdk_window_get_height(window));
++
+         vc->gfx.visible = true;
+     }
+ 
+@@ -1565,6 +1576,8 @@ static void gd_tab_window_create(VirtualConsole *vc)
+ 
+     g_signal_connect(vc->window, "delete-event",
+ 		     G_CALLBACK(gd_tab_window_close), vc);
++    g_signal_connect(vc->window, "window-state-event",
++                     G_CALLBACK(gd_window_state_event), vc);
+     gtk_widget_show_all(vc->window);
+ 
+     if (qemu_console_is_graphic(vc->gfx.dcl.con)) {
+@@ -2434,9 +2447,6 @@ static void gd_connect_signals(GtkDisplayState *s)
+ 
+     g_signal_connect(s->window, "delete-event",
+                      G_CALLBACK(gd_window_close), s);
+-    g_signal_connect(s->window, "window-state-event",
+-                     G_CALLBACK(gd_window_state_event),
+-                     gd_vc_find_current(s));
+     g_signal_connect(s->pause_item, "activate",
+                      G_CALLBACK(gd_menu_pause), s);
+     g_signal_connect(s->reset_item, "activate",
+@@ -2825,6 +2835,11 @@ static void gtk_display_init(DisplayState *ds, DisplayOptions *opts)
+     gtk_widget_show_all(s->window);
+ 
+     vc = gd_vc_find_current(s);
++
++    g_signal_connect(s->window, "window-state-event",
++                     G_CALLBACK(gd_window_state_event),
++                     vc);
++
+     gtk_widget_set_sensitive(s->view_menu, vc != NULL);
+ #ifdef CONFIG_VTE
+     gtk_widget_set_sensitive(s->copy_item,
+-- 
+2.20.1
+
diff --git a/recipes-devtools/qemu/qemu/0001-ui-gtk-vc-page-number-correction.patch b/recipes-devtools/qemu/qemu/0001-ui-gtk-vc-page-number-correction.patch
@@ -0,0 +1,50 @@
+From 5d6078f75a743c4d4a21f186581765448c7dc8de Mon Sep 17 00:00:00 2001
+From: Dongwon Kim <dongwon.kim@intel.com>
+Date: Wed, 18 Jan 2023 18:15:05 -0800
+Subject: [PATCH] ui/gtk: vc page number correction
+
+Signed-off-by: Dongwon Kim <dongwon.kim@intel.com>
+---
+ ui/gtk.c | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/ui/gtk.c b/ui/gtk.c
+index ca1e2f7bde..fd0a5b0e2c 100644
+--- a/ui/gtk.c
++++ b/ui/gtk.c
+@@ -173,6 +173,10 @@ static VirtualConsole *gd_vc_find_by_page(GtkDisplayState *s, gint page)
+     VirtualConsole *vc;
+     gint i, p;
+ 
++    if (page < 0) {
++        return NULL;
++    }
++
+     for (i = 0; i < s->nb_vcs; i++) {
+         vc = &s->vc[i];
+         p = gtk_notebook_page_num(GTK_NOTEBOOK(s->notebook), vc->tab_item);
+@@ -369,7 +373,7 @@ static void gtk_release_modifiers(GtkDisplayState *s)
+ {
+     VirtualConsole *vc = gd_vc_find_current(s);
+ 
+-    if (vc->type != GD_VC_GFX ||
++    if (!vc || vc->type != GD_VC_GFX ||
+         !qemu_console_is_graphic(vc->gfx.dcl.con)) {
+         return;
+     }
+@@ -1436,8 +1440,10 @@ static void gd_menu_switch_vc(GtkMenuItem *item, void *opaque)
+     gint page;
+ 
+     vc = gd_vc_find_current(s);
+-    vc->gfx.visible = false;
+-    gd_set_ui_size(vc, 0, 0);
++    if (vc) {
++        vc->gfx.visible = false;
++        gd_set_ui_size(vc, 0, 0);
++    }
+ 
+     vc = gd_vc_find_by_menu(s);
+     gtk_release_modifiers(s);
+-- 
+2.20.1
+
diff --git a/recipes-devtools/qemu/qemu/0002-ui-gtk-set-the-default-size-of-new-window-to-vc-gfx..patch b/recipes-devtools/qemu/qemu/0002-ui-gtk-set-the-default-size-of-new-window-to-vc-gfx..patch
@@ -0,0 +1,27 @@
+From 728f6111419f13eec6329dd3d1253b7212899913 Mon Sep 17 00:00:00 2001
+From: Dongwon Kim <dongwon.kim@intel.com>
+Date: Tue, 17 Jan 2023 22:18:02 -0800
+Subject: [PATCH 2/3] ui/gtk: set the default size of new window to vc->gfx.ds
+
+Signed-off-by: Dongwon Kim <dongwon.kim@intel.com>
+---
+ ui/gtk.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/ui/gtk.c b/ui/gtk.c
+index b4c47e1b24..fc2fb22e19 100644
+--- a/ui/gtk.c
++++ b/ui/gtk.c
+@@ -1562,6 +1562,9 @@ static void gd_tab_window_create(VirtualConsole *vc)
+ 
+     gtk_widget_set_sensitive(vc->menu_item, false);
+     vc->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
++    gtk_window_set_default_size(GTK_WINDOW(vc->window),
++                                surface_width(vc->gfx.ds),
++                                surface_height(vc->gfx.ds));
+ #if defined(CONFIG_OPENGL)
+     if (vc->gfx.esurface) {
+ 	eglDestroySurface(qemu_egl_display, vc->gfx.esurface);
+-- 
+2.20.1
+
diff --git a/recipes-devtools/qemu/qemu/0011-ui-gtk-Factor-out-tab-window-creation-into-a-separat.patch b/recipes-devtools/qemu/qemu/0011-ui-gtk-Factor-out-tab-window-creation-into-a-separat.patch
@@ -35,7 +35,7 @@ index 988956845a..4a2fa2a6af 100644
 +	eglDestroySurface(qemu_egl_display, vc->gfx.esurface);
 +	vc->gfx.esurface = NULL;
 +    }
-+    if (vc->gfx.esurface) {
++    if (vc->gfx.ectx) {
 +	eglDestroyContext(qemu_egl_display, vc->gfx.ectx);
 +	vc->gfx.ectx = NULL;
 +    }

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ do_ese_copy_rtcm_slimboot(){`
`16`	`16`	`auth=""`
`17`	`17`	`fi`
`18`	`18`	`${PYTHON} ${STAGING_DIR_NATIVE}/${libexecdir}/slimboot/Tools/GenContainer.py create \`
`19`		`- -cl RTCM:${DEPLOY_DIR_IMAGE}/sbl-rtcm/sbl-rtcm.efi -o ${WORKDIR}/sbl_rtcm \`
	`19`	`+ -cl RTCM:${DEPLOY_DIR_IMAGE}/sbl-rtcm/sbl-rtcm.efi -o ${WORKDIR}/sbl_rtcm -t NORMAL \`
`20`	`20`	`-k ${DEPLOY_DIR_IMAGE}/secure-boot-certificates-slimboot/SigningKey.pem ${auth}`
`21`	`21`	`install -m644 ${WORKDIR}/sbl_rtcm "${IMAGE_ROOTFS}/boot"`
`22`	`22`	`}`