mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-26 18:43:33 -05:00
ynl: broaden the license even more
I relicensed Netlink spec code to GPL-2.0 OR BSD-3-Clause but
we still put a slightly different license on the uAPI header
than the rest of the code. Use the Linux-syscall-note on all
the specs and all generated code. It's moot for kernel code,
but should not hurt. This way the licenses match everywhere.
Cc: Chuck Lever <chuck.lever@oracle.com>
Fixes: 37d9df224d
("ynl: re-license uniformly under GPL-2.0 OR BSD-3-Clause")
Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
parent
054abb515f
commit
4e16b6a748
15 changed files with 19 additions and 18 deletions
|
@ -1,4 +1,4 @@
|
||||||
# SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
|
# SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)
|
||||||
%YAML 1.2
|
%YAML 1.2
|
||||||
---
|
---
|
||||||
$id: http://kernel.org/schemas/netlink/genetlink-c.yaml#
|
$id: http://kernel.org/schemas/netlink/genetlink-c.yaml#
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
|
# SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)
|
||||||
%YAML 1.2
|
%YAML 1.2
|
||||||
---
|
---
|
||||||
$id: http://kernel.org/schemas/netlink/genetlink-legacy.yaml#
|
$id: http://kernel.org/schemas/netlink/genetlink-legacy.yaml#
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
|
# SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)
|
||||||
%YAML 1.2
|
%YAML 1.2
|
||||||
---
|
---
|
||||||
$id: http://kernel.org/schemas/netlink/genetlink-legacy.yaml#
|
$id: http://kernel.org/schemas/netlink/genetlink-legacy.yaml#
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
|
# SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)
|
||||||
|
|
||||||
name: ethtool
|
name: ethtool
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
|
# SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)
|
||||||
|
|
||||||
name: fou
|
name: fou
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
|
# SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)
|
||||||
|
|
||||||
name: netdev
|
name: netdev
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,8 @@ YAML specifications can be found under ``Documentation/netlink/specs/``
|
||||||
This document describes details of the schema.
|
This document describes details of the schema.
|
||||||
See :doc:`intro-specs` for a practical starting guide.
|
See :doc:`intro-specs` for a practical starting guide.
|
||||||
|
|
||||||
All specs must be licensed under ``GPL-2.0-only OR BSD-3-Clause``
|
All specs must be licensed under
|
||||||
|
``((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)``
|
||||||
to allow for easy adoption in user space code.
|
to allow for easy adoption in user space code.
|
||||||
|
|
||||||
Compatibility levels
|
Compatibility levels
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause */
|
/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
|
||||||
/* Do not edit directly, auto-generated from: */
|
/* Do not edit directly, auto-generated from: */
|
||||||
/* Documentation/netlink/specs/fou.yaml */
|
/* Documentation/netlink/specs/fou.yaml */
|
||||||
/* YNL-GEN uapi header */
|
/* YNL-GEN uapi header */
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause */
|
/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
|
||||||
/* Do not edit directly, auto-generated from: */
|
/* Do not edit directly, auto-generated from: */
|
||||||
/* Documentation/netlink/specs/netdev.yaml */
|
/* Documentation/netlink/specs/netdev.yaml */
|
||||||
/* YNL-GEN uapi header */
|
/* YNL-GEN uapi header */
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
|
// SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)
|
||||||
/* Do not edit directly, auto-generated from: */
|
/* Do not edit directly, auto-generated from: */
|
||||||
/* Documentation/netlink/specs/netdev.yaml */
|
/* Documentation/netlink/specs/netdev.yaml */
|
||||||
/* YNL-GEN kernel source */
|
/* YNL-GEN kernel source */
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
|
/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
|
||||||
/* Do not edit directly, auto-generated from: */
|
/* Do not edit directly, auto-generated from: */
|
||||||
/* Documentation/netlink/specs/netdev.yaml */
|
/* Documentation/netlink/specs/netdev.yaml */
|
||||||
/* YNL-GEN kernel header */
|
/* YNL-GEN kernel header */
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
|
// SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)
|
||||||
/* Do not edit directly, auto-generated from: */
|
/* Do not edit directly, auto-generated from: */
|
||||||
/* Documentation/netlink/specs/fou.yaml */
|
/* Documentation/netlink/specs/fou.yaml */
|
||||||
/* YNL-GEN kernel source */
|
/* YNL-GEN kernel source */
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
|
/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
|
||||||
/* Do not edit directly, auto-generated from: */
|
/* Do not edit directly, auto-generated from: */
|
||||||
/* Documentation/netlink/specs/fou.yaml */
|
/* Documentation/netlink/specs/fou.yaml */
|
||||||
/* YNL-GEN kernel header */
|
/* YNL-GEN kernel header */
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause */
|
/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
|
||||||
/* Do not edit directly, auto-generated from: */
|
/* Do not edit directly, auto-generated from: */
|
||||||
/* Documentation/netlink/specs/netdev.yaml */
|
/* Documentation/netlink/specs/netdev.yaml */
|
||||||
/* YNL-GEN uapi header */
|
/* YNL-GEN uapi header */
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#!/usr/bin/env python3
|
#!/usr/bin/env python3
|
||||||
# SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
|
# SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)
|
||||||
|
|
||||||
import argparse
|
import argparse
|
||||||
import collections
|
import collections
|
||||||
|
@ -2068,12 +2068,12 @@ def main():
|
||||||
|
|
||||||
_, spec_kernel = find_kernel_root(args.spec)
|
_, spec_kernel = find_kernel_root(args.spec)
|
||||||
if args.mode == 'uapi':
|
if args.mode == 'uapi':
|
||||||
cw.p('/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause */')
|
cw.p('/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */')
|
||||||
else:
|
else:
|
||||||
if args.header:
|
if args.header:
|
||||||
cw.p('/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */')
|
cw.p('/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */')
|
||||||
else:
|
else:
|
||||||
cw.p('// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause')
|
cw.p('// SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)')
|
||||||
cw.p("/* Do not edit directly, auto-generated from: */")
|
cw.p("/* Do not edit directly, auto-generated from: */")
|
||||||
cw.p(f"/*\t{spec_kernel} */")
|
cw.p(f"/*\t{spec_kernel} */")
|
||||||
cw.p(f"/* YNL-GEN {args.mode} {'header' if args.header else 'source'} */")
|
cw.p(f"/* YNL-GEN {args.mode} {'header' if args.header else 'source'} */")
|
||||||
|
|
Loading…
Add table
Reference in a new issue