hw/usb/canokey.c | 2 +- hw/usb/canokey.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Apache license is considered by some to be not compatible
with GPLv2+. Since QEMU as combined work is GPLv2-only,
these two files should be made compatible.
Reported-by: "Daniel P. Berrangé" <berrange@redhat.com>
Link: https://lore.kernel.org/qemu-devel/ZEpKXncC%2Fe6FKRe9@redhat.com/
Signed-off-by: Hongren (Zenithal) Zheng <i@zenithal.me>
---
hw/usb/canokey.c | 2 +-
hw/usb/canokey.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/usb/canokey.c b/hw/usb/canokey.c
index bbc5da07b5..b306eeb20e 100644
--- a/hw/usb/canokey.c
+++ b/hw/usb/canokey.c
@@ -4,7 +4,7 @@
* Copyright (c) 2021-2022 Canokeys.org <contact@canokeys.org>
* Written by Hongren (Zenithal) Zheng <i@zenithal.me>
*
- * This code is licensed under the Apache-2.0.
+ * This code is licensed under the GPL v2 or later.
*/
#include "qemu/osdep.h"
diff --git a/hw/usb/canokey.h b/hw/usb/canokey.h
index 24cf304203..e528889d33 100644
--- a/hw/usb/canokey.h
+++ b/hw/usb/canokey.h
@@ -4,7 +4,7 @@
* Copyright (c) 2021-2022 Canokeys.org <contact@canokeys.org>
* Written by Hongren (Zenithal) Zheng <i@zenithal.me>
*
- * This code is licensed under the Apache-2.0.
+ * This code is licensed under the GPL v2 or later.
*/
#ifndef CANOKEY_H
--
2.37.2
On Sun, Apr 30, 2023 at 09:58:19PM +0800, Hongren (Zenithal) Zheng wrote: > Apache license is considered by some to be not compatible > with GPLv2+. Since QEMU as combined work is GPLv2-only, > these two files should be made compatible. > > Reported-by: "Daniel P. Berrangé" <berrange@redhat.com> > Link: https://lore.kernel.org/qemu-devel/ZEpKXncC%2Fe6FKRe9@redhat.com/ > Signed-off-by: Hongren (Zenithal) Zheng <i@zenithal.me> Acked-by: YuanYang Meng <mkfssion@mkfssion.com> > --- > hw/usb/canokey.c | 2 +- > hw/usb/canokey.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/usb/canokey.c b/hw/usb/canokey.c > index bbc5da07b5..b306eeb20e 100644 > --- a/hw/usb/canokey.c > +++ b/hw/usb/canokey.c > @@ -4,7 +4,7 @@ > * Copyright (c) 2021-2022 Canokeys.org <contact@canokeys.org> > * Written by Hongren (Zenithal) Zheng <i@zenithal.me> > * > - * This code is licensed under the Apache-2.0. > + * This code is licensed under the GPL v2 or later. > */ > > #include "qemu/osdep.h" > diff --git a/hw/usb/canokey.h b/hw/usb/canokey.h > index 24cf304203..e528889d33 100644 > --- a/hw/usb/canokey.h > +++ b/hw/usb/canokey.h > @@ -4,7 +4,7 @@ > * Copyright (c) 2021-2022 Canokeys.org <contact@canokeys.org> > * Written by Hongren (Zenithal) Zheng <i@zenithal.me> > * > - * This code is licensed under the Apache-2.0. > + * This code is licensed under the GPL v2 or later. > */ > > #ifndef CANOKEY_H > -- > 2.37.2 >
Apache license is considered by some to be not compatible > with GPLv2+. Since QEMU as combined work is GPLv2-only, > these two files should be made compatible. > > Reported-by: "Daniel P. Berrangé" <berrange@redhat.com> > Link:https://lore.kernel.org/qemu-devel/ZEpKXncC%2Fe6FKRe9@redhat.com/ > Signed-off-by: Hongren (Zenithal) Zheng <i@zenithal.me> > Acked-By:canokeys.org<http://canokeys.org><contact@canokeys.org> > --- > hw/usb/canokey.c | 2 +- > hw/usb/canokey.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/usb/canokey.c b/hw/usb/canokey.c > index bbc5da07b5..b306eeb20e 100644 > --- a/hw/usb/canokey.c > +++ b/hw/usb/canokey.c > @@ -4,7 +4,7 @@ > * Copyright (c) 2021-2022Canokeys.org<http://Canokeys.org><contact@canokeys.org> > * Written by Hongren (Zenithal) Zheng <i@zenithal.me> > * > - * This code is licensed under the Apache-2.0. > + * This code is licensed under the GPL v2 or later. > */ > > #include "qemu/osdep.h" > diff --git a/hw/usb/canokey.h b/hw/usb/canokey.h > index 24cf304203..e528889d33 100644 > --- a/hw/usb/canokey.h > +++ b/hw/usb/canokey.h > @@ -4,7 +4,7 @@ > * Copyright (c) 2021-2022Canokeys.org<http://Canokeys.org><contact@canokeys.org> > * Written by Hongren (Zenithal) Zheng <i@zenithal.me> > * > - * This code is licensed under the Apache-2.0. > + * This code is licensed under the GPL v2 or later. > */ > > #ifndef CANOKEY_H > -- > 2.37.2
On 30/4/23 15:58, Hongren (Zenithal) Zheng wrote: > Apache license is considered by some to be not compatible > with GPLv2+. Since QEMU as combined work is GPLv2-only, > these two files should be made compatible. > > Reported-by: "Daniel P. Berrangé" <berrange@redhat.com> > Link: https://lore.kernel.org/qemu-devel/ZEpKXncC%2Fe6FKRe9@redhat.com/ > Signed-off-by: Hongren (Zenithal) Zheng <i@zenithal.me> > --- > hw/usb/canokey.c | 2 +- > hw/usb/canokey.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Thank you! Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
© 2016 - 2024 Red Hat, Inc.