diff options
| author | Ujjwal Sharma <usharma1998@gmail.com> | 2018-12-28 12:51:15 +0530 |
|---|---|---|
| committer | Rich Trott <rtrott@gmail.com> | 2018-12-30 19:43:35 -0800 |
| commit | 48a88c824f31cfa5398caba892d2778fad93a5a5 (patch) | |
| tree | a34a4b3ceb9cdc6e6b5f718b06816f6aa74effe0 | |
| parent | 2f981cdd5824845aeaf0abb0412b64bb31f49225 (diff) | |
| download | node-new-48a88c824f31cfa5398caba892d2778fad93a5a5.tar.gz | |
doc: include license for src/large_pages in LICENSE
Include License for src/large_pages (MIT licensed by Intel), to the main
LICENSE file and make required changes to the tools/license-builder.sh
script.
Fixes: https://github.com/nodejs/node/issues/25238
PR-URL: https://github.com/nodejs/node/pull/25246
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
| -rw-r--r-- | LICENSE | 23 | ||||
| -rwxr-xr-x | tools/license-builder.sh | 3 |
2 files changed, 26 insertions, 0 deletions
@@ -1325,3 +1325,26 @@ The externally maintained libraries used by Node.js are: FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. """ + +- large_pages, located at src/large_pages, is licensed as follows: + """ + Copyright (C) 2018 Intel Corporation + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom + the Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES + OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE + OR OTHER DEALINGS IN THE SOFTWARE. + """ diff --git a/tools/license-builder.sh b/tools/license-builder.sh index 58a3b5a209..597491bee3 100755 --- a/tools/license-builder.sh +++ b/tools/license-builder.sh @@ -89,4 +89,7 @@ addlicense "nghttp2" "deps/nghttp2" "$(cat ${rootdir}/deps/nghttp2/COPYING)" # node-inspect addlicense "node-inspect" "deps/node-inspect" "$(cat ${rootdir}/deps/node-inspect/LICENSE)" +# large_pages +addlicense "large_pages" "src/large_pages" "$(sed -e '/SPDX-License-Identifier/,$d' -e 's/^\/\///' ${rootdir}/src/large_pages/node_large_page.h)" + mv $tmplicense $licensefile |