From 94c1c3160216bbd56cba72d0f547a5bca6a8c8c0 Mon Sep 17 00:00:00 2001 From: Pawel Winogrodzki Date: Fri, 29 Mar 2024 16:01:42 -0700 Subject: [PATCH] Moved the `SPECS/LICENSES-AND-NOTICES` folder. (#8618) --- .gitattributes | 4 ++-- .github/pull_request_template.md | 2 +- .github/workflows/check-license-map.yml | 4 ++-- CONTRIBUTING.md | 8 ++++---- LICENSES-AND-NOTICES/LICENSES-MAP.md | 11 ++++++----- .../SPECS}/LICENSE-EXCEPTIONS.PHOTON | 0 .../SPECS}/LICENSE-LGPLv2.md | 0 .../SPECS}/LICENSE-PHOTON.md | 0 .../SPECS}/LICENSES-MAP.md | 0 .../SPECS}/NOTICE.APACHE2 | 0 .../SPECS}/data/licenses.json | 0 .../livepatching/generate_livepatch-signed_spec.sh | 4 ++-- .../scripts/livepatching/generate_livepatch_spec.sh | 4 ++-- 13 files changed, 19 insertions(+), 18 deletions(-) rename {SPECS/LICENSES-AND-NOTICES => LICENSES-AND-NOTICES/SPECS}/LICENSE-EXCEPTIONS.PHOTON (100%) rename {SPECS/LICENSES-AND-NOTICES => LICENSES-AND-NOTICES/SPECS}/LICENSE-LGPLv2.md (100%) rename {SPECS/LICENSES-AND-NOTICES => LICENSES-AND-NOTICES/SPECS}/LICENSE-PHOTON.md (100%) rename {SPECS/LICENSES-AND-NOTICES => LICENSES-AND-NOTICES/SPECS}/LICENSES-MAP.md (100%) rename {SPECS/LICENSES-AND-NOTICES => LICENSES-AND-NOTICES/SPECS}/NOTICE.APACHE2 (100%) rename {SPECS/LICENSES-AND-NOTICES => LICENSES-AND-NOTICES/SPECS}/data/licenses.json (100%) diff --git a/.gitattributes b/.gitattributes index 252eb662c9b..9f3744e6974 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,5 +3,5 @@ *.spec linguist-detectable linguist-language=RPM-Spec toolkit/docs/** linguist-documentation LICENSES-AND-NOTICES/** linguist-documentation -SPECS/LICENSES-AND-NOTICES/** linguist-documentation -SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md linguist-generated +LICENSES-AND-NOTICES/SPECS/** linguist-documentation +LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md linguist-generated diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index d6314f7c076..ce3548681f0 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -13,7 +13,7 @@ Feel free to delete sections of the template which do not apply to your PR, or a - [ ] Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files - [ ] All package sources are available - [ ] cgmanifest files are up-to-date and sorted (`./cgmanifest.json`, `./toolkit/scripts/toolchain/cgmanifest.json`, `.github/workflows/cgmanifest.json`) -- [ ] LICENSE-MAP files are up-to-date (`./SPECS/LICENSES-AND-NOTICES/data/licenses.json`, `./SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md`, `./SPECS/LICENSES-AND-NOTICES/LICENSE-EXCEPTIONS.PHOTON`) +- [ ] LICENSE-MAP files are up-to-date (`./LICENSES-AND-NOTICES/SPECS/data/licenses.json`, `./LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md`, `./LICENSES-AND-NOTICES/SPECS/LICENSE-EXCEPTIONS.PHOTON`) - [ ] All source files have up-to-date hashes in the `*.signatures.json` files - [ ] `sudo make go-tidy-all` and `sudo make go-test-coverage` pass - [ ] Documentation has been updated to match any changes to the build system diff --git a/.github/workflows/check-license-map.yml b/.github/workflows/check-license-map.yml index ad354cbbb29..4b5332d9c77 100644 --- a/.github/workflows/check-license-map.yml +++ b/.github/workflows/check-license-map.yml @@ -32,8 +32,8 @@ jobs: - name: Run license map checking script run: | python3 ./toolkit/scripts/license_map.py \ - ./SPECS/LICENSES-AND-NOTICES/data/licenses.json \ - ./SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md \ + ./LICENSES-AND-NOTICES/SPECS/data/licenses.json \ + ./LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md \ ./SPECS \ ./SPECS-EXTENDED \ ./SPECS-SIGNED diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 65602859280..82919472972 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -171,15 +171,15 @@ When creating your PR, please ensure the following: ``` * LICENSE-MAP files are up-to-date. These files indicate which licenses are being used by Azure Linux's packages and where the package may be derived from. The license files include the following files: - * ./SPECS/LICENSES-AND-NOTICES/data/licenses.json - * ./SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md + * ./LICENSES-AND-NOTICES/SPECS/data/licenses.json + * ./LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md This can be checked by running ```bash python3 ./toolkit/scripts/license_map.py \ - ./SPECS/LICENSES-AND-NOTICES/data/licenses.json \ - ./SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md \ + ./LICENSES-AND-NOTICES/SPECS/data/licenses.json \ + ./LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md \ ./SPECS \ ./SPECS-EXTENDED \ ./SPECS-SIGNED diff --git a/LICENSES-AND-NOTICES/LICENSES-MAP.md b/LICENSES-AND-NOTICES/LICENSES-MAP.md index 536af77e1e2..0bd417a1aa3 100644 --- a/LICENSES-AND-NOTICES/LICENSES-MAP.md +++ b/LICENSES-AND-NOTICES/LICENSES-MAP.md @@ -1,6 +1,7 @@ -| Folder | Governing License(s) | Description | -|---------------|---------------------------|-------------------------------------| -|/ | MIT | Except where noted otherwise, all source contained within this repository is governed by the [MIT License](LICENSE.md) | -|/SPECS | Apache 2.0, MIT, et al | Refer to [LICENSE-MAP](/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md) | -|/SPECS-SIGNED | Apache 2.0, MIT, et al | Refer to [LICENSE-MAP](/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md) | +| Folder | Governing License(s) | Description | +|-----------------|---------------------------|-------------------------------------| +|/ | MIT | Except where noted otherwise, all source contained within this repository is governed by the [MIT License](LICENSE.md) | +|/SPECS | Apache 2.0, MIT, et al | Refer to [LICENSE-MAP](/LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md) | +|/SPECS-EXTENDED | Apache 2.0, MIT, et al | Refer to [LICENSE-MAP](/LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md) | +|/SPECS-SIGNED | Apache 2.0, MIT, et al | Refer to [LICENSE-MAP](/LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md) | diff --git a/SPECS/LICENSES-AND-NOTICES/LICENSE-EXCEPTIONS.PHOTON b/LICENSES-AND-NOTICES/SPECS/LICENSE-EXCEPTIONS.PHOTON similarity index 100% rename from SPECS/LICENSES-AND-NOTICES/LICENSE-EXCEPTIONS.PHOTON rename to LICENSES-AND-NOTICES/SPECS/LICENSE-EXCEPTIONS.PHOTON diff --git a/SPECS/LICENSES-AND-NOTICES/LICENSE-LGPLv2.md b/LICENSES-AND-NOTICES/SPECS/LICENSE-LGPLv2.md similarity index 100% rename from SPECS/LICENSES-AND-NOTICES/LICENSE-LGPLv2.md rename to LICENSES-AND-NOTICES/SPECS/LICENSE-LGPLv2.md diff --git a/SPECS/LICENSES-AND-NOTICES/LICENSE-PHOTON.md b/LICENSES-AND-NOTICES/SPECS/LICENSE-PHOTON.md similarity index 100% rename from SPECS/LICENSES-AND-NOTICES/LICENSE-PHOTON.md rename to LICENSES-AND-NOTICES/SPECS/LICENSE-PHOTON.md diff --git a/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md b/LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md similarity index 100% rename from SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md rename to LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md diff --git a/SPECS/LICENSES-AND-NOTICES/NOTICE.APACHE2 b/LICENSES-AND-NOTICES/SPECS/NOTICE.APACHE2 similarity index 100% rename from SPECS/LICENSES-AND-NOTICES/NOTICE.APACHE2 rename to LICENSES-AND-NOTICES/SPECS/NOTICE.APACHE2 diff --git a/SPECS/LICENSES-AND-NOTICES/data/licenses.json b/LICENSES-AND-NOTICES/SPECS/data/licenses.json similarity index 100% rename from SPECS/LICENSES-AND-NOTICES/data/licenses.json rename to LICENSES-AND-NOTICES/SPECS/data/licenses.json diff --git a/toolkit/scripts/livepatching/generate_livepatch-signed_spec.sh b/toolkit/scripts/livepatching/generate_livepatch-signed_spec.sh index e92aa5f2617..7888b3783ab 100755 --- a/toolkit/scripts/livepatching/generate_livepatch-signed_spec.sh +++ b/toolkit/scripts/livepatching/generate_livepatch-signed_spec.sh @@ -54,6 +54,6 @@ create_new_file_from_template "$SCRIPT_FOLDER/template_livepatch-signed.spec" "$ echo "Updating licensing info." license_map.py --no_check --update \ - SPECS/LICENSES-AND-NOTICES/data/licenses.json \ - SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md \ + LICENSES-AND-NOTICES/SPECS/data/licenses.json \ + LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md \ "$LIVEPATCH_SIGNED_SPEC_PATH" diff --git a/toolkit/scripts/livepatching/generate_livepatch_spec.sh b/toolkit/scripts/livepatching/generate_livepatch_spec.sh index 01b7a26663a..33d55c45963 100755 --- a/toolkit/scripts/livepatching/generate_livepatch_spec.sh +++ b/toolkit/scripts/livepatching/generate_livepatch_spec.sh @@ -103,8 +103,8 @@ generate_livepatch_spec echo "Updating licensing info." license_map.py --no_check --update \ - SPECS/LICENSES-AND-NOTICES/data/licenses.json \ - SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md \ + LICENSES-AND-NOTICES/SPECS/data/licenses.json \ + LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md \ "$LIVEPATCH_SPEC_PATH" echo "Updating the cgmanifest.json."