Difference between revisions of "TSC/Relicensing Procedure"

From fd.io
< TSC
Jump to: navigation, search
(License expression update also for other occurrences.)
 
(3 intermediate revisions by 2 users not shown)
Line 8: Line 8:
 
# Each relicense file must be pushed in a changeset containing just relicense  file(s) (and obviously DCOed, as we require that of all commits).
 
# Each relicense file must be pushed in a changeset containing just relicense  file(s) (and obviously DCOed, as we require that of all commits).
 
# Individual relicense files must be pushed by the individual authorizing relicensing.
 
# Individual relicense files must be pushed by the individual authorizing relicensing.
# Corporate relicense files must be pushed by an authorized employee of the corp
+
# Corporate relicense files must be pushed by an authorized employee of the corporation.
 
#Individual relicense file template:
 
#Individual relicense file template:
 
#: ******************
 
#: ******************
#: I, ${legal name} hereby sign-off-by all of my past contributions which have been moved to the subdirectory ${subdir containing scapy affected files}  subject to the Developer Certificate of Origin (DCO), Version 1.1 and relicense them under GPLv2.
+
#: I, ${legal name} hereby sign-off-by all of my past contributions which have been moved to the subdirectory ${subdir containing scapy affected files}  subject to the Developer Certificate of Origin (DCO), Version 1.1 and relicense them under Apache-2.0 OR GPL-2.0-or-later.
 
#:  
 
#:  
 
#: In the past, I have contributed using emails: ${list of emails}
 
#: In the past, I have contributed using emails: ${list of emails}
Line 17: Line 17:
 
#  Corporate relicense file template:
 
#  Corporate relicense file template:
 
#: ******************
 
#: ******************
#: I, ${legal name} on behalf of ${corp} hereby sign-off-by all past contributions of ${corp} which have been moved to the subdirectory ${subdir containing scapy affected files}  subject to the Developer Certificate of Origin (DCO), Version 1.1 and relicense them under GPLv2.
+
#: I, ${legal name} on behalf of ${corp} hereby sign-off-by all past contributions of ${corp} which have been moved to the subdirectory ${subdir containing scapy affected files}  subject to the Developer Certificate of Origin (DCO), Version 1.1 and relicense them under Apache-2.0 OR GPL-2.0-or-later.
 
#:  
 
#:  
 
#: ${corp} has contributed via the following individual's emails: ${list of emails}
 
#: ${corp} has contributed via the following individual's emails: ${list of emails}
Line 23: Line 23:
  
 
= VPP Procedure (Proposal) =
 
= VPP Procedure (Proposal) =
Due to the logical organization of the python test scripts in the vpp repo, putting them all in a single directory is not a reasonable solution.  Falling back to the fundamental requirements that we have clarity about which python test scripts are relicensed as GPL due to scapy use and confidence we have gotten it right, a different approach can be adopted.
+
Due to the pervasive use in python test scripts of framework.py, which links scapy, the decision has been taken to relicence all python test scripts in the VPP repository to Apache-2.0 OR GPL-2.0-or-later.
 
+
Currently, for purposes of python test scripts in the vpp repo, various make rules install their own copy of scapy in their own directory.  This opens the possibility of patching it.
+
A patch has already been developed that patches __init__.py for scapy such that when it is imported directly or indirectly, it can gather information about the importing file, and all intermediate imported files between that file and scapy.  This allows a patch to be developed that:
+
# Check for GPL license file of the importing file, returning an error with a clear message as to how to remediate in the event it is not present.
+
# If the GPL license header is present, check for an entry in a gpl_index.txt file in the relicense/ directory for the importing file.  Entries should be a single line of the form:
+
<pre>
+
${importing file} -> ${imported file} -> ... -> scapy.py
+
</pre>
+
allowing for both the identification of all GPL licensed files, but also demonstration of how they come to be importing scapy.py.  If the file has a GPL header and is not listed in the index, an entry can be automatically added by the import process.
+
 
+
In addition, CI can check to see if the gpl_index.txt file has been changed by its running of the test scripts to differ from the gerrit (ie, it needs to be updated) and fail with a clear error about how to remediate.
+
 
+
Once this mechanism is in place, relicense certification can proceed as in the CSIT case.
+

Latest revision as of 18:35, 23 July 2020

Intro

The use of Scapy in python-based test code (not actual data plane code) necessitates relicensing some of that test code. In order to ensure an orderly and trustworthy relicensing process, the procedure is outlined here:

CSIT Procedure

  1. The gpl licensed subdir will contain a subdirectory 'relicense/'
  2. That subdirectory will contain a set of relicense assertion files, one per 'entity' where 'entity' is either a corporation or individual. If corporate, naming should be some appropriate lower case version of the corp name 'cisco' 'intel' if individual, it should be some appropriate lowercase identifier like ${user part of email address used to commit} or ${github id}. Example: relicense/edwarnicke (github id) or relicense/hagbard (user part of email address)
  3. Each relicense file must be pushed in a changeset containing just relicense file(s) (and obviously DCOed, as we require that of all commits).
  4. Individual relicense files must be pushed by the individual authorizing relicensing.
  5. Corporate relicense files must be pushed by an authorized employee of the corporation.
  6. Individual relicense file template:
    ******************
    I, ${legal name} hereby sign-off-by all of my past contributions which have been moved to the subdirectory ${subdir containing scapy affected files} subject to the Developer Certificate of Origin (DCO), Version 1.1 and relicense them under Apache-2.0 OR GPL-2.0-or-later.
    In the past, I have contributed using emails: ${list of emails}
    ******************
  7. Corporate relicense file template:
    ******************
    I, ${legal name} on behalf of ${corp} hereby sign-off-by all past contributions of ${corp} which have been moved to the subdirectory ${subdir containing scapy affected files} subject to the Developer Certificate of Origin (DCO), Version 1.1 and relicense them under Apache-2.0 OR GPL-2.0-or-later.
    ${corp} has contributed via the following individual's emails: ${list of emails}
    ******************

VPP Procedure (Proposal)

Due to the pervasive use in python test scripts of framework.py, which links scapy, the decision has been taken to relicence all python test scripts in the VPP repository to Apache-2.0 OR GPL-2.0-or-later.