• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Frequently used words (click to add to your profile)

javac++androidlinuxc#objective-cqtwindows誰得cocoapythonphprubygameguibathyscaphec翻訳omegat計画中(planning stage)frameworktwittertestdomvb.netdirectxbtronarduinopreviewerゲームエンジン

FreeBSD bhyve keyboard layout patch


Commit MetaInfo

Révision09c7e33097d939e5b7d7832ea3e26b7c8cbbb16e (tree)
l'heure2022-05-19 20:55:14
AuteurKoine Yuusuke(koinec) <koinec@user...>
CommiterKoine Yuusuke(koinec)

Message de Log

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

Change Summary

  • 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}

Modification

--- a/kbdlayout_option/bhyve_kbdlayout_option_fbsd13s_20211223.patch
+++ b/kbdlayout_option/bhyve_kbdlayout_option_fbsd131r.patch
@@ -1,6 +1,6 @@
11 diff -uprN bhyve_orig/Makefile bhyve/Makefile
2---- bhyve_orig/Makefile 2021-12-23 09:07:49.000000000 +0900
3-+++ bhyve/Makefile 2022-01-02 10:48:16.788031000 +0900
2+--- bhyve_orig/Makefile 2022-05-12 13:54:04.000000000 +0900
3++++ bhyve/Makefile 2022-05-19 19:30:43.115485000 +0900
44 @@ -132,4 +132,6 @@ CFLAGS+=-DGDB_LOG
55
66 WARNS?= 2
@@ -9,8 +9,8 @@ diff -uprN bhyve_orig/Makefile bhyve/Makefile
99 +
1010 .include <bsd.prog.mk>
1111 diff -uprN bhyve_orig/bhyve.8 bhyve/bhyve.8
12---- bhyve_orig/bhyve.8 2021-12-23 09:07:49.000000000 +0900
13-+++ bhyve/bhyve.8 2022-01-02 11:18:37.389081000 +0900
12+--- bhyve_orig/bhyve.8 2022-05-12 13:54:04.000000000 +0900
13++++ bhyve/bhyve.8 2022-05-19 19:30:43.115927000 +0900
1414 @@ -47,6 +47,7 @@
1515 .Sm on
1616 .Op Fl G Ar port
@@ -35,8 +35,8 @@ diff -uprN bhyve_orig/bhyve.8 bhyve/bhyve.8
3535 Print a list of supported LPC devices.
3636 .It Fl l Ar lpcdev Ns Op Cm \&, Ns Ar conf
3737 diff -uprN bhyve_orig/bhyve_config.5 bhyve/bhyve_config.5
38---- bhyve_orig/bhyve_config.5 2021-12-23 09:07:49.000000000 +0900
39-+++ bhyve/bhyve_config.5 2022-01-02 11:23:42.989892000 +0900
38+--- bhyve_orig/bhyve_config.5 2022-05-12 13:54:04.000000000 +0900
39++++ bhyve/bhyve_config.5 2022-05-19 19:30:43.116277000 +0900
4040 @@ -131,6 +131,12 @@ will listen for connections on this port.
4141 .It Va gdb.wait Ta bool Ta false Ta
4242 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
5151 The real time clock uses the local time of the host.
5252 If this is set to false, the real time clock uses UTC.
5353 diff -uprN bhyve_orig/bhyverun.c bhyve/bhyverun.c
54---- bhyve_orig/bhyverun.c 2021-12-23 09:07:49.000000000 +0900
55-+++ bhyve/bhyverun.c 2022-01-02 11:31:05.019976000 +0900
54+--- bhyve_orig/bhyverun.c 2022-05-12 13:54:04.000000000 +0900
55++++ bhyve/bhyverun.c 2022-05-19 19:30:43.116877000 +0900
5656 @@ -224,8 +224,9 @@ usage(int code)
5757 fprintf(stderr,
5858 "Usage: %s [-AaCDeHhPSuWwxY]\n"
@@ -105,8 +105,8 @@ diff -uprN bhyve_orig/bhyverun.c bhyve/bhyverun.c
105105 case 'l':
106106 if (strncmp(optarg, "help", strlen(optarg)) == 0) {
107107 diff -uprN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
108---- bhyve_orig/ps2kbd.c 2021-12-23 09:07:49.000000000 +0900
109-+++ bhyve/ps2kbd.c 2022-01-02 11:33:03.248964000 +0900
108+--- bhyve_orig/ps2kbd.c 2022-05-12 13:54:04.000000000 +0900
109++++ bhyve/ps2kbd.c 2022-05-19 19:30:43.117260000 +0900
110110 @@ -31,6 +31,7 @@
111111 __FBSDID("$FreeBSD$");
112112
--- a/kbdlayout_option/bhyve_kbdlayout_vmrunsh_fbsd13s_20211223.patch
+++ b/kbdlayout_option/bhyve_kbdlayout_vmrunsh_fbsd131r.patch
@@ -1,6 +1,6 @@
11 diff -uprN examples/bhyve_orig/vmrun.sh examples/bhyve/vmrun.sh
2---- examples/bhyve_orig/vmrun.sh 2021-04-09 09:24:07.000000000 +0900
3-+++ examples/bhyve/vmrun.sh 2021-05-03 13:46:11.358862000 +0900
2+--- examples/bhyve_orig/vmrun.sh 2022-05-19 19:41:32.256531000 +0900
3++++ examples/bhyve/vmrun.sh 2022-05-19 19:40:38.222886000 +0900
44 @@ -59,8 +59,8 @@ usage() {
55 echo " [-e <name=value>] [-f <path of firmware>]" \
66 "[-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 @@
11 diff -uprN bhyve_orig/console.c bhyve/console.c
2---- bhyve_orig/console.c 2021-04-09 09:24:13.000000000 +0900
3-+++ bhyve/console.c 2021-05-03 13:11:57.869902000 +0900
2+--- bhyve_orig/console.c 2022-05-12 13:54:04.000000000 +0900
3++++ bhyve/console.c 2022-05-19 19:27:11.273257000 +0900
44 @@ -106,10 +106,10 @@ console_ptr_register(ptr_event_func_t event_cb, void *
55 }
66
@@ -15,8 +15,8 @@ diff -uprN bhyve_orig/console.c bhyve/console.c
1515
1616 void
1717 diff -uprN bhyve_orig/console.h bhyve/console.h
18---- bhyve_orig/console.h 2021-04-09 09:24:13.000000000 +0900
19-+++ bhyve/console.h 2021-05-03 13:11:57.870288000 +0900
18+--- bhyve_orig/console.h 2022-05-12 13:54:04.000000000 +0900
19++++ bhyve/console.h 2022-05-19 19:27:11.273463000 +0900
2020 @@ -34,7 +34,7 @@
2121 struct bhyvegc;
2222
@@ -36,8 +36,8 @@ diff -uprN bhyve_orig/console.h bhyve/console.h
3636 void console_ptr_register(ptr_event_func_t event_cb, void *arg, int pri);
3737 void console_ptr_event(uint8_t button, int x, int y);
3838 diff -uprN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
39---- bhyve_orig/ps2kbd.c 2021-04-09 09:24:13.000000000 +0900
40-+++ bhyve/ps2kbd.c 2021-05-03 13:11:57.870908000 +0900
39+--- bhyve_orig/ps2kbd.c 2022-05-12 13:54:04.000000000 +0900
40++++ bhyve/ps2kbd.c 2022-05-19 19:27:11.273799000 +0900
4141 @@ -181,6 +181,26 @@ static const uint8_t ascii_translations[128] = {
4242 0x22, 0x35, 0x1a, 0x54, 0x5d, 0x5b, 0x0e, 0x00,
4343 };
@@ -129,8 +129,8 @@ diff -uprN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
129129
130130 if (!fifo_full)
131131 diff -uprN bhyve_orig/rfb.c bhyve/rfb.c
132---- bhyve_orig/rfb.c 2021-04-09 09:24:13.000000000 +0900
133-+++ bhyve/rfb.c 2021-05-03 13:13:08.713857000 +0900
132+--- bhyve_orig/rfb.c 2022-05-12 13:54:04.000000000 +0900
133++++ bhyve/rfb.c 2022-05-19 19:27:11.274375000 +0900
134134 @@ -98,6 +98,7 @@ static int rfb_debug = 0;
135135 #define CS_KEY_EVENT 4
136136 #define CS_POINTER_EVENT 5