Moved the SPECS/LICENSES-AND-NOTICES folder. (#8618)

microsoft · Mar 29, 2024 · 94c1c31 · 94c1c31
1 parent f3ba55a
commit 94c1c31
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 18 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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/...SES-AND-NOTICES/LICENSE-EXCEPTIONS.PHOTON → ...D-NOTICES/SPECS/LICENSE-EXCEPTIONS.PHOTON b/...SES-AND-NOTICES/LICENSE-EXCEPTIONS.PHOTON → ...D-NOTICES/SPECS/LICENSE-EXCEPTIONS.PHOTON
diff --git a/SPECS/LICENSES-AND-NOTICES/LICENSE-LGPLv2.md → LICENSES-AND-NOTICES/SPECS/LICENSE-LGPLv2.md b/SPECS/LICENSES-AND-NOTICES/LICENSE-LGPLv2.md → LICENSES-AND-NOTICES/SPECS/LICENSE-LGPLv2.md
diff --git a/SPECS/LICENSES-AND-NOTICES/LICENSE-PHOTON.md → LICENSES-AND-NOTICES/SPECS/LICENSE-PHOTON.md b/SPECS/LICENSES-AND-NOTICES/LICENSE-PHOTON.md → LICENSES-AND-NOTICES/SPECS/LICENSE-PHOTON.md
diff --git a/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md → LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md b/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md → LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md
diff --git a/SPECS/LICENSES-AND-NOTICES/NOTICE.APACHE2 → LICENSES-AND-NOTICES/SPECS/NOTICE.APACHE2 b/SPECS/LICENSES-AND-NOTICES/NOTICE.APACHE2 → LICENSES-AND-NOTICES/SPECS/NOTICE.APACHE2
diff --git a/...S/LICENSES-AND-NOTICES/data/licenses.json → ...NSES-AND-NOTICES/SPECS/data/licenses.json b/...S/LICENSES-AND-NOTICES/data/licenses.json → ...NSES-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
@@ -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
@@ -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."