gh-131261: expat/refresh.sh: Expand list of manual steps (GH-131359)

diff --git a/Misc/sbom.spdx.json b/Misc/sbom.spdx.json
index cac346f8c38eafdd8e0d85a73f582fb75ab75668..617c631c357db2c6659ea3ed3b168609409343b6 100644 (file)
--- a/Misc/sbom.spdx.json
+++ b/Misc/sbom.spdx.json
@@ -127,20 +127,6 @@
       ],
       "fileName": "Modules/expat/nametab.h"
     },
-    {
-      "SPDXID": "SPDXRef-FILE-Modules-expat-refresh.sh",
-      "checksums": [
-        {
-          "algorithm": "SHA1",
-          "checksumValue": "1834a0629524eee116cf84251464fb368423fd73"
-        },
-        {
-          "algorithm": "SHA256",
-          "checksumValue": "a8e123d64c0c43fcc52e70c6573db071c3d007ecdad604fbc3a84beefe2ed3a1"
-        }
-      ],
-      "fileName": "Modules/expat/refresh.sh"
-    },
     {
       "SPDXID": "SPDXRef-FILE-Modules-expat-siphash.h",
       "checksums": [
@@ -1776,11 +1762,6 @@
       "relationshipType": "CONTAINS",
       "spdxElementId": "SPDXRef-PACKAGE-expat"
     },
-    {
-      "relatedSpdxElement": "SPDXRef-FILE-Modules-expat-refresh.sh",
-      "relationshipType": "CONTAINS",
-      "spdxElementId": "SPDXRef-PACKAGE-expat"
-    },
     {
       "relatedSpdxElement": "SPDXRef-FILE-Modules-expat-siphash.h",
       "relationshipType": "CONTAINS",

diff --git a/Modules/expat/refresh.sh b/Modules/expat/refresh.sh
index ca1c1bdfebfefd89f55a497665f72e546d87472c..46e236cbb5542b467507b9f25b89fe9c11c39edd 100755 (executable)
--- a/Modules/expat/refresh.sh
+++ b/Modules/expat/refresh.sh
@@ -54,4 +54,13 @@ rm libexpat.tar.gz
 # Step 3: Add the namespacing include to expat_external.h
 sed -i 's/#define Expat_External_INCLUDED 1/&\n\n\/* Namespace external symbols to allow multiple libexpat version to\n   co-exist. \*\/\n#include "pyexpatns.h"/' expat_external.h
 
-echo "Updated; verify all is okay using git diff and git status."
+echo "
+Updated! next steps:
+- Verify all is okay:
+    git diff
+    git status
+- Regenerate the sbom file
+    make regen-sbom
+- Update warning count in Tools/build/.warningignore_macos
+    (use info from CI if not on a Mac)
+"

diff --git a/Tools/build/generate_sbom.py b/Tools/build/generate_sbom.py
index 5c4a725102d79aafa14469f10513437f050da958..073c26ed13ce0a4c1b5ce78ef478f277ada6441f 100644 (file)
--- a/Tools/build/generate_sbom.py
+++ b/Tools/build/generate_sbom.py
@@ -60,7 +60,7 @@ PACKAGE_TO_FILES = {
         exclude=[
             "Modules/expat/expat_config.h",
             "Modules/expat/pyexpatns.h",
-            "Modules/_hacl/refresh.sh",
+            "Modules/expat/refresh.sh",
         ]
     ),
     "macholib": PackageFiles(