[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/15] meson: Add CanoKey
From: |
Gerd Hoffmann |
Subject: |
[PULL 06/15] meson: Add CanoKey |
Date: |
Tue, 14 Jun 2022 14:16:01 +0200 |
From: "Hongren (Zenithal) Zheng" <i@zenithal.me>
Signed-off-by: Hongren (Zenithal) Zheng <i@zenithal.me>
Message-Id: <YoY6YRD6cxH21mms@Sun>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
meson_options.txt | 2 ++
hw/usb/Kconfig | 5 +++++
hw/usb/meson.build | 5 +++++
meson.build | 6 ++++++
scripts/meson-buildoptions.sh | 3 +++
5 files changed, 21 insertions(+)
diff --git a/meson_options.txt b/meson_options.txt
index 2de94af03712..0e8197386b99 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -189,6 +189,8 @@ option('spice_protocol', type : 'feature', value : 'auto',
description: 'Spice protocol support')
option('u2f', type : 'feature', value : 'auto',
description: 'U2F emulation support')
+option('canokey', type : 'feature', value : 'auto',
+ description: 'CanoKey support')
option('usb_redir', type : 'feature', value : 'auto',
description: 'libusbredir support')
option('l2tpv3', type : 'feature', value : 'auto',
diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig
index 53f8283ffdc1..ce4f4339763e 100644
--- a/hw/usb/Kconfig
+++ b/hw/usb/Kconfig
@@ -119,6 +119,11 @@ config USB_U2F
default y
depends on USB
+config USB_CANOKEY
+ bool
+ default y
+ depends on USB
+
config IMX_USBPHY
bool
default y
diff --git a/hw/usb/meson.build b/hw/usb/meson.build
index de853d780dd8..793df42e2127 100644
--- a/hw/usb/meson.build
+++ b/hw/usb/meson.build
@@ -63,6 +63,11 @@ if u2f.found()
softmmu_ss.add(when: 'CONFIG_USB_U2F', if_true: [u2f,
files('u2f-emulated.c')])
endif
+# CanoKey
+if canokey.found()
+ softmmu_ss.add(when: 'CONFIG_USB_CANOKEY', if_true: [canokey,
files('canokey.c')])
+endif
+
# usb redirect
if usbredir.found()
usbredir_ss = ss.source_set()
diff --git a/meson.build b/meson.build
index 21cd949082dc..0c2e11ff0715 100644
--- a/meson.build
+++ b/meson.build
@@ -1408,6 +1408,12 @@ if have_system
method: 'pkg-config',
kwargs: static_kwargs)
endif
+canokey = not_found
+if have_system
+ canokey = dependency('canokey-qemu', required: get_option('canokey'),
+ method: 'pkg-config',
+ kwargs: static_kwargs)
+endif
usbredir = not_found
if not get_option('usb_redir').auto() or have_system
usbredir = dependency('libusbredirparser-0.5', required:
get_option('usb_redir'),
diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh
index 00ea4d8cd169..1fc1d2e2c362 100644
--- a/scripts/meson-buildoptions.sh
+++ b/scripts/meson-buildoptions.sh
@@ -73,6 +73,7 @@ meson_options_help() {
printf "%s\n" ' bpf eBPF support'
printf "%s\n" ' brlapi brlapi character device driver'
printf "%s\n" ' bzip2 bzip2 support for DMG images'
+ printf "%s\n" ' canokey CanoKey support'
printf "%s\n" ' cap-ng cap_ng support'
printf "%s\n" ' capstone Whether and how to find the capstone
library'
printf "%s\n" ' cloop cloop image format support'
@@ -204,6 +205,8 @@ _meson_option_parse() {
--disable-brlapi) printf "%s" -Dbrlapi=disabled ;;
--enable-bzip2) printf "%s" -Dbzip2=enabled ;;
--disable-bzip2) printf "%s" -Dbzip2=disabled ;;
+ --enable-canokey) printf "%s" -Dcanokey=enabled ;;
+ --disable-canokey) printf "%s" -Dcanokey=disabled ;;
--enable-cap-ng) printf "%s" -Dcap_ng=enabled ;;
--disable-cap-ng) printf "%s" -Dcap_ng=disabled ;;
--enable-capstone) printf "%s" -Dcapstone=enabled ;;
--
2.36.1
- [PULL 00/15] Kraxel 20220614 patches, Gerd Hoffmann, 2022/06/14
- [PULL 01/15] ui/gtk-gl-area: implement GL context destruction, Gerd Hoffmann, 2022/06/14
- [PULL 04/15] hw/usb: Add CanoKey Implementation, Gerd Hoffmann, 2022/06/14
- [PULL 12/15] virtio-gpu: update done only on the scanout associated with rect, Gerd Hoffmann, 2022/06/14
- [PULL 06/15] meson: Add CanoKey,
Gerd Hoffmann <=
- [PULL 09/15] MAINTAINERS: add myself as CanoKey maintainer, Gerd Hoffmann, 2022/06/14
- [PULL 13/15] ui/console: Do not return a value with ui_info, Gerd Hoffmann, 2022/06/14
- [PULL 15/15] virtio-gpu: Respect UI refresh rate for EDID, Gerd Hoffmann, 2022/06/14
- [PULL 07/15] docs: Add CanoKey documentation, Gerd Hoffmann, 2022/06/14
- [PULL 05/15] hw/usb/canokey: Add trace events, Gerd Hoffmann, 2022/06/14
- [PULL 03/15] ui/cocoa: Fix poweroff request code, Gerd Hoffmann, 2022/06/14
- [PULL 10/15] hw/usb/hcd-ehci: fix writeback order, Gerd Hoffmann, 2022/06/14
- [PULL 11/15] usbredir: avoid queuing hello packet on snapshot restore, Gerd Hoffmann, 2022/06/14
- [PULL 02/15] ui/gtk-gl-area: create the requested GL context version, Gerd Hoffmann, 2022/06/14
- [PULL 08/15] docs/system/devices/usb: Add CanoKey to USB devices examples, Gerd Hoffmann, 2022/06/14