| Message ID | 20210822042730.1360-1-caihuoqing@baidu.com |
|---|---|
| State | New |
| Headers | show |
| Series | media: videobuf2: Convert to SPDX identifier | expand |
Em Sun, 22 Aug 2021 12:27:30 +0800 Cai Huoqing <caihuoqing@baidu.com> escreveu: > +// SPDX-License-Identifier: GPL-1.0+ > /* > * videobuf2-vmalloc.c - vmalloc memory allocator for videobuf2 > * > * Copyright (C) 2010 Samsung Electronics > * > * Author: Pawel Osciak <pawel@osciak.com> > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation. > */ That doesn't sound right. See, all code at the Kernel is under GPLv2, as stated at the global Kernel licensing files. Btw, a driver with just: MODULE_LICENSE("GPL") is actually under GPLv2 (eventually: or later and/or dual-licensed). There's nothing in the text implying GPLv2 or later. So, using a GPL-x.x+ doesn't fit here. Ok, one might argue that the code is GPL 1.0 to 2.0, but VB2 is a derivative work from VB1, which was originally written with GPL v2 or later: https://linuxtv.org/cgi-bin/viewvc.cgi/video4linux/video-buf.h?view=markup&revision=1.9&root=v4l So, the only license that fits here is GPLv2. On other words, except if all VB2 authors explicitly send their SoB to change the licensing terms (with should likely include also VB1 authors) to allow dual-licensing it or to extend it to other GPL versions, the right license here is, instead, just GPLv2, e. g.: SPDX-License-Identifier: GPL-2.0 Thanks, Mauro
diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c index 38ce7c274727..fa62c8438a8c 100644 --- a/drivers/media/common/videobuf2/videobuf2-core.c +++ b/drivers/media/common/videobuf2/videobuf2-core.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-1.0+ /* * videobuf2-core.c - video buffer 2 core framework * @@ -8,10 +9,6 @@ * * The vb2_thread implementation was based on code from videobuf-dvb.c: * (c) 2004 Gerd Knorr <kraxel@bytesex.org> [SUSE Labs] - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation. */ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt diff --git a/drivers/media/common/videobuf2/videobuf2-dma-contig.c b/drivers/media/common/videobuf2/videobuf2-dma-contig.c index a7f61ba85440..8e6fe2ab0821 100644 --- a/drivers/media/common/videobuf2/videobuf2-dma-contig.c +++ b/drivers/media/common/videobuf2/videobuf2-dma-contig.c @@ -1,13 +1,10 @@ +// SPDX-License-Identifier: GPL-1.0+ /* * videobuf2-dma-contig.c - DMA contig memory allocator for videobuf2 * * Copyright (C) 2010 Samsung Electronics * * Author: Pawel Osciak <pawel@osciak.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation. */ #include <linux/dma-buf.h> diff --git a/drivers/media/common/videobuf2/videobuf2-dma-sg.c b/drivers/media/common/videobuf2/videobuf2-dma-sg.c index c5b06a509566..40412b3ad840 100644 --- a/drivers/media/common/videobuf2/videobuf2-dma-sg.c +++ b/drivers/media/common/videobuf2/videobuf2-dma-sg.c @@ -1,13 +1,10 @@ +// SPDX-License-Identifier: GPL-1.0+ /* * videobuf2-dma-sg.c - dma scatter/gather memory allocator for videobuf2 * * Copyright (C) 2010 Samsung Electronics * * Author: Andrzej Pietrasiewicz <andrzejtp2010@gmail.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation. */ #include <linux/module.h> diff --git a/drivers/media/common/videobuf2/videobuf2-memops.c b/drivers/media/common/videobuf2/videobuf2-memops.c index 9dd6c27162f4..cd328aa84c5e 100644 --- a/drivers/media/common/videobuf2/videobuf2-memops.c +++ b/drivers/media/common/videobuf2/videobuf2-memops.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-1.0+ /* * videobuf2-memops.c - generic memory handling routines for videobuf2 * @@ -5,10 +6,6 @@ * * Author: Pawel Osciak <pawel@osciak.com> * Marek Szyprowski <m.szyprowski@samsung.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation. */ #include <linux/slab.h> diff --git a/drivers/media/common/videobuf2/videobuf2-v4l2.c b/drivers/media/common/videobuf2/videobuf2-v4l2.c index 2988bb38ceb1..08a655e395c3 100644 --- a/drivers/media/common/videobuf2/videobuf2-v4l2.c +++ b/drivers/media/common/videobuf2/videobuf2-v4l2.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-1.0+ /* * videobuf2-v4l2.c - V4L2 driver helper framework * @@ -8,10 +9,6 @@ * * The vb2_thread implementation was based on code from videobuf-dvb.c: * (c) 2004 Gerd Knorr <kraxel@bytesex.org> [SUSE Labs] - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation. */ #include <linux/device.h> diff --git a/drivers/media/common/videobuf2/videobuf2-vmalloc.c b/drivers/media/common/videobuf2/videobuf2-vmalloc.c index 83f95258ec8c..9f003e17b788 100644 --- a/drivers/media/common/videobuf2/videobuf2-vmalloc.c +++ b/drivers/media/common/videobuf2/videobuf2-vmalloc.c @@ -1,13 +1,10 @@ +// SPDX-License-Identifier: GPL-1.0+ /* * videobuf2-vmalloc.c - vmalloc memory allocator for videobuf2 * * Copyright (C) 2010 Samsung Electronics * * Author: Pawel Osciak <pawel@osciak.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation. */ #include <linux/io.h>
use SPDX-License-Identifier instead of a verbose license text Signed-off-by: Cai Huoqing <caihuoqing@baidu.com> --- drivers/media/common/videobuf2/videobuf2-core.c | 5 +---- drivers/media/common/videobuf2/videobuf2-dma-contig.c | 5 +---- drivers/media/common/videobuf2/videobuf2-dma-sg.c | 5 +---- drivers/media/common/videobuf2/videobuf2-memops.c | 5 +---- drivers/media/common/videobuf2/videobuf2-v4l2.c | 5 +---- drivers/media/common/videobuf2/videobuf2-vmalloc.c | 5 +---- 6 files changed, 6 insertions(+), 24 deletions(-)