From 22bc080c4f8da1f41a60d7e5615c575bfaf68c37 Mon Sep 17 00:00:00 2001 From: nytpu Date: Mon, 23 Aug 2021 17:08:49 -0600 Subject: [PATCH 01/36] Add the CERN Open Hardware version 2 family of licenses --- _licenses/cern-ohl-p-2.0.txt | 216 +++++++++++++++++++++++ _licenses/cern-ohl-s-2.0.txt | 299 ++++++++++++++++++++++++++++++++ _licenses/cern-ohl-w-2.0.txt | 321 +++++++++++++++++++++++++++++++++++ 3 files changed, 836 insertions(+) create mode 100644 _licenses/cern-ohl-p-2.0.txt create mode 100644 _licenses/cern-ohl-s-2.0.txt create mode 100644 _licenses/cern-ohl-w-2.0.txt diff --git a/_licenses/cern-ohl-p-2.0.txt b/_licenses/cern-ohl-p-2.0.txt new file mode 100644 index 0000000..0340156 --- /dev/null +++ b/_licenses/cern-ohl-p-2.0.txt @@ -0,0 +1,216 @@ +--- +title: CERN Open Hardware Licence Version 2 - Permissive +spdx-id: CERN-OHL-P-2.0 +nickname: CERN OHL v2 Permissive + +description: The CERN OHL was drafted with hardware in mind. On top of licensing copyright like software and documentation licenses, it also licenses patents. This “Permissive” variant allows people to take your code, relicense it and use it without any obligation to distribute the sources when they ship a product; it does have an attribution requirement. + +how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. + +note: CERN recommends adding a license header and copyright notice to the README and source files. CERN provides a User's Guide containing a recommended license header. + +using: + Castor & Pollux: https://github.com/wntrblm/Castor_and_Pollux/blob/main/hardware/mainboard/LICENSE + LEDEAF: https://github.com/adamgreig/ledeaf/blob/master/LICENSE_CERN_OHL_P_v2.txt + ProtoCentral ECG Breakout: https://github.com/Protocentral/protocentral_max86150_ecg_ppg/blob/master/LICENSE.md#hardware + +permissions: + - commercial-use + - modifications + - distribution + - private-use + - patent-use + +conditions: + - include-copyright + - document-changes + +limitations: + - liability + - warranty + +--- +CERN Open Hardware Licence Version 2 - Permissive + + +Preamble + +CERN has developed this licence to promote collaboration among hardware +designers and to provide a legal tool which supports the freedom to use, +study, modify, share and distribute hardware designs and products based on +those designs. Version 2 of the CERN Open Hardware Licence comes in three +variants: this licence, CERN-OHL-P (permissive); and two reciprocal licences: +CERN-OHL-W (weakly reciprocal) and CERN-OHL-S (strongly reciprocal). + +The CERN-OHL-P is copyright CERN 2020. Anyone is welcome to use it, in +unmodified form only. + +Use of this Licence does not imply any endorsement by CERN of any Licensor or +their designs nor does it imply any involvement by CERN in their development. + + +1 Definitions + + 1.1 'Licence' means this CERN-OHL-P. + + 1.2 'Source' means information such as design materials or digital code + which can be applied to Make or test a Product or to prepare a Product + for use, Conveyance or sale, regardless of its medium or how it is + expressed. It may include Notices. + + 1.3 'Covered Source' means Source that is explicitly made available under + this Licence. + + 1.4 'Product' means any device, component, work or physical object, whether + in finished or intermediate form, arising from the use, application or + processing of Covered Source. + + 1.5 'Make' means to create or configure something, whether by manufacture, + assembly, compiling, loading or applying Covered Source or another Product + or otherwise. + + 1.6 'Notice' means copyright, acknowledgement and trademark notices, + references to the location of any Notices, modification notices + (subsection 3.3(b)) and all notices that refer to this Licence and to + the disclaimer of warranties that are included in the Covered Source. + + 1.7 'Licensee' or 'You' means any person exercising rights under this + Licence. + + 1.8 'Licensor' means a person who creates Source or modifies Covered Source + and subsequently Conveys the resulting Covered Source under the terms + and conditions of this Licence. A person may be a Licensee and a + Licensor at the same time. + + 1.9 'Convey' means to communicate to the public or distribute. + + +2 Applicability + + 2.1 This Licence governs the use, copying, modification, Conveying of + Covered Source and Products, and the Making of Products. By exercising + any right granted under this Licence, You irrevocably accept these terms + and conditions. + + 2.2 This Licence is granted by the Licensor directly to You, and shall apply + worldwide and without limitation in time. + + 2.3 You shall not attempt to restrict by contract or otherwise the rights + granted under this Licence to other Licensees. + + 2.4 This Licence is not intended to restrict fair use, fair dealing, or any + other similar right. + + +3 Copying, Modifying and Conveying Covered Source + + 3.1 You may copy and Convey verbatim copies of Covered Source, in any + medium, provided You retain all Notices. + + 3.2 You may modify Covered Source, other than Notices. + + You may only delete Notices if they are no longer applicable to the + corresponding Covered Source as modified by You and You may add + additional Notices applicable to Your modifications. + + 3.3 You may Convey modified Covered Source (with the effect that You shall + also become a Licensor) provided that You: + + a) retain Notices as required in subsection 3.2; and + + b) add a Notice to the modified Covered Source stating that You have + modified it, with the date and brief description of how You have + modified it. + + 3.4 You may Convey Covered Source or modified Covered Source under licence + terms which differ from the terms of this Licence provided that You: + + a) comply at all times with subsection 3.3; and + + b) provide a copy of this Licence to anyone to whom You Convey Covered + Source or modified Covered Source. + + +4 Making and Conveying Products + +You may Make Products, and/or Convey them, provided that You ensure that the +recipient of the Product has access to any Notices applicable to the Product. + + +5 DISCLAIMER AND LIABILITY + + 5.1 DISCLAIMER OF WARRANTY -- The Covered Source and any Products are + provided 'as is' and any express or implied warranties, including, but + not limited to, implied warranties of merchantability, of satisfactory + quality, non-infringement of third party rights, and fitness for a + particular purpose or use are disclaimed in respect of any Source or + Product to the maximum extent permitted by law. The Licensor makes no + representation that any Source or Product does not or will not infringe + any patent, copyright, trade secret or other proprietary right. The + entire risk as to the use, quality, and performance of any Source or + Product shall be with You and not the Licensor. This disclaimer of + warranty is an essential part of this Licence and a condition for the + grant of any rights granted under this Licence. + + 5.2 EXCLUSION AND LIMITATION OF LIABILITY -- The Licensor shall, to the + maximum extent permitted by law, have no liability for direct, indirect, + special, incidental, consequential, exemplary, punitive or other damages + of any character including, without limitation, procurement of + substitute goods or services, loss of use, data or profits, or business + interruption, however caused and on any theory of contract, warranty, + tort (including negligence), product liability or otherwise, arising in + any way in relation to the Covered Source, modified Covered Source + and/or the Making or Conveyance of a Product, even if advised of the + possibility of such damages, and You shall hold the Licensor(s) free and + harmless from any liability, costs, damages, fees and expenses, + including claims by third parties, in relation to such use. + + +6 Patents + + 6.1 Subject to the terms and conditions of this Licence, each Licensor + hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, + royalty-free, irrevocable (except as stated in this section 6, or where + terminated by the Licensor for cause) patent licence to Make, have Made, + use, offer to sell, sell, import, and otherwise transfer the Covered + Source and Products, where such licence applies only to those patent + claims licensable by such Licensor that are necessarily infringed by + exercising rights under the Covered Source as Conveyed by that Licensor. + + 6.2 If You institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Covered + Source or a Product constitutes direct or contributory patent + infringement, or You seek any declaration that a patent licensed to You + under this Licence is invalid or unenforceable then any rights granted + to You under this Licence shall terminate as of the date such process is + initiated. + + +7 General + + 7.1 If any provisions of this Licence are or subsequently become invalid or + unenforceable for any reason, the remaining provisions shall remain + effective. + + 7.2 You shall not use any of the name (including acronyms and + abbreviations), image, or logo by which the Licensor or CERN is known, + except where needed to comply with section 3, or where the use is + otherwise allowed by law. Any such permitted use shall be factual and + shall not be made so as to suggest any kind of endorsement or + implication of involvement by the Licensor or its personnel. + + 7.3 CERN may publish updated versions and variants of this Licence which it + considers to be in the spirit of this version, but may differ in detail + to address new problems or concerns. New versions will be published with + a unique version number and a variant identifier specifying the variant. + If the Licensor has specified that a given variant applies to the + Covered Source without specifying a version, You may treat that Covered + Source as being released under any version of the CERN-OHL with that + variant. If no variant is specified, the Covered Source shall be treated + as being released under CERN-OHL-S. The Licensor may also specify that + the Covered Source is subject to a specific version of the CERN-OHL or + any later version in which case You may apply this or any later version + of CERN-OHL with the same variant identifier published by CERN. + + 7.4 This Licence shall not be enforceable except by a Licensor acting as + such, and third party beneficiary rights are specifically excluded. diff --git a/_licenses/cern-ohl-s-2.0.txt b/_licenses/cern-ohl-s-2.0.txt new file mode 100644 index 0000000..115f9f9 --- /dev/null +++ b/_licenses/cern-ohl-s-2.0.txt @@ -0,0 +1,299 @@ +--- +title: CERN Open Hardware Licence Version 2 - Strongly Reciprocal +spdx-id: CERN-OHL-S-2.0 +nickname: CERN OHL v2 Strongly Reciprocal + +description: The CERN OHL was drafted with hardware in mind. On top of licensing copyright like software and documentation licenses, it also licenses patents. This “Strongly Reciprocal” variant applies virally, and if a CERN-OHL-S-2.0 file is used in a project then the full project must be released under the CERN-OHL-S-2.0 (or a compatible license). + +how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. + +note: CERN recommends adding a license header and copyright notice to the README and source files. CERN provides a User's Guide containing a recommended license header. + +using: + USB Armory: https://github.com/f-secure-foundry/usbarmory/blob/master/hardware/mark-two/LICENSE + waffling60: https://github.com/4pplet/waffling60/blob/master/LICENCE.md + Duet 3 Mainboard 6HC: https://github.com/Duet3D/Duet3-Mainboard-6HC/blob/master/LICENSE + +permissions: + - commercial-use + - modifications + - distribution + - private-use + - patent-use + +conditions: + - include-copyright + - document-changes + - disclose-source + - same-license + +limitations: + - liability + - warranty + +--- +CERN Open Hardware Licence Version 2 - Strongly Reciprocal + + +Preamble + +CERN has developed this licence to promote collaboration among hardware +designers and to provide a legal tool which supports the freedom to use, +study, modify, share and distribute hardware designs and products based on +those designs. Version 2 of the CERN Open Hardware Licence comes in three +variants: CERN-OHL-P (permissive); and two reciprocal licences: CERN-OHL-W +(weakly reciprocal) and this licence, CERN-OHL-S (strongly reciprocal). + +The CERN-OHL-S is copyright CERN 2020. Anyone is welcome to use it, in +unmodified form only. + +Use of this Licence does not imply any endorsement by CERN of any Licensor or +their designs nor does it imply any involvement by CERN in their development. + + +1 Definitions + + 1.1 'Licence' means this CERN-OHL-S. + + 1.2 'Compatible Licence' means + + a) any earlier version of the CERN Open Hardware licence, or + + b) any version of the CERN-OHL-S, or + + c) any licence which permits You to treat the Source to which it + applies as licensed under CERN-OHL-S provided that on Conveyance of + any such Source, or any associated Product You treat the Source in + question as being licensed under CERN-OHL-S. + + 1.3 'Source' means information such as design materials or digital code + which can be applied to Make or test a Product or to prepare a Product + for use, Conveyance or sale, regardless of its medium or how it is + expressed. It may include Notices. + + 1.4 'Covered Source' means Source that is explicitly made available under + this Licence. + + 1.5 'Product' means any device, component, work or physical object, whether + in finished or intermediate form, arising from the use, application or + processing of Covered Source. + + 1.6 'Make' means to create or configure something, whether by manufacture, + assembly, compiling, loading or applying Covered Source or another + Product or otherwise. + + 1.7 'Available Component' means any part, sub-assembly, library or code + which: + + a) is licensed to You as Complete Source under a Compatible Licence; or + + b) is available, at the time a Product or the Source containing it is + first Conveyed, to You and any other prospective licensees + + i) as a physical part with sufficient rights and information + (including any configuration and programming files and + information about its characteristics and interfaces) to enable + it either to be Made itself, or to be sourced and used to Make + the Product; or + ii) as part of the normal distribution of a tool used to design or + Make the Product. + + 1.8 'Complete Source' means the set of all Source necessary to Make a + Product, in the preferred form for making modifications, including + necessary installation and interfacing information both for the Product, + and for any included Available Components. If the format is + proprietary, it must also be made available in a format (if the + proprietary tool can create it) which is viewable with a tool available + to potential licensees and licensed under a licence approved by the Free + Software Foundation or the Open Source Initiative. Complete Source need + not include the Source of any Available Component, provided that You + include in the Complete Source sufficient information to enable a + recipient to Make or source and use the Available Component to Make the + Product. + + 1.9 'Source Location' means a location where a Licensor has placed Covered + Source, and which that Licensor reasonably believes will remain easily + accessible for at least three years for anyone to obtain a digital copy. + + 1.10 'Notice' means copyright, acknowledgement and trademark notices, Source + Location references, modification notices (subsection 3.3(b)) and all + notices that refer to this Licence and to the disclaimer of warranties + that are included in the Covered Source. + + 1.11 'Licensee' or 'You' means any person exercising rights under this + Licence. + + 1.12 'Licensor' means a natural or legal person who creates or modifies + Covered Source. A person may be a Licensee and a Licensor at the same + time. + + 1.13 'Convey' means to communicate to the public or distribute. + + +2 Applicability + + 2.1 This Licence governs the use, copying, modification, Conveying of + Covered Source and Products, and the Making of Products. By exercising + any right granted under this Licence, You irrevocably accept these terms + and conditions. + + 2.2 This Licence is granted by the Licensor directly to You, and shall apply + worldwide and without limitation in time. + + 2.3 You shall not attempt to restrict by contract or otherwise the rights + granted under this Licence to other Licensees. + + 2.4 This Licence is not intended to restrict fair use, fair dealing, or any + other similar right. + + +3 Copying, Modifying and Conveying Covered Source + + 3.1 You may copy and Convey verbatim copies of Covered Source, in any + medium, provided You retain all Notices. + + 3.2 You may modify Covered Source, other than Notices, provided that You + irrevocably undertake to make that modified Covered Source available + from a Source Location should You Convey a Product in circumstances + where the recipient does not otherwise receive a copy of the modified + Covered Source. In each case subsection 3.3 shall apply. + + You may only delete Notices if they are no longer applicable to the + corresponding Covered Source as modified by You and You may add + additional Notices applicable to Your modifications. Including Covered + Source in a larger work is modifying the Covered Source, and the larger + work becomes modified Covered Source. + + 3.3 You may Convey modified Covered Source (with the effect that You shall + also become a Licensor) provided that You: + + a) retain Notices as required in subsection 3.2; + + b) add a Notice to the modified Covered Source stating that You have + modified it, with the date and brief description of how You have + modified it; + + c) add a Source Location Notice for the modified Covered Source if You + Convey in circumstances where the recipient does not otherwise + receive a copy of the modified Covered Source; and + + d) license the modified Covered Source under the terms and conditions + of this Licence (or, as set out in subsection 8.3, a later version, + if permitted by the licence of the original Covered Source). Such + modified Covered Source must be licensed as a whole, but excluding + Available Components contained in it, which remain licensed under + their own applicable licences. + + +4 Making and Conveying Products + +You may Make Products, and/or Convey them, provided that You either provide +each recipient with a copy of the Complete Source or ensure that each +recipient is notified of the Source Location of the Complete Source. That +Complete Source is Covered Source, and You must accordingly satisfy Your +obligations set out in subsection 3.3. If specified in a Notice, the Product +must visibly and securely display the Source Location on it or its packaging +or documentation in the manner specified in that Notice. + + +5 Research and Development + +You may Convey Covered Source, modified Covered Source or Products to a legal +entity carrying out development, testing or quality assurance work on Your +behalf provided that the work is performed on terms which prevent the entity +from both using the Source or Products for its own internal purposes and +Conveying the Source or Products or any modifications to them to any person +other than You. Any modifications made by the entity shall be deemed to be +made by You pursuant to subsection 3.2. + + +6 DISCLAIMER AND LIABILITY + + 6.1 DISCLAIMER OF WARRANTY -- The Covered Source and any Products are + provided 'as is' and any express or implied warranties, including, but + not limited to, implied warranties of merchantability, of satisfactory + quality, non-infringement of third party rights, and fitness for a + particular purpose or use are disclaimed in respect of any Source or + Product to the maximum extent permitted by law. The Licensor makes no + representation that any Source or Product does not or will not infringe + any patent, copyright, trade secret or other proprietary right. The + entire risk as to the use, quality, and performance of any Source or + Product shall be with You and not the Licensor. This disclaimer of + warranty is an essential part of this Licence and a condition for the + grant of any rights granted under this Licence. + + 6.2 EXCLUSION AND LIMITATION OF LIABILITY -- The Licensor shall, to the + maximum extent permitted by law, have no liability for direct, indirect, + special, incidental, consequential, exemplary, punitive or other damages + of any character including, without limitation, procurement of + substitute goods or services, loss of use, data or profits, or business + interruption, however caused and on any theory of contract, warranty, + tort (including negligence), product liability or otherwise, arising in + any way in relation to the Covered Source, modified Covered Source + and/or the Making or Conveyance of a Product, even if advised of the + possibility of such damages, and You shall hold the Licensor(s) free and + harmless from any liability, costs, damages, fees and expenses, + including claims by third parties, in relation to such use. + + +7 Patents + + 7.1 Subject to the terms and conditions of this Licence, each Licensor + hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, + royalty-free, irrevocable (except as stated in subsections 7.2 and 8.4) + patent licence to Make, have Made, use, offer to sell, sell, import, and + otherwise transfer the Covered Source and Products, where such licence + applies only to those patent claims licensable by such Licensor that are + necessarily infringed by exercising rights under the Covered Source as + Conveyed by that Licensor. + + 7.2 If You institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Covered + Source or a Product constitutes direct or contributory patent + infringement, or You seek any declaration that a patent licensed to You + under this Licence is invalid or unenforceable then any rights granted + to You under this Licence shall terminate as of the date such process is + initiated. + + +8 General + + 8.1 If any provisions of this Licence are or subsequently become invalid or + unenforceable for any reason, the remaining provisions shall remain + effective. + + 8.2 You shall not use any of the name (including acronyms and + abbreviations), image, or logo by which the Licensor or CERN is known, + except where needed to comply with section 3, or where the use is + otherwise allowed by law. Any such permitted use shall be factual and + shall not be made so as to suggest any kind of endorsement or + implication of involvement by the Licensor or its personnel. + + 8.3 CERN may publish updated versions and variants of this Licence which it + considers to be in the spirit of this version, but may differ in detail + to address new problems or concerns. New versions will be published with + a unique version number and a variant identifier specifying the variant. + If the Licensor has specified that a given variant applies to the + Covered Source without specifying a version, You may treat that Covered + Source as being released under any version of the CERN-OHL with that + variant. If no variant is specified, the Covered Source shall be treated + as being released under CERN-OHL-S. The Licensor may also specify that + the Covered Source is subject to a specific version of the CERN-OHL or + any later version in which case You may apply this or any later version + of CERN-OHL with the same variant identifier published by CERN. + + 8.4 This Licence shall terminate with immediate effect if You fail to comply + with any of its terms and conditions. + + 8.5 However, if You cease all breaches of this Licence, then Your Licence + from any Licensor is reinstated unless such Licensor has terminated this + Licence by giving You, while You remain in breach, a notice specifying + the breach and requiring You to cure it within 30 days, and You have + failed to come into compliance in all material respects by the end of + the 30 day period. Should You repeat the breach after receipt of a cure + notice and subsequent reinstatement, this Licence will terminate + immediately and permanently. Section 6 shall continue to apply after any + termination. + + 8.6 This Licence shall not be enforceable except by a Licensor acting as + such, and third party beneficiary rights are specifically excluded. diff --git a/_licenses/cern-ohl-w-2.0.txt b/_licenses/cern-ohl-w-2.0.txt new file mode 100644 index 0000000..45f5bb7 --- /dev/null +++ b/_licenses/cern-ohl-w-2.0.txt @@ -0,0 +1,321 @@ +--- +title: CERN Open Hardware Licence Version 2 - Weakly Reciprocal +spdx-id: CERN-OHL-W-2.0 +nickname: CERN OHL v2 Weakly Reciprocal + +description: The CERN OHL was drafted with hardware in mind. On top of licensing copyright like software and documentation licenses, it also licenses patents. This “Weakly Reciprocal” variant applies to individual designs but does not spread to the entire project it is included in. + +how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. + +note: CERN recommends adding a license header and copyright notice to the README and source files. CERN provides a User's Guide containing a recommended license header. + +using: + Simple PCIe FMC carrier: https://ohwr.org/project/spec/blob/master/LICENSES/CERN-OHL-W-2.0.txt + GProcessor8Bits: https://github.com/JonathSpirit/GP8B/blob/master/LICENSE + FPGA Cores: https://github.com/suoto/fpga_cores/blob/master/LICENSE + +permissions: + - commercial-use + - modifications + - distribution + - private-use + - patent-use + +conditions: + - include-copyright + - document-changes + - disclose-source + - same-license--file + +limitations: + - liability + - warranty + +--- +CERN Open Hardware Licence Version 2 - Weakly Reciprocal + + +Preamble + +CERN has developed this licence to promote collaboration among hardware +designers and to provide a legal tool which supports the freedom to use, +study, modify, share and distribute hardware designs and products based on +those designs. Version 2 of the CERN Open Hardware Licence comes in three +variants: CERN-OHL-P (permissive); and two reciprocal licences: this licence, +CERN-OHL-W (weakly reciprocal) and CERN-OHL-S (strongly reciprocal). + +The CERN-OHL-W is copyright CERN 2020. Anyone is welcome to use it, in +unmodified form only. + +Use of this Licence does not imply any endorsement by CERN of any Licensor or +their designs nor does it imply any involvement by CERN in their development. + + +1 Definitions + + 1.1 'Licence' means this CERN-OHL-W. + + 1.2 'Compatible Licence' means + + a) any earlier version of the CERN Open Hardware licence, or + + b) any version of the CERN-OHL-S or the CERN-OHL-W, or + + c) any licence which permits You to treat the Source to which it + applies as licensed under CERN-OHL-S or CERN-OHL-W provided that on + Conveyance of any such Source, or any associated Product You treat + the Source in question as being licensed under CERN-OHL-S or + CERN-OHL-W as appropriate. + + 1.3 'Source' means information such as design materials or digital code + which can be applied to Make or test a Product or to prepare a Product + for use, Conveyance or sale, regardless of its medium or how it is + expressed. It may include Notices. + + 1.4 'Covered Source' means Source that is explicitly made available under + this Licence. + + 1.5 'Product' means any device, component, work or physical object, whether + in finished or intermediate form, arising from the use, application or + processing of Covered Source. + + 1.6 'Make' means to create or configure something, whether by manufacture, + assembly, compiling, loading or applying Covered Source or another + Product or otherwise. + + 1.7 'Available Component' means any part, sub-assembly, library or code + which: + + a) is licensed to You as Complete Source under a Compatible Licence; or + + b) is available, at the time a Product or the Source containing it is + first Conveyed, to You and any other prospective licensees + + i) with sufficient rights and information (including any + configuration and programming files and information about its + characteristics and interfaces) to enable it either to be Made + itself, or to be sourced and used to Make the Product; or + ii) as part of the normal distribution of a tool used to design or + Make the Product. + + 1.8 'External Material' means anything (including Source) which: + + a) is only combined with Covered Source in such a way that it + interfaces with the Covered Source using a documented interface + which is described in the Covered Source; and + + b) is not a derivative of or contains Covered Source, or, if it is, it + is solely to the extent necessary to facilitate such interfacing. + + 1.9 'Complete Source' means the set of all Source necessary to Make a + Product, in the preferred form for making modifications, including + necessary installation and interfacing information both for the Product, + and for any included Available Components. If the format is + proprietary, it must also be made available in a format (if the + proprietary tool can create it) which is viewable with a tool available + to potential licensees and licensed under a licence approved by the Free + Software Foundation or the Open Source Initiative. Complete Source need + not include the Source of any Available Component, provided that You + include in the Complete Source sufficient information to enable a + recipient to Make or source and use the Available Component to Make the + Product. + + 1.10 'Source Location' means a location where a Licensor has placed Covered + Source, and which that Licensor reasonably believes will remain easily + accessible for at least three years for anyone to obtain a digital copy. + + 1.11 'Notice' means copyright, acknowledgement and trademark notices, Source + Location references, modification notices (subsection 3.3(b)) and all + notices that refer to this Licence and to the disclaimer of warranties + that are included in the Covered Source. + + 1.12 'Licensee' or 'You' means any person exercising rights under this + Licence. + + 1.13 'Licensor' means a natural or legal person who creates or modifies + Covered Source. A person may be a Licensee and a Licensor at the same + time. + + 1.14 'Convey' means to communicate to the public or distribute. + + +2 Applicability + + 2.1 This Licence governs the use, copying, modification, Conveying of + Covered Source and Products, and the Making of Products. By exercising + any right granted under this Licence, You irrevocably accept these terms + and conditions. + + 2.2 This Licence is granted by the Licensor directly to You, and shall apply + worldwide and without limitation in time. + + 2.3 You shall not attempt to restrict by contract or otherwise the rights + granted under this Licence to other Licensees. + + 2.4 This Licence is not intended to restrict fair use, fair dealing, or any + other similar right. + + +3 Copying, Modifying and Conveying Covered Source + + 3.1 You may copy and Convey verbatim copies of Covered Source, in any + medium, provided You retain all Notices. + + 3.2 You may modify Covered Source, other than Notices, provided that You + irrevocably undertake to make that modified Covered Source available + from a Source Location should You Convey a Product in circumstances + where the recipient does not otherwise receive a copy of the modified + Covered Source. In each case subsection 3.3 shall apply. + + You may only delete Notices if they are no longer applicable to the + corresponding Covered Source as modified by You and You may add + additional Notices applicable to Your modifications. + + 3.3 You may Convey modified Covered Source (with the effect that You shall + also become a Licensor) provided that You: + + a) retain Notices as required in subsection 3.2; + + b) add a Notice to the modified Covered Source stating that You have + modified it, with the date and brief description of how You have + modified it; + + c) add a Source Location Notice for the modified Covered Source if You + Convey in circumstances where the recipient does not otherwise + receive a copy of the modified Covered Source; and + + d) license the modified Covered Source under the terms and conditions + of this Licence (or, as set out in subsection 8.3, a later version, + if permitted by the licence of the original Covered Source). Such + modified Covered Source must be licensed as a whole, but excluding + Available Components contained in it or External Material to which + it is interfaced, which remain licensed under their own applicable + licences. + + +4 Making and Conveying Products + + 4.1 You may Make Products, and/or Convey them, provided that You either + provide each recipient with a copy of the Complete Source or ensure that + each recipient is notified of the Source Location of the Complete + Source. That Complete Source includes Covered Source and You must + accordingly satisfy Your obligations set out in subsection 3.3. If + specified in a Notice, the Product must visibly and securely display the + Source Location on it or its packaging or documentation in the manner + specified in that Notice. + + 4.2 Where You Convey a Product which incorporates External Material, the + Complete Source for that Product which You are required to provide under + subsection 4.1 need not include any Source for the External Material. + + 4.3 You may license Products under terms of Your choice, provided that such + terms do not restrict or attempt to restrict any recipients' rights + under this Licence to the Covered Source. + + +5 Research and Development + +You may Convey Covered Source, modified Covered Source or Products to a legal +entity carrying out development, testing or quality assurance work on Your +behalf provided that the work is performed on terms which prevent the entity +from both using the Source or Products for its own internal purposes and +Conveying the Source or Products or any modifications to them to any person +other than You. Any modifications made by the entity shall be deemed to be +made by You pursuant to subsection 3.2. + + +6 DISCLAIMER AND LIABILITY + + 6.1 DISCLAIMER OF WARRANTY -- The Covered Source and any Products are + provided 'as is' and any express or implied warranties, including, but + not limited to, implied warranties of merchantability, of satisfactory + quality, non-infringement of third party rights, and fitness for a + particular purpose or use are disclaimed in respect of any Source or + Product to the maximum extent permitted by law. The Licensor makes no + representation that any Source or Product does not or will not infringe + any patent, copyright, trade secret or other proprietary right. The + entire risk as to the use, quality, and performance of any Source or + Product shall be with You and not the Licensor. This disclaimer of + warranty is an essential part of this Licence and a condition for the + grant of any rights granted under this Licence. + + 6.2 EXCLUSION AND LIMITATION OF LIABILITY -- The Licensor shall, to the + maximum extent permitted by law, have no liability for direct, indirect, + special, incidental, consequential, exemplary, punitive or other damages + of any character including, without limitation, procurement of + substitute goods or services, loss of use, data or profits, or business + interruption, however caused and on any theory of contract, warranty, + tort (including negligence), product liability or otherwise, arising in + any way in relation to the Covered Source, modified Covered Source + and/or the Making or Conveyance of a Product, even if advised of the + possibility of such damages, and You shall hold the Licensor(s) free and + harmless from any liability, costs, damages, fees and expenses, + including claims by third parties, in relation to such use. + + +7 Patents + + 7.1 Subject to the terms and conditions of this Licence, each Licensor + hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, + royalty-free, irrevocable (except as stated in subsections 7.2 and 8.4) + patent licence to Make, have Made, use, offer to sell, sell, import, and + otherwise transfer the Covered Source and Products, where such licence + applies only to those patent claims licensable by such Licensor that are + necessarily infringed by exercising rights under the Covered Source as + Conveyed by that Licensor. + + 7.2 If You institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Covered + Source or a Product constitutes direct or contributory patent + infringement, or You seek any declaration that a patent licensed to You + under this Licence is invalid or unenforceable then any rights granted + to You under this Licence shall terminate as of the date such process is + initiated. + + +8 General + + 8.1 If any provisions of this Licence are or subsequently become invalid or + unenforceable for any reason, the remaining provisions shall remain + effective. + + 8.2 You shall not use any of the name (including acronyms and + abbreviations), image, or logo by which the Licensor or CERN is known, + except where needed to comply with section 3, or where the use is + otherwise allowed by law. Any such permitted use shall be factual and + shall not be made so as to suggest any kind of endorsement or + implication of involvement by the Licensor or its personnel. + + 8.3 CERN may publish updated versions and variants of this Licence which it + considers to be in the spirit of this version, but may differ in detail + to address new problems or concerns. New versions will be published with + a unique version number and a variant identifier specifying the variant. + If the Licensor has specified that a given variant applies to the + Covered Source without specifying a version, You may treat that Covered + Source as being released under any version of the CERN-OHL with that + variant. If no variant is specified, the Covered Source shall be treated + as being released under CERN-OHL-S. The Licensor may also specify that + the Covered Source is subject to a specific version of the CERN-OHL or + any later version in which case You may apply this or any later version + of CERN-OHL with the same variant identifier published by CERN. + + You may treat Covered Source licensed under CERN-OHL-W as licensed under + CERN-OHL-S if and only if all Available Components referenced in the + Covered Source comply with the corresponding definition of Available + Component for CERN-OHL-S. + + 8.4 This Licence shall terminate with immediate effect if You fail to comply + with any of its terms and conditions. + + 8.5 However, if You cease all breaches of this Licence, then Your Licence + from any Licensor is reinstated unless such Licensor has terminated this + Licence by giving You, while You remain in breach, a notice specifying + the breach and requiring You to cure it within 30 days, and You have + failed to come into compliance in all material respects by the end of + the 30 day period. Should You repeat the breach after receipt of a cure + notice and subsequent reinstatement, this Licence will terminate + immediately and permanently. Section 6 shall continue to apply after any + termination. + + 8.6 This Licence shall not be enforceable except by a Licensor acting as + such, and third party beneficiary rights are specifically excluded. From 6e0063e56cde2837e16d0498a6e88b2d12469ec0 Mon Sep 17 00:00:00 2001 From: nytpu Date: Mon, 23 Aug 2021 17:22:49 -0600 Subject: [PATCH 02/36] Add Hardware section to the Non-Software Licenses page Recommended the CERN OHL v2 family of licenses and linked to software licenses with similar terms. Also added mention of the Creative Commons licenses often used for hardware. --- non-software.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/non-software.md b/non-software.md index 8335012..2c83d72 100644 --- a/non-software.md +++ b/non-software.md @@ -18,6 +18,14 @@ Any open source software license or open license for media (see [above](#data-me The [SIL Open Font License 1.1](/licenses/ofl-1.1/) keeps fonts open, allowing them to be freely used in other works. +### Hardware + +There are the CERN Open Hardware family of licenses: [CERN-OHL-P-2.0](/licenses/cern-ohl-p-2.0/) (Permissive, [MIT](/licenses/mit/)-like), [CERN-OHL-W-2.0](/licenses/cern-ohl-w-2.0/) (Weakly reciprocal, [MPL](/licenses/mpl-2.0/)-like), and [cern-ohl-s-2.0](/licenses/cern-ohl-s-2.0/) (Strongly reciprocal, [GPL](/licenses/gpl-3.0/)-like). The CERN OHL family is also applicable to HDL source code and programmable hardware such as FPGA bitstreams. + +[CC-BY-4.0](/licenses/cc-by-4.0/) and [CC-BY-SA-4.0](/licenses/cc-by-sa-4.0/) are also commonly used for hardware; however they do not grant patent rights which restricts usage of patent-encumbered hardware licensed under them. + +If your hardware has accompanying software then be sure to specify a license for the software portion as well as the hardware portion. + ### Mixed projects If your project contains a mix of software and other material, you can include multiple licenses, as long as you are explicit about which license applies to each part of the project. See [the license notice for this site](https://github.com/github/choosealicense.com#license) as an example. From 9afc07e19c4aa9bdacd86b7a161c327d436c2d9e Mon Sep 17 00:00:00 2001 From: nytpu Date: Tue, 24 Aug 2021 08:43:52 -0600 Subject: [PATCH 03/36] Fix typos and expand reasoning in non-software --- non-software.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/non-software.md b/non-software.md index 2c83d72..7709ca7 100644 --- a/non-software.md +++ b/non-software.md @@ -20,9 +20,9 @@ The [SIL Open Font License 1.1](/licenses/ofl-1.1/) keeps fonts open, allowing t ### Hardware -There are the CERN Open Hardware family of licenses: [CERN-OHL-P-2.0](/licenses/cern-ohl-p-2.0/) (Permissive, [MIT](/licenses/mit/)-like), [CERN-OHL-W-2.0](/licenses/cern-ohl-w-2.0/) (Weakly reciprocal, [MPL](/licenses/mpl-2.0/)-like), and [cern-ohl-s-2.0](/licenses/cern-ohl-s-2.0/) (Strongly reciprocal, [GPL](/licenses/gpl-3.0/)-like). The CERN OHL family is also applicable to HDL source code and programmable hardware such as FPGA bitstreams. +There are the CERN Open Hardware family of licenses: [CERN-OHL-P-2.0](/licenses/cern-ohl-p-2.0/), the permissive variant ([MIT](/licenses/mit/)-like); [CERN-OHL-W-2.0](/licenses/cern-ohl-w-2.0/), the “weakly reciprocal” variant ([MPL](/licenses/mpl-2.0/)-like), and [CERN-OHL-S-2.0](/licenses/cern-ohl-s-2.0/), the “strongly reciprocal” variant ([GPL](/licenses/gpl-3.0/)-like). The CERN OHL family is also applicable to HDL source code and synthesized bitstreams as would be used in FPGAs. -[CC-BY-4.0](/licenses/cc-by-4.0/) and [CC-BY-SA-4.0](/licenses/cc-by-sa-4.0/) are also commonly used for hardware; however they do not grant patent rights which restricts usage of patent-encumbered hardware licensed under them. +[CC-BY-4.0](/licenses/cc-by-4.0/) and [CC-BY-SA-4.0](/licenses/cc-by-sa-4.0/) are also commonly used for hardware; however they do not grant patent rights which can restrict usage of patent-encumbered hardware licensed under them and Creative Commons does not recommend them for hardware. If your hardware has accompanying software then be sure to specify a license for the software portion as well as the hardware portion. From 8d4b35ef9409216df7b43448036dedabfa37c633 Mon Sep 17 00:00:00 2001 From: nytpu Date: Tue, 24 Aug 2021 09:55:11 -0600 Subject: [PATCH 04/36] fix license wrapping --- _licenses/cern-ohl-p-2.0.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_licenses/cern-ohl-p-2.0.txt b/_licenses/cern-ohl-p-2.0.txt index 0340156..262034f 100644 --- a/_licenses/cern-ohl-p-2.0.txt +++ b/_licenses/cern-ohl-p-2.0.txt @@ -66,8 +66,8 @@ their designs nor does it imply any involvement by CERN in their development. processing of Covered Source. 1.5 'Make' means to create or configure something, whether by manufacture, - assembly, compiling, loading or applying Covered Source or another Product - or otherwise. + assembly, compiling, loading or applying Covered Source or another + Product or otherwise. 1.6 'Notice' means copyright, acknowledgement and trademark notices, references to the location of any Notices, modification notices From da312bcaa9cf27dacafd54cefe803390c2449923 Mon Sep 17 00:00:00 2001 From: nytpu Date: Tue, 24 Aug 2021 09:58:37 -0600 Subject: [PATCH 05/36] add ohwr.org to license_meta_spec.rb --- spec/license_meta_spec.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spec/license_meta_spec.rb b/spec/license_meta_spec.rb index de1d55a..de6a730 100644 --- a/spec/license_meta_spec.rb +++ b/spec/license_meta_spec.rb @@ -53,6 +53,8 @@ describe 'license meta' do example_url.gsub!(%r{/tree/}, '/plain/') elsif example_url.start_with?('https://bitbucket.org/') example_url.gsub!(%r{/src/}, '/raw/') + elsif example_url.start_with?('https://ohwr.org/') + example_url.gsub!(%r{/blob/}, '/raw/') end it "is a #{slug} license" do From 0d7c2d161f4786077a7c4a82d45a3e30bdb3fb59 Mon Sep 17 00:00:00 2001 From: Julian Stirling Date: Fri, 10 Jun 2022 17:35:06 +0100 Subject: [PATCH 06/36] Update projects using CERN-OHL-S and CERN-OHL-P --- _licenses/cern-ohl-p-2.0.txt | 4 ++-- _licenses/cern-ohl-s-2.0.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_licenses/cern-ohl-p-2.0.txt b/_licenses/cern-ohl-p-2.0.txt index 262034f..1afbd7b 100644 --- a/_licenses/cern-ohl-p-2.0.txt +++ b/_licenses/cern-ohl-p-2.0.txt @@ -10,9 +10,9 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of note: CERN recommends adding a license header and copyright notice to the README and source files. CERN provides a User's Guide containing a recommended license header. using: - Castor & Pollux: https://github.com/wntrblm/Castor_and_Pollux/blob/main/hardware/mainboard/LICENSE + tedium: https://github.com/jboone/tedium/blob/master/LICENSE-CERN-OHL-P-v2 LEDEAF: https://github.com/adamgreig/ledeaf/blob/master/LICENSE_CERN_OHL_P_v2.txt - ProtoCentral ECG Breakout: https://github.com/Protocentral/protocentral_max86150_ecg_ppg/blob/master/LICENSE.md#hardware + Open source controller board for ventilators: https://github.com/CV19CO/open_controller_for_ventilator/master/LICENSE permissions: - commercial-use diff --git a/_licenses/cern-ohl-s-2.0.txt b/_licenses/cern-ohl-s-2.0.txt index 115f9f9..e3b810a 100644 --- a/_licenses/cern-ohl-s-2.0.txt +++ b/_licenses/cern-ohl-s-2.0.txt @@ -12,7 +12,7 @@ note: CERN recommends adding a license header and copyright notice to the README using: USB Armory: https://github.com/f-secure-foundry/usbarmory/blob/master/hardware/mark-two/LICENSE waffling60: https://github.com/4pplet/waffling60/blob/master/LICENCE.md - Duet 3 Mainboard 6HC: https://github.com/Duet3D/Duet3-Mainboard-6HC/blob/master/LICENSE + plt-docs PLT Demo Board: https://github.com/bcdevices/plt-docs/blob/main/PLT-DEMOv2/LICENSE permissions: - commercial-use From 9ff30caccd6776866a1d4c49b22e0c48e4392532 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 10 Jun 2022 11:32:37 -0700 Subject: [PATCH 07/36] update unlicense examples --- _licenses/unlicense.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/unlicense.txt b/_licenses/unlicense.txt index deaac05..ab3cb15 100644 --- a/_licenses/unlicense.txt +++ b/_licenses/unlicense.txt @@ -8,9 +8,9 @@ description: A license with no conditions whatsoever which dedicates works to th how: Create a text file (typically named UNLICENSE or UNLICENSE.txt) in the root of your source code and copy the text of the license disclaimer into the file. using: - scoop: https://github.com/lukesampson/scoop/blob/master/LICENSE kakoune: https://github.com/mawww/kakoune/blob/master/UNLICENSE RDF.rb: https://github.com/ruby-rdf/rdf/blob/master/UNLICENSE + react-use: https://github.com/streamich/react-use permissions: - private-use From de42758cecb53377e29dc637c88ccc2b5c6935d3 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 10 Jun 2022 11:38:10 -0700 Subject: [PATCH 08/36] Fix react-use example --- _licenses/unlicense.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/unlicense.txt b/_licenses/unlicense.txt index ab3cb15..fc4d4a5 100644 --- a/_licenses/unlicense.txt +++ b/_licenses/unlicense.txt @@ -10,7 +10,7 @@ how: Create a text file (typically named UNLICENSE or UNLICENSE.txt) in the root using: kakoune: https://github.com/mawww/kakoune/blob/master/UNLICENSE RDF.rb: https://github.com/ruby-rdf/rdf/blob/master/UNLICENSE - react-use: https://github.com/streamich/react-use + react-use: https://github.com/streamich/react-use/blob/master/LICENSE permissions: - private-use From 683f3e932d589802058c9760b59ce63abbe4ae47 Mon Sep 17 00:00:00 2001 From: j-sp Date: Fri, 10 Jun 2022 22:57:49 +0200 Subject: [PATCH 09/36] Update cern-ohl-p-2.0.txt Clarify use guidelines of p variant --- _licenses/cern-ohl-p-2.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/cern-ohl-p-2.0.txt b/_licenses/cern-ohl-p-2.0.txt index 1afbd7b..5766377 100644 --- a/_licenses/cern-ohl-p-2.0.txt +++ b/_licenses/cern-ohl-p-2.0.txt @@ -7,7 +7,7 @@ description: The CERN OHL was drafted with hardware in mind. On top of licensin how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. -note: CERN recommends adding a license header and copyright notice to the README and source files. CERN provides a User's Guide containing a recommended license header. +note: CERN recommends adding the following information in the source files: copyright and license notice, a disclaimer of warranties and a source location. You can also include the source location in a part of the design which will be visible in the end product. See the User's Guide for example notices and further explanation. using: tedium: https://github.com/jboone/tedium/blob/master/LICENSE-CERN-OHL-P-v2 From 072e77d29e0a2cc958cb8c3776ff1e7425a3ebf5 Mon Sep 17 00:00:00 2001 From: j-sp Date: Fri, 10 Jun 2022 23:00:20 +0200 Subject: [PATCH 10/36] Update cern-ohl-s-2.0.txt Avoid word "virally" --- _licenses/cern-ohl-s-2.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/cern-ohl-s-2.0.txt b/_licenses/cern-ohl-s-2.0.txt index e3b810a..2acd112 100644 --- a/_licenses/cern-ohl-s-2.0.txt +++ b/_licenses/cern-ohl-s-2.0.txt @@ -3,7 +3,7 @@ title: CERN Open Hardware Licence Version 2 - Strongly Reciprocal spdx-id: CERN-OHL-S-2.0 nickname: CERN OHL v2 Strongly Reciprocal -description: The CERN OHL was drafted with hardware in mind. On top of licensing copyright like software and documentation licenses, it also licenses patents. This “Strongly Reciprocal” variant applies virally, and if a CERN-OHL-S-2.0 file is used in a project then the full project must be released under the CERN-OHL-S-2.0 (or a compatible license). +description: The CERN OHL was drafted with hardware in mind. On top of licensing copyright like software and documentation licenses, it also licenses patents. This “Strongly Reciprocal” variant applies to a complete design, and if a CERN-OHL-S-2.0 file is used in a project then the full project must be released under the CERN-OHL-S-2.0 (or a compatible license). how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. From 788c281d2fcccd7aa65e272568c1abfb0166aa9d Mon Sep 17 00:00:00 2001 From: j-sp Date: Fri, 10 Jun 2022 23:02:17 +0200 Subject: [PATCH 11/36] Update cern-ohl-s-2.0.txt Clarify usage guidelines for S variant of CERN OHL v2 --- _licenses/cern-ohl-s-2.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/cern-ohl-s-2.0.txt b/_licenses/cern-ohl-s-2.0.txt index 2acd112..0bb721d 100644 --- a/_licenses/cern-ohl-s-2.0.txt +++ b/_licenses/cern-ohl-s-2.0.txt @@ -7,7 +7,7 @@ description: The CERN OHL was drafted with hardware in mind. On top of licensin how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. -note: CERN recommends adding a license header and copyright notice to the README and source files. CERN provides a User's Guide containing a recommended license header. +note: CERN recommends adding the following information in the source files: copyright and license notice, a disclaimer of warranties and a source location. You can also include the source location in a part of the design which will be visible in the end product. See the User's Guide for example notices and further explanation. using: USB Armory: https://github.com/f-secure-foundry/usbarmory/blob/master/hardware/mark-two/LICENSE From f1e3b5da45b99efb95b2cae0a44c31858585b5fd Mon Sep 17 00:00:00 2001 From: j-sp Date: Fri, 10 Jun 2022 23:05:05 +0200 Subject: [PATCH 12/36] Update cern-ohl-w-2.0.txt Clarify usage guidelines for W variant of CERN OHL v2 --- _licenses/cern-ohl-w-2.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/cern-ohl-w-2.0.txt b/_licenses/cern-ohl-w-2.0.txt index 45f5bb7..f9caee4 100644 --- a/_licenses/cern-ohl-w-2.0.txt +++ b/_licenses/cern-ohl-w-2.0.txt @@ -7,7 +7,7 @@ description: The CERN OHL was drafted with hardware in mind. On top of licensin how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. -note: CERN recommends adding a license header and copyright notice to the README and source files. CERN provides a User's Guide containing a recommended license header. +note: CERN recommends adding the following information in the source files: copyright and license notice, a disclaimer of warranties and a source location. You can also include the source location in a part of the design which will be visible in the end product. See the User's Guide for example notices and further explanation. using: Simple PCIe FMC carrier: https://ohwr.org/project/spec/blob/master/LICENSES/CERN-OHL-W-2.0.txt From a38f57220f362ba187b5f4cd13c4201268c7e1bb Mon Sep 17 00:00:00 2001 From: Javier Serrano Date: Sun, 12 Jun 2022 09:38:19 +0200 Subject: [PATCH 13/36] Shorten note field contents for CERN OHL v2 licenses --- _licenses/cern-ohl-p-2.0.txt | 2 +- _licenses/cern-ohl-s-2.0.txt | 2 +- _licenses/cern-ohl-w-2.0.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_licenses/cern-ohl-p-2.0.txt b/_licenses/cern-ohl-p-2.0.txt index 5766377..014da0b 100644 --- a/_licenses/cern-ohl-p-2.0.txt +++ b/_licenses/cern-ohl-p-2.0.txt @@ -7,7 +7,7 @@ description: The CERN OHL was drafted with hardware in mind. On top of licensin how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. -note: CERN recommends adding the following information in the source files: copyright and license notice, a disclaimer of warranties and a source location. You can also include the source location in a part of the design which will be visible in the end product. See the User's Guide for example notices and further explanation. +note: CERN recommends adding the following information in the source files: copyright and license notice, a disclaimer of warranties and a source location. You can also include the source location in a part of the design which will be visible in the end product. using: tedium: https://github.com/jboone/tedium/blob/master/LICENSE-CERN-OHL-P-v2 diff --git a/_licenses/cern-ohl-s-2.0.txt b/_licenses/cern-ohl-s-2.0.txt index 0bb721d..c346e06 100644 --- a/_licenses/cern-ohl-s-2.0.txt +++ b/_licenses/cern-ohl-s-2.0.txt @@ -7,7 +7,7 @@ description: The CERN OHL was drafted with hardware in mind. On top of licensin how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. -note: CERN recommends adding the following information in the source files: copyright and license notice, a disclaimer of warranties and a source location. You can also include the source location in a part of the design which will be visible in the end product. See the User's Guide for example notices and further explanation. +note: CERN recommends adding the following information in the source files: copyright and license notice, a disclaimer of warranties and a source location. You can also include the source location in a part of the design which will be visible in the end product. using: USB Armory: https://github.com/f-secure-foundry/usbarmory/blob/master/hardware/mark-two/LICENSE diff --git a/_licenses/cern-ohl-w-2.0.txt b/_licenses/cern-ohl-w-2.0.txt index f9caee4..caa1893 100644 --- a/_licenses/cern-ohl-w-2.0.txt +++ b/_licenses/cern-ohl-w-2.0.txt @@ -7,7 +7,7 @@ description: The CERN OHL was drafted with hardware in mind. On top of licensin how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. -note: CERN recommends adding the following information in the source files: copyright and license notice, a disclaimer of warranties and a source location. You can also include the source location in a part of the design which will be visible in the end product. See the User's Guide for example notices and further explanation. +note: CERN recommends adding the following information in the source files: copyright and license notice, a disclaimer of warranties and a source location. You can also include the source location in a part of the design which will be visible in the end product. using: Simple PCIe FMC carrier: https://ohwr.org/project/spec/blob/master/LICENSES/CERN-OHL-W-2.0.txt From 5065c967dc7779c6198ecfcee2509309bf6d8050 Mon Sep 17 00:00:00 2001 From: Julian Stirling Date: Sun, 12 Jun 2022 09:18:42 +0100 Subject: [PATCH 14/36] update CERN-OHL-S examples --- _licenses/cern-ohl-s-2.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/cern-ohl-s-2.0.txt b/_licenses/cern-ohl-s-2.0.txt index c346e06..a8c97f8 100644 --- a/_licenses/cern-ohl-s-2.0.txt +++ b/_licenses/cern-ohl-s-2.0.txt @@ -12,7 +12,7 @@ note: CERN recommends adding the following information in the source files: copyright and license notice, a disclaimer of warranties and a source location. You can also include the source location in a part of the design which will be visible in the end product. +note: + CERN recommends adding the following information in the source files: copyright and license notice, a disclaimer of warranties and a source location. You can also include the source location in a part of the design which will be visible in the end product. using: tedium: https://github.com/jboone/tedium/blob/master/LICENSE-CERN-OHL-P-v2 diff --git a/_licenses/cern-ohl-s-2.0.txt b/_licenses/cern-ohl-s-2.0.txt index a8c97f8..8a99e9c 100644 --- a/_licenses/cern-ohl-s-2.0.txt +++ b/_licenses/cern-ohl-s-2.0.txt @@ -3,11 +3,12 @@ title: CERN Open Hardware Licence Version 2 - Strongly Reciprocal spdx-id: CERN-OHL-S-2.0 nickname: CERN OHL v2 Strongly Reciprocal -description: The CERN OHL was drafted with hardware in mind. On top of licensing copyright like software and documentation licenses, it also licenses patents. This “Strongly Reciprocal” variant applies to a complete design, and if a CERN-OHL-S-2.0 file is used in a project then the full project must be released under the CERN-OHL-S-2.0 (or a compatible license). +description: The CERN OHL was drafted with hardware in mind. On top of licensing copyright like software and documentation licenses, it also licenses patents. This “Strongly Reciprocal” variant applies to a complete design, so if a CERN-OHL-S-2.0 file is used in a project then the full project must be released under the CERN-OHL-S-2.0 (or a compatible license). how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. -note: CERN recommends adding the following information in the source files: copyright and license notice, a disclaimer of warranties and a source location. You can also include the source location in a part of the design which will be visible in the end product. +note: + CERN recommends adding the following information in the source files: copyright and license notice, a disclaimer of warranties and a source location. You can also include the source location in a part of the design which will be visible in the end product. using: USB Armory: https://github.com/f-secure-foundry/usbarmory/blob/master/hardware/mark-two/LICENSE diff --git a/_licenses/cern-ohl-w-2.0.txt b/_licenses/cern-ohl-w-2.0.txt index caa1893..9683582 100644 --- a/_licenses/cern-ohl-w-2.0.txt +++ b/_licenses/cern-ohl-w-2.0.txt @@ -7,7 +7,8 @@ description: The CERN OHL was drafted with hardware in mind. On top of licensin how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. -note: CERN recommends adding the following information in the source files: copyright and license notice, a disclaimer of warranties and a source location. You can also include the source location in a part of the design which will be visible in the end product. +note: + CERN recommends adding the following information in the source files: copyright and license notice, a disclaimer of warranties and a source location. You can also include the source location in a part of the design which will be visible in the end product. using: Simple PCIe FMC carrier: https://ohwr.org/project/spec/blob/master/LICENSES/CERN-OHL-W-2.0.txt From 86d1a77510def87bc5bbcb7421a61bd626e52aea Mon Sep 17 00:00:00 2001 From: Julian Stirling Date: Sun, 12 Jun 2022 20:01:33 +0100 Subject: [PATCH 16/36] CERN-OHL-S Fix another YAML error --- _licenses/cern-ohl-s-2.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/cern-ohl-s-2.0.txt b/_licenses/cern-ohl-s-2.0.txt index 8a99e9c..e639527 100644 --- a/_licenses/cern-ohl-s-2.0.txt +++ b/_licenses/cern-ohl-s-2.0.txt @@ -13,7 +13,7 @@ note: using: USB Armory: https://github.com/f-secure-foundry/usbarmory/blob/master/hardware/mark-two/LICENSE waffling60: https://github.com/4pplet/waffling60/blob/master/LICENCE.md - Passport Electronics https://github.com/Foundation-Devices/passport-electronics/blob/master/LICENSE.txt + Passport Electronics: https://github.com/Foundation-Devices/passport-electronics/blob/master/LICENSE.txt permissions: - commercial-use From 44b121a807d72f0153de39e973b45cb4dfd32600 Mon Sep 17 00:00:00 2001 From: Julian Stirling Date: Sun, 12 Jun 2022 22:41:32 +0100 Subject: [PATCH 17/36] Tweak using for CERN-OHL-P --- _licenses/cern-ohl-p-2.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/cern-ohl-p-2.0.txt b/_licenses/cern-ohl-p-2.0.txt index 2b4cb2a..96e1ba3 100644 --- a/_licenses/cern-ohl-p-2.0.txt +++ b/_licenses/cern-ohl-p-2.0.txt @@ -13,7 +13,7 @@ note: using: tedium: https://github.com/jboone/tedium/blob/master/LICENSE-CERN-OHL-P-v2 LEDEAF: https://github.com/adamgreig/ledeaf/blob/master/LICENSE_CERN_OHL_P_v2.txt - Open source controller board for ventilators: https://github.com/CV19CO/open_controller_for_ventilator/master/LICENSE + Open source controller board for ventilators: https://github.com/CV19CO/open_controller_for_ventilator/blob/master/LICENSE permissions: - commercial-use From 15237620db27094016ad377212e1e30269b9b07c Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sun, 12 Jun 2022 16:56:51 -0700 Subject: [PATCH 18/36] don't test help.github.com links They work, unclear why failing in CI --- Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index 45c207c..c1bd28d 100644 --- a/Rakefile +++ b/Rakefile @@ -17,7 +17,7 @@ task :test do enforce_https: true, validation: { ignore_script_embeds: true }, url_swap: { %r{https://choosealicense.com} => '' }, - url_ignore: [%r{https://github.com/github/choosealicense.com/edit/gh-pages/_licenses/}], + url_ignore: [%r{https://github.com/github/choosealicense.com/edit/gh-pages/_licenses/}, %r{https://help.github.com}], hydra: { max_concurrency: 10 }, check_img_http: true).run end From 65842b6f43f0411a74329cfd2568cbae695c585c Mon Sep 17 00:00:00 2001 From: Zachary Crespin Date: Thu, 16 Jun 2022 17:11:53 -0700 Subject: [PATCH 19/36] make the text visible on yellow :target background The white text was not visible on the yellow :target background so I made it darker. (this is only a problem with dark mode) --- assets/css/application.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/css/application.scss b/assets/css/application.scss index ed8ca00..1e7a031 100644 --- a/assets/css/application.scss +++ b/assets/css/application.scss @@ -108,6 +108,7 @@ strong { :target { background-color: yellow; + color: #444 !important; } .container { From c6f07cb8cc9c19dcbb1434f9ad585b18d1b0e33f Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 28 Jun 2022 07:29:43 -0700 Subject: [PATCH 20/36] Update Apache-2.0 "how" ASF not AF; link to relevant FAQ entry Inspired by #905 sort of --- _licenses/apache-2.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/apache-2.0.txt b/_licenses/apache-2.0.txt index 74eabb4..88bb06a 100644 --- a/_licenses/apache-2.0.txt +++ b/_licenses/apache-2.0.txt @@ -9,7 +9,7 @@ description: A permissive license whose main conditions require preservation of how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. -note: The Apache Foundation recommends taking the additional step of adding a boilerplate notice to the header of each source file. You can find the notice in the appendix at the very end of the license text. +note: The Apache Sofrware Foundation [recommends](https://apache.org/foundation/license-faq.html#Apply-My-Software) taking the additional step of adding a boilerplate notice to the header of each source file. You can find the notice in the appendix at the very end of the license text. using: Kubernetes: https://github.com/kubernetes/kubernetes/blob/master/LICENSE From cba6a99283b00b5348a121bb1f44fff09912f40b Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 28 Jun 2022 07:31:47 -0700 Subject: [PATCH 21/36] spel! --- _licenses/apache-2.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/apache-2.0.txt b/_licenses/apache-2.0.txt index 88bb06a..647ce4c 100644 --- a/_licenses/apache-2.0.txt +++ b/_licenses/apache-2.0.txt @@ -9,7 +9,7 @@ description: A permissive license whose main conditions require preservation of how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. -note: The Apache Sofrware Foundation [recommends](https://apache.org/foundation/license-faq.html#Apply-My-Software) taking the additional step of adding a boilerplate notice to the header of each source file. You can find the notice in the appendix at the very end of the license text. +note: The Apache Software Foundation [recommends](https://apache.org/foundation/license-faq.html#Apply-My-Software) taking the additional step of adding a boilerplate notice to the header of each source file. You can find the notice in the appendix at the very end of the license text. using: Kubernetes: https://github.com/kubernetes/kubernetes/blob/master/LICENSE From 2a449d578a8606e26a105a4a0f50cf35af82bffe Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Wed, 6 Jul 2022 17:58:17 -0700 Subject: [PATCH 22/36] same-license--library instead of --file --- _licenses/cern-ohl-w-2.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/cern-ohl-w-2.0.txt b/_licenses/cern-ohl-w-2.0.txt index 9683582..9d6c6ad 100644 --- a/_licenses/cern-ohl-w-2.0.txt +++ b/_licenses/cern-ohl-w-2.0.txt @@ -26,7 +26,7 @@ conditions: - include-copyright - document-changes - disclose-source - - same-license--file + - same-license--library limitations: - liability From d4dbe723db80092e9256caaeba1724665ed8ec51 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Wed, 6 Jul 2022 18:02:09 -0700 Subject: [PATCH 23/36] -w description edit proposed by @j-sp in https://github.com/github/choosealicense.com/pull/1004/files#r915192799 --- _licenses/cern-ohl-w-2.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/cern-ohl-w-2.0.txt b/_licenses/cern-ohl-w-2.0.txt index 9d6c6ad..f9b8082 100644 --- a/_licenses/cern-ohl-w-2.0.txt +++ b/_licenses/cern-ohl-w-2.0.txt @@ -3,7 +3,7 @@ title: CERN Open Hardware Licence Version 2 - Weakly Reciprocal spdx-id: CERN-OHL-W-2.0 nickname: CERN OHL v2 Weakly Reciprocal -description: The CERN OHL was drafted with hardware in mind. On top of licensing copyright like software and documentation licenses, it also licenses patents. This “Weakly Reciprocal” variant applies to individual designs but does not spread to the entire project it is included in. +description: Permissions of this weakly-reciprocal license are conditioned on making available complete sources of licensed works and modifications under the same license. Notices must be preserved. Contributors provide an express grant of patent rights. However, a larger work using the licensed work through interfaces provided by the licensed work may be distributed under different terms and without sources for the larger work. how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. From 51ddb5d8f2a289934462bdb1f23edfa5b8ce65e3 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Wed, 6 Jul 2022 18:03:27 -0700 Subject: [PATCH 24/36] -S description edit proposed by @j-sp in https://github.com/github/choosealicense.com/pull/1004/files#r915184980 --- _licenses/cern-ohl-s-2.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/cern-ohl-s-2.0.txt b/_licenses/cern-ohl-s-2.0.txt index e639527..136fb24 100644 --- a/_licenses/cern-ohl-s-2.0.txt +++ b/_licenses/cern-ohl-s-2.0.txt @@ -3,7 +3,7 @@ title: CERN Open Hardware Licence Version 2 - Strongly Reciprocal spdx-id: CERN-OHL-S-2.0 nickname: CERN OHL v2 Strongly Reciprocal -description: The CERN OHL was drafted with hardware in mind. On top of licensing copyright like software and documentation licenses, it also licenses patents. This “Strongly Reciprocal” variant applies to a complete design, so if a CERN-OHL-S-2.0 file is used in a project then the full project must be released under the CERN-OHL-S-2.0 (or a compatible license). +description: Permissions of this strongly reciprocal license for hardware designs are conditioned on making available complete sources of licensed works and modifications, which include larger works using a licensed work, under the same license. Notices must be preserved. Contributors provide an express grant of patent rights. how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. From 55912b61750fc6d8ab6da2ead282d4c8fc473b7f Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Wed, 6 Jul 2022 18:17:07 -0700 Subject: [PATCH 25/36] P description --- _licenses/cern-ohl-p-2.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/cern-ohl-p-2.0.txt b/_licenses/cern-ohl-p-2.0.txt index 96e1ba3..1fd7dbc 100644 --- a/_licenses/cern-ohl-p-2.0.txt +++ b/_licenses/cern-ohl-p-2.0.txt @@ -3,7 +3,7 @@ title: CERN Open Hardware Licence Version 2 - Permissive spdx-id: CERN-OHL-P-2.0 nickname: CERN OHL v2 Permissive -description: The CERN OHL was drafted with hardware in mind. On top of licensing copyright like software and documentation licenses, it also licenses patents. This “Permissive” variant allows people to take your code, relicense it and use it without any obligation to distribute the sources when they ship a product; however, it does have an attribution requirement. +description: A permissive license for hardware designs, with conditions only requiring preservation of notices. Contributors provide an express grant of patent rights. Licensed works, modifications, and larger works may be distributed under different terms and without sources. how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. From 78c2ee95a408456aedded2533ac4b8416bfb6f21 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 8 Jul 2022 12:09:10 -0700 Subject: [PATCH 26/36] tighten up non-software text --- non-software.md | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/non-software.md b/non-software.md index 7709ca7..bd723a3 100644 --- a/non-software.md +++ b/non-software.md @@ -4,11 +4,11 @@ layout: default permalink: /non-software/ --- -Open source software licenses can be also used for non-software works and are often the best choice, especially when the works in question can be edited and versioned as source (e.g., [open source hardware](https://www.oshwa.org/definition/) designs). [Choose an open source license here.](/licenses/) +Open source software licenses can be also used for non-software works and are often the best choice, especially when the works in question can be edited and versioned as source. [Choose an open source license](/). ### Data, media, etc. -[CC0-1.0](/licenses/cc0-1.0/), [CC-BY-4.0](/licenses/cc-by-4.0/), and [CC-BY-SA-4.0](/licenses/cc-by-sa-4.0/) are [open](https://opendefinition.org) licenses used for non-software material ranging from datasets to videos. Note that CC-BY-4.0 and CC-BY-SA-4.0 should [not be used for software](https://creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software). +[CC0-1.0](/licenses/cc0-1.0/), [CC-BY-4.0](/licenses/cc-by-4.0/), and [CC-BY-SA-4.0](/licenses/cc-by-sa-4.0/) are [open](https://opendefinition.org) licenses used for non-software material ranging from datasets to videos. Note that Creative Commons does [not recommond its licenses be used for software](https://creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software) or hardware. ### Documentation @@ -20,12 +20,8 @@ The [SIL Open Font License 1.1](/licenses/ofl-1.1/) keeps fonts open, allowing t ### Hardware -There are the CERN Open Hardware family of licenses: [CERN-OHL-P-2.0](/licenses/cern-ohl-p-2.0/), the permissive variant ([MIT](/licenses/mit/)-like); [CERN-OHL-W-2.0](/licenses/cern-ohl-w-2.0/), the “weakly reciprocal” variant ([MPL](/licenses/mpl-2.0/)-like), and [CERN-OHL-S-2.0](/licenses/cern-ohl-s-2.0/), the “strongly reciprocal” variant ([GPL](/licenses/gpl-3.0/)-like). The CERN OHL family is also applicable to HDL source code and synthesized bitstreams as would be used in FPGAs. - -[CC-BY-4.0](/licenses/cc-by-4.0/) and [CC-BY-SA-4.0](/licenses/cc-by-sa-4.0/) are also commonly used for hardware; however they do not grant patent rights which can restrict usage of patent-encumbered hardware licensed under them and Creative Commons does not recommend them for hardware. - -If your hardware has accompanying software then be sure to specify a license for the software portion as well as the hardware portion. +Designs for [open source hardware](https://www.oshwa.org/definition/) ranging from furniture to [FGPAs](https://www.oshwa.org/best-practices-for-sharing-fpga-designs-2/) are covered by CERN Open Hardware licenses: [CERN-OHL-P-2.0](/licenses/cern-ohl-p-2.0/) (permissive), [CERN-OHL-W-2.0](/licenses/cern-ohl-w-2.0/) (weakly reciprocal), and [CERN-OHL-S-2.0](/licenses/cern-ohl-s-2.0/) (strongly reciprocal). ### Mixed projects -If your project contains a mix of software and other material, you can include multiple licenses, as long as you are explicit about which license applies to each part of the project. See [the license notice for this site](https://github.com/github/choosealicense.com#license) as an example. +If your project contains a mix of different types of material, you can include multiple licenses, as long as you are explicit about which license applies to each part of the project. See [the license notice for this site](https://github.com/github/choosealicense.com#license) as an example. From 4ea525e0a68f5d68637968a8300ab9b3bbc053d8 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 8 Jul 2022 12:31:03 -0700 Subject: [PATCH 27/36] update cncf link again --- community.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community.md b/community.md index 0caae39..ec2e260 100644 --- a/community.md +++ b/community.md @@ -14,7 +14,7 @@ Some communities have strong preferences for particular licenses. If you want to {: .bullets} * [Apache](https://www.apache.org/licenses/) requires [Apache License 2.0](/licenses/apache-2.0/) -* [Cloud Native Computing Foundation](https://github.com/cncf/toc/blob/main/process/project_proposals.md) dictates [Apache License 2.0](/licenses/apache-2.0/) by default +* [Cloud Native Computing Foundation](https://github.com/cncf/foundation/blob/main/charter.md#11-ip-policy) requires [Apache License 2.0](/licenses/apache-2.0/) * [GNU](https://www.gnu.org/licenses/license-recommendations.html) recommends [GNU GPLv3](/licenses/gpl-3.0/) for most programs * [npm packages](https://libraries.io/search?platforms=npm) overwhelmingly use the [MIT](/licenses/mit/) or the very similar [ISC](/licenses/isc) licenses * [OpenBSD](https://www.openbsd.org/policy.html) prefers the [ISC License](/licenses/isc/) From 9e46d36648f8e14abd949f96b2d26102d1376036 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 9 Jul 2022 11:52:56 -0700 Subject: [PATCH 28/36] rm extra space --- _licenses/cern-ohl-p-2.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/cern-ohl-p-2.0.txt b/_licenses/cern-ohl-p-2.0.txt index 1fd7dbc..86d6613 100644 --- a/_licenses/cern-ohl-p-2.0.txt +++ b/_licenses/cern-ohl-p-2.0.txt @@ -3,7 +3,7 @@ title: CERN Open Hardware Licence Version 2 - Permissive spdx-id: CERN-OHL-P-2.0 nickname: CERN OHL v2 Permissive -description: A permissive license for hardware designs, with conditions only requiring preservation of notices. Contributors provide an express grant of patent rights. Licensed works, modifications, and larger works may be distributed under different terms and without sources. +description: A permissive license for hardware designs, with conditions only requiring preservation of notices. Contributors provide an express grant of patent rights. Licensed works, modifications, and larger works may be distributed under different terms and without sources. how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. From 43f355b2819747a1c5d83e0a7debbb0815e73036 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 9 Jul 2022 12:33:02 -0700 Subject: [PATCH 29/36] fix note field for CERN OHL licenses (unintentionally a dictionary value), simplify rendering of field --- _includes/sidebar.html | 4 ++-- _licenses/apache-2.0.txt | 2 +- _licenses/bsl-1.0.txt | 2 +- _licenses/cern-ohl-p-2.0.txt | 3 +-- _licenses/cern-ohl-s-2.0.txt | 3 +-- _licenses/cern-ohl-w-2.0.txt | 3 +-- _licenses/eupl-1.1.txt | 2 +- 7 files changed, 8 insertions(+), 11 deletions(-) diff --git a/_includes/sidebar.html b/_includes/sidebar.html index 8928950..9751d97 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -15,13 +15,13 @@

How to apply this license

- {{ page.how | markdownify | remove: '

' | remove: '

' }} + {{ page.how }}

Optional steps

{% if page.note %}

- {{ page.note | markdownify | remove: '

' | remove: '

' }} + {{ page.note }}

{% endif %} {% assign xgpl = false %} diff --git a/_licenses/apache-2.0.txt b/_licenses/apache-2.0.txt index 647ce4c..9b2c569 100644 --- a/_licenses/apache-2.0.txt +++ b/_licenses/apache-2.0.txt @@ -9,7 +9,7 @@ description: A permissive license whose main conditions require preservation of how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. -note: The Apache Software Foundation [recommends](https://apache.org/foundation/license-faq.html#Apply-My-Software) taking the additional step of adding a boilerplate notice to the header of each source file. You can find the notice in the appendix at the very end of the license text. +note: The Apache Software Foundation recommends taking the additional step of adding a boilerplate notice to the header of each source file. You can find the notice in the appendix at the very end of the license text. using: Kubernetes: https://github.com/kubernetes/kubernetes/blob/master/LICENSE diff --git a/_licenses/bsl-1.0.txt b/_licenses/bsl-1.0.txt index 8b79559..4cdf0f0 100644 --- a/_licenses/bsl-1.0.txt +++ b/_licenses/bsl-1.0.txt @@ -7,7 +7,7 @@ description: A simple permissive license only requiring preservation of copyrigh how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. -note: Boost recommends taking the additional step of adding a boilerplate notice to the top of each file. The boilerplate can be found at the [Boost Software License FAQ](https://www.boost.org/users/license.html#FAQ). +note: Boost recommends taking the additional step of adding a boilerplate notice to the top of each file. The boilerplate can be found at the Boost Software License FAQ. using: Boost: https://github.com/boostorg/boost/blob/master/LICENSE_1_0.txt diff --git a/_licenses/cern-ohl-p-2.0.txt b/_licenses/cern-ohl-p-2.0.txt index 86d6613..2e31afa 100644 --- a/_licenses/cern-ohl-p-2.0.txt +++ b/_licenses/cern-ohl-p-2.0.txt @@ -7,8 +7,7 @@ description: A permissive license for hardware designs, with conditions only req how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. -note: - CERN recommends adding the following information in the source files: copyright and license notice, a disclaimer of warranties and a source location. You can also include the source location in a part of the design which will be visible in the end product. +note: 'CERN recommends adding the following information in the source files: copyright and license notice, a disclaimer of warranties and a source location. You can also include the source location in a part of the design which will be visible in the end product.' using: tedium: https://github.com/jboone/tedium/blob/master/LICENSE-CERN-OHL-P-v2 diff --git a/_licenses/cern-ohl-s-2.0.txt b/_licenses/cern-ohl-s-2.0.txt index 136fb24..b0c2578 100644 --- a/_licenses/cern-ohl-s-2.0.txt +++ b/_licenses/cern-ohl-s-2.0.txt @@ -7,8 +7,7 @@ description: Permissions of this strongly reciprocal license for hardware design how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. -note: - CERN recommends adding the following information in the source files: copyright and license notice, a disclaimer of warranties and a source location. You can also include the source location in a part of the design which will be visible in the end product. +note: 'CERN recommends adding the following information in the source files: copyright and license notice, a disclaimer of warranties and a source location. You can also include the source location in a part of the design which will be visible in the end product.' using: USB Armory: https://github.com/f-secure-foundry/usbarmory/blob/master/hardware/mark-two/LICENSE diff --git a/_licenses/cern-ohl-w-2.0.txt b/_licenses/cern-ohl-w-2.0.txt index f9b8082..f5c0dee 100644 --- a/_licenses/cern-ohl-w-2.0.txt +++ b/_licenses/cern-ohl-w-2.0.txt @@ -7,8 +7,7 @@ description: Permissions of this weakly-reciprocal license are conditioned on ma how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. -note: - CERN recommends adding the following information in the source files: copyright and license notice, a disclaimer of warranties and a source location. You can also include the source location in a part of the design which will be visible in the end product. +note: 'CERN recommends adding the following information in the source files: copyright and license notice, a disclaimer of warranties and a source location. You can also include the source location in a part of the design which will be visible in the end product.' using: Simple PCIe FMC carrier: https://ohwr.org/project/spec/blob/master/LICENSES/CERN-OHL-W-2.0.txt diff --git a/_licenses/eupl-1.1.txt b/_licenses/eupl-1.1.txt index c174eb0..dfb9a28 100644 --- a/_licenses/eupl-1.1.txt +++ b/_licenses/eupl-1.1.txt @@ -7,7 +7,7 @@ description: The “European Union Public Licence” (EUPL) is a copyleft free/o how: Create a text file (typically named COPYING or LICENCE.txt) in the root of your source code and copy the text of the license into the file. -note: The European Commission recommends taking the additional step of adding a [boilerplate notice](https://joinup.ec.europa.eu/sites/default/files/inline-files/EUPL%201_1%20Guidelines%20EN%20Joinup.pdf#page=17) to the top of each file. +note: The European Commission recommends taking the additional step of adding a boilerplate notice to the top of each file. using: From 537ffa46d84bd3fcbe15976fbe5603d0e5ee219a Mon Sep 17 00:00:00 2001 From: Paul <5972492+paulyy-y@users.noreply.github.com> Date: Sun, 17 Jul 2022 08:40:19 -0700 Subject: [PATCH 30/36] Fixes FPGA acronym. --- non-software.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/non-software.md b/non-software.md index bd723a3..9cd9ba0 100644 --- a/non-software.md +++ b/non-software.md @@ -20,7 +20,7 @@ The [SIL Open Font License 1.1](/licenses/ofl-1.1/) keeps fonts open, allowing t ### Hardware -Designs for [open source hardware](https://www.oshwa.org/definition/) ranging from furniture to [FGPAs](https://www.oshwa.org/best-practices-for-sharing-fpga-designs-2/) are covered by CERN Open Hardware licenses: [CERN-OHL-P-2.0](/licenses/cern-ohl-p-2.0/) (permissive), [CERN-OHL-W-2.0](/licenses/cern-ohl-w-2.0/) (weakly reciprocal), and [CERN-OHL-S-2.0](/licenses/cern-ohl-s-2.0/) (strongly reciprocal). +Designs for [open source hardware](https://www.oshwa.org/definition/) ranging from furniture to [FPGAs](https://www.oshwa.org/best-practices-for-sharing-fpga-designs-2/) are covered by CERN Open Hardware licenses: [CERN-OHL-P-2.0](/licenses/cern-ohl-p-2.0/) (permissive), [CERN-OHL-W-2.0](/licenses/cern-ohl-w-2.0/) (weakly reciprocal), and [CERN-OHL-S-2.0](/licenses/cern-ohl-s-2.0/) (strongly reciprocal). ### Mixed projects From cf8f0d79e51d90fb2815108b02272935bbefd8a6 Mon Sep 17 00:00:00 2001 From: Robert Newbould Date: Tue, 19 Jul 2022 14:22:25 +0100 Subject: [PATCH 31/36] Fix typo in non-software licenses page Corrects `recommond` to `recommend` --- non-software.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/non-software.md b/non-software.md index 9cd9ba0..07a78c1 100644 --- a/non-software.md +++ b/non-software.md @@ -8,7 +8,7 @@ Open source software licenses can be also used for non-software works and are of ### Data, media, etc. -[CC0-1.0](/licenses/cc0-1.0/), [CC-BY-4.0](/licenses/cc-by-4.0/), and [CC-BY-SA-4.0](/licenses/cc-by-sa-4.0/) are [open](https://opendefinition.org) licenses used for non-software material ranging from datasets to videos. Note that Creative Commons does [not recommond its licenses be used for software](https://creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software) or hardware. +[CC0-1.0](/licenses/cc0-1.0/), [CC-BY-4.0](/licenses/cc-by-4.0/), and [CC-BY-SA-4.0](/licenses/cc-by-sa-4.0/) are [open](https://opendefinition.org) licenses used for non-software material ranging from datasets to videos. Note that Creative Commons does [not recommend its licenses be used for software](https://creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software) or hardware. ### Documentation From 3084254b384b7ee09f4a4b1c08cf72d0ba8588a6 Mon Sep 17 00:00:00 2001 From: Aeris One Date: Fri, 19 Aug 2022 21:39:22 +0200 Subject: [PATCH 32/36] add network-use-disclose to CeCILL v2 --- _licenses/cecill-2.1.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/_licenses/cecill-2.1.txt b/_licenses/cecill-2.1.txt index 91b7c8f..0db24f6 100644 --- a/_licenses/cecill-2.1.txt +++ b/_licenses/cecill-2.1.txt @@ -20,6 +20,7 @@ permissions: conditions: - include-copyright + - network-use-disclose - disclose-source - same-license From ce3a1686399a5bf9490a4ee3d4c22d815e1adab0 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 19 Aug 2022 13:14:46 -0700 Subject: [PATCH 33/36] update ruby version to match pages-gem --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5c131f7..3532007 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7.3 + ruby-version: 2.7.4 bundler-cache: true - name: Run tests From d15753589855cd41c36288ae9d3793a94be06235 Mon Sep 17 00:00:00 2001 From: Steve Huguenin-Elie Date: Thu, 25 Aug 2022 10:37:39 +0200 Subject: [PATCH 34/36] Add Grafana as AGPL-3.0 licensor https://grafana.com/blog/2021/04/20/grafana-loki-tempo-relicensing-to-agplv3/ --- _licenses/agpl-3.0.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/_licenses/agpl-3.0.txt b/_licenses/agpl-3.0.txt index 433632c..4e27dcb 100644 --- a/_licenses/agpl-3.0.txt +++ b/_licenses/agpl-3.0.txt @@ -12,6 +12,7 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of note: The Free Software Foundation recommends taking the additional step of adding a boilerplate notice to the top of each file. The boilerplate can be found at the end of the license. using: + Grafana: https://github.com/grafana/grafana/blob/main/LICENSE permissions: - commercial-use From 088a44d9035f38673dbaea2a5a788c4d44e18088 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Thu, 25 Aug 2022 15:24:24 -0700 Subject: [PATCH 35/36] 2 more examples --- _licenses/agpl-3.0.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/_licenses/agpl-3.0.txt b/_licenses/agpl-3.0.txt index 4e27dcb..d671311 100644 --- a/_licenses/agpl-3.0.txt +++ b/_licenses/agpl-3.0.txt @@ -13,6 +13,8 @@ note: The Free Software Foundation recommends taking the additional step of addi using: Grafana: https://github.com/grafana/grafana/blob/main/LICENSE + Mastodon: https://github.com/mastodon/mastodon/blob/main/LICENSE + Nextcloud Server: https://github.com/nextcloud/server/blob/master/COPYING permissions: - commercial-use From cce738fbed89a9be49953b9bee7b83ea15bc5691 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Thu, 25 Aug 2022 15:27:30 -0700 Subject: [PATCH 36/36] remove agpl-3.0 from legacy list with no examples since we're adding 3 --- spec/license_meta_spec.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/spec/license_meta_spec.rb b/spec/license_meta_spec.rb index de6a730..83126f8 100644 --- a/spec/license_meta_spec.rb +++ b/spec/license_meta_spec.rb @@ -24,7 +24,6 @@ describe 'license meta' do it 'using contains 3 examples' do legacy = [ 'afl-3.0', - 'agpl-3.0', 'artistic-2.0', 'bsd-3-clause-clear', 'eupl-1.1',