Commit: 09c7e33097d939e5b7d7832ea3e26b7c8cbbb16e - bhyve_keyboard_layout_patch (git)

FreeBSD bhyve keyboard layout patch

Commit MetaInfo

• Revisión: 09c7e33097d939e5b7d7832ea3e26b7c8cbbb16e (tree)
• Tiempo: 2022-05-19 20:55:14
• Autor: Koine Yuusuke(koinec) <koinec@user...>
• Commiter: Koine Yuusuke(koinec)

Log Message

Append patch for FreeBSD 13.1-RELEASE.
Remove patch for FreeBSD 13-stable (2021/12/23).

Cambiar Resumen

• delete: kbdlayout_option/{bhyve_kbdlayout_option_fbsd13s_20211223.patch => bhyve_kbdlayout_option_fbsd131r.patch}
• delete: kbdlayout_option/{bhyve_kbdlayout_vmrunsh_fbsd13s_20211223.patch => bhyve_kbdlayout_vmrunsh_fbsd131r.patch}
• delete: qemu_ext_keyevent_msg/{bhyve_qemu_ext_key_event_msg_fbsd13s_20211223.patch => bhyve_qemu_ext_key_event_msg_fbsd131r.patch}

Diferencia incremental

--- a/kbdlayout_option/bhyve_kbdlayout_option_fbsd13s_20211223.patch
+++ b/kbdlayout_option/bhyve_kbdlayout_option_fbsd131r.patch
@@ -1,6 +1,6 @@
 diff -uprN bhyve_orig/Makefile bhyve/Makefile
---- bhyve_orig/Makefile	2021-12-23 09:07:49.000000000 +0900
-+++ bhyve/Makefile	2022-01-02 10:48:16.788031000 +0900
+--- bhyve_orig/Makefile	2022-05-12 13:54:04.000000000 +0900
++++ bhyve/Makefile	2022-05-19 19:30:43.115485000 +0900
 @@ -132,4 +132,6 @@ CFLAGS+=-DGDB_LOG
  
  WARNS?=	2
@@ -9,8 +9,8 @@ diff -uprN bhyve_orig/Makefile bhyve/Makefile
 +
  .include <bsd.prog.mk>
 diff -uprN bhyve_orig/bhyve.8 bhyve/bhyve.8
---- bhyve_orig/bhyve.8	2021-12-23 09:07:49.000000000 +0900
-+++ bhyve/bhyve.8	2022-01-02 11:18:37.389081000 +0900
+--- bhyve_orig/bhyve.8	2022-05-12 13:54:04.000000000 +0900
++++ bhyve/bhyve.8	2022-05-19 19:30:43.115927000 +0900
 @@ -47,6 +47,7 @@
  .Sm on
  .Op Fl G Ar port
@@ -35,8 +35,8 @@ diff -uprN bhyve_orig/bhyve.8 bhyve/bhyve.8
  Print a list of supported LPC devices.
  .It Fl l Ar lpcdev Ns Op Cm \&, Ns Ar conf
 diff -uprN bhyve_orig/bhyve_config.5 bhyve/bhyve_config.5
---- bhyve_orig/bhyve_config.5	2021-12-23 09:07:49.000000000 +0900
-+++ bhyve/bhyve_config.5	2022-01-02 11:23:42.989892000 +0900
+--- bhyve_orig/bhyve_config.5	2022-05-12 13:54:04.000000000 +0900
++++ bhyve/bhyve_config.5	2022-05-19 19:30:43.116277000 +0900
 @@ -131,6 +131,12 @@ will listen for connections on this port.
  .It Va gdb.wait Ta bool Ta false Ta
  If the debug server is enabled, wait for a debugger to connect
@@ -51,8 +51,8 @@ diff -uprN bhyve_orig/bhyve_config.5 bhyve/bhyve_config.5
  The real time clock uses the local time of the host.
  If this is set to false, the real time clock uses UTC.
 diff -uprN bhyve_orig/bhyverun.c bhyve/bhyverun.c
---- bhyve_orig/bhyverun.c	2021-12-23 09:07:49.000000000 +0900
-+++ bhyve/bhyverun.c	2022-01-02 11:31:05.019976000 +0900
+--- bhyve_orig/bhyverun.c	2022-05-12 13:54:04.000000000 +0900
++++ bhyve/bhyverun.c	2022-05-19 19:30:43.116877000 +0900
 @@ -224,8 +224,9 @@ usage(int code)
          fprintf(stderr,
  		"Usage: %s [-AaCDeHhPSuWwxY]\n"
@@ -105,8 +105,8 @@ diff -uprN bhyve_orig/bhyverun.c bhyve/bhyverun.c
  		case 'l':
  			if (strncmp(optarg, "help", strlen(optarg)) == 0) {
 diff -uprN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
---- bhyve_orig/ps2kbd.c	2021-12-23 09:07:49.000000000 +0900
-+++ bhyve/ps2kbd.c	2022-01-02 11:33:03.248964000 +0900
+--- bhyve_orig/ps2kbd.c	2022-05-12 13:54:04.000000000 +0900
++++ bhyve/ps2kbd.c	2022-05-19 19:30:43.117260000 +0900
 @@ -31,6 +31,7 @@
  __FBSDID("$FreeBSD$");
  

--- a/kbdlayout_option/bhyve_kbdlayout_vmrunsh_fbsd13s_20211223.patch
+++ b/kbdlayout_option/bhyve_kbdlayout_vmrunsh_fbsd131r.patch
@@ -1,6 +1,6 @@
 diff -uprN examples/bhyve_orig/vmrun.sh examples/bhyve/vmrun.sh
---- examples/bhyve_orig/vmrun.sh	2021-04-09 09:24:07.000000000 +0900
-+++ examples/bhyve/vmrun.sh	2021-05-03 13:46:11.358862000 +0900
+--- examples/bhyve_orig/vmrun.sh	2022-05-19 19:41:32.256531000 +0900
++++ examples/bhyve/vmrun.sh	2022-05-19 19:40:38.222886000 +0900
 @@ -59,8 +59,8 @@ usage() {
  	echo "                [-e <name=value>] [-f <path of firmware>]" \
  	    "[-F <size>]"

--- a/qemu_ext_keyevent_msg/bhyve_qemu_ext_key_event_msg_fbsd13s_20211223.patch
+++ b/qemu_ext_keyevent_msg/bhyve_qemu_ext_key_event_msg_fbsd131r.patch
@@ -1,6 +1,6 @@
 diff -uprN bhyve_orig/console.c bhyve/console.c
---- bhyve_orig/console.c	2021-04-09 09:24:13.000000000 +0900
-+++ bhyve/console.c	2021-05-03 13:11:57.869902000 +0900
+--- bhyve_orig/console.c	2022-05-12 13:54:04.000000000 +0900
++++ bhyve/console.c	2022-05-19 19:27:11.273257000 +0900
 @@ -106,10 +106,10 @@ console_ptr_register(ptr_event_func_t event_cb, void *
  }
  
@@ -15,8 +15,8 @@ diff -uprN bhyve_orig/console.c bhyve/console.c
  
  void
 diff -uprN bhyve_orig/console.h bhyve/console.h
---- bhyve_orig/console.h	2021-04-09 09:24:13.000000000 +0900
-+++ bhyve/console.h	2021-05-03 13:11:57.870288000 +0900
+--- bhyve_orig/console.h	2022-05-12 13:54:04.000000000 +0900
++++ bhyve/console.h	2022-05-19 19:27:11.273463000 +0900
 @@ -34,7 +34,7 @@
  struct bhyvegc;
  
@@ -36,8 +36,8 @@ diff -uprN bhyve_orig/console.h bhyve/console.h
  void console_ptr_register(ptr_event_func_t event_cb, void *arg, int pri);
  void console_ptr_event(uint8_t button, int x, int y);
 diff -uprN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
---- bhyve_orig/ps2kbd.c	2021-04-09 09:24:13.000000000 +0900
-+++ bhyve/ps2kbd.c	2021-05-03 13:11:57.870908000 +0900
+--- bhyve_orig/ps2kbd.c	2022-05-12 13:54:04.000000000 +0900
++++ bhyve/ps2kbd.c	2022-05-19 19:27:11.273799000 +0900
 @@ -181,6 +181,26 @@ static const uint8_t ascii_translations[128] = {
  		0x22, 0x35, 0x1a, 0x54, 0x5d, 0x5b, 0x0e, 0x00,
  };
@@ -129,8 +129,8 @@ diff -uprN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
  
  	if (!fifo_full)
 diff -uprN bhyve_orig/rfb.c bhyve/rfb.c
---- bhyve_orig/rfb.c	2021-04-09 09:24:13.000000000 +0900
-+++ bhyve/rfb.c	2021-05-03 13:13:08.713857000 +0900
+--- bhyve_orig/rfb.c	2022-05-12 13:54:04.000000000 +0900
++++ bhyve/rfb.c	2022-05-19 19:27:11.274375000 +0900
 @@ -98,6 +98,7 @@ static int rfb_debug = 0;
  #define CS_KEY_EVENT		4
  #define CS_POINTER_EVENT	5