aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Brown <mcb30@ipxe.org>2023-01-28 15:30:11 +0000
committerMichael Brown <mcb30@ipxe.org>2023-01-28 17:07:40 +0000
commit38f54fb413a1c70f302f9b29ba9f1a87050d4066 (patch)
tree1aa7f010f2615f2793855744d901483503db04b6
parent5bf8b115271fe7cfb45d0e83ef9f29fcf609068a (diff)
downloadipxe-38f54fb413a1c70f302f9b29ba9f1a87050d4066.zip
ipxe-38f54fb413a1c70f302f9b29ba9f1a87050d4066.tar.gz
ipxe-38f54fb413a1c70f302f9b29ba9f1a87050d4066.tar.bz2
[legal] Add support for the BSD-2-Clause-Patent licence
Signed-off-by: Michael Brown <mcb30@ipxe.org>
-rw-r--r--src/include/compiler.h47
-rwxr-xr-xsrc/util/licence.pl14
2 files changed, 61 insertions, 0 deletions
diff --git a/src/include/compiler.h b/src/include/compiler.h
index a936425..5685ab1 100644
--- a/src/include/compiler.h
+++ b/src/include/compiler.h
@@ -755,6 +755,53 @@ char __debug_disable(OBJECT) = ( DBGLVL_MAX & ~DBGLVL_DFLT );
#define FILE_LICENCE_BSD2 \
PROVIDE_SYMBOL ( PREFIX_OBJECT ( __licence__bsd2__ ) )
+/** Declare a file as being under the two-clause BSD plus patent licence
+ *
+ * This licence declaration is applicable when a file states itself to
+ * be licensed under terms allowing redistribution in source and
+ * binary forms (with or without modification) provided that:
+ *
+ * redistributions of source code retain the copyright notice,
+ * list of conditions and any attached disclaimers
+ *
+ * redistributions in binary form reproduce the copyright notice,
+ * list of conditions and any attached disclaimers in the
+ * documentation and/or other materials provided with the
+ * distribution
+ *
+ * and in addition states that
+ *
+ * Subject to the terms and conditions of this license, each
+ * copyright holder and contributor hereby grants to those
+ * receiving rights under this license a perpetual, worldwide,
+ * non-exclusive, no-charge, royalty-free, irrevocable (except for
+ * failure to satisfy the conditions of this license) patent
+ * license to make, have made, use, offer to sell, sell, import,
+ * and otherwise transfer this software, where such license
+ * applies only to those patent claims, already acquired or
+ * hereafter acquired, licensable by such copyright holder or
+ * contributor that are necessarily infringed by:
+ *
+ * their Contribution(s) (the licensed copyrights of copyright
+ * holders and non-copyrightable additions of contributors, in
+ * source or binary form) alone; or
+ *
+ * combination of their Contribution(s) with the work of
+ * authorship to which such Contribution(s) was added by such
+ * copyright holder or contributor, if, at the time the
+ * Contribution is added, such addition causes such combination
+ * to be necessarily infringed. The patent license shall not
+ * apply to any other combinations which include the
+ * Contribution.
+ *
+ * It is not necessary for the file to explicitly state that it is
+ * under a "BSD" licence; only that the licensing terms be
+ * functionally equivalent to the standard two-clause BSD licence with
+ * patent grant.
+ */
+#define FILE_LICENCE_BSD2_PATENT \
+ PROVIDE_SYMBOL ( PREFIX_OBJECT ( __licence__bsd2_patent__ ) )
+
/** Declare a file as being under the one-clause MIT-style licence
*
* This licence declaration is applicable when a file states itself to
diff --git a/src/util/licence.pl b/src/util/licence.pl
index 79e70fd..bb23c95 100755
--- a/src/util/licence.pl
+++ b/src/util/licence.pl
@@ -29,6 +29,7 @@ my $known_licences = {
public_domain => 1,
bsd3 => 1,
bsd2 => 1,
+ bsd2_patent => 1,
mit => 1,
isc => 1,
},
@@ -41,6 +42,7 @@ my $known_licences = {
public_domain => 1,
bsd3 => 1,
bsd2 => 1,
+ bsd2_patent => 1,
mit => 1,
isc => 1,
},
@@ -54,6 +56,7 @@ my $known_licences = {
public_domain => 1,
bsd3 => 1,
bsd2 => 1,
+ bsd2_patent => 1,
mit => 1,
isc => 1,
},
@@ -65,6 +68,7 @@ my $known_licences = {
public_domain => 1,
bsd3 => 1,
bsd2 => 1,
+ bsd2_patent => 1,
mit => 1,
isc => 1,
},
@@ -100,6 +104,16 @@ my $known_licences = {
isc => 1,
},
},
+ bsd2_patent => {
+ desc => ( "BSD Licence (without advertising or endorsement clauses, ".
+ "with patent clause)" ),
+ can_subsume => {
+ public_domain => 1,
+ bsd2 => 1,
+ mit => 1,
+ isc => 1,
+ },
+ },
mit => {
desc => "MIT/X11/Xorg Licence",
can_subsume => {