Modified the gf180mcu Makefile(.in) to work with the update from
Christoph Weiser which changes the SPICE model names from the
unusual extensions ".ngspice" and ".xyce" to just ".spice".  Because
the original names may be used in users' testbench simulations,
open_pdks creates symbolic links for the original names.

Also:  The references have been updated for the source repository
change mentioned above as well as others in the GF and sky130
repositories.

gf180mcu/Makefile.in

diff --git a/gf180mcu/Makefile.in b/gf180mcu/Makefile.in
index 2757966..e623470 100644
--- a/gf180mcu/Makefile.in
+++ b/gf180mcu/Makefile.in
@@ -994,8 +994,8 @@
         # Install tech LEF and primitive devices from vendor files
 	${STAGE} -source ${GF180MCU_PR_PATH} \
 		-target ${STAGING_PATH}/${GF180MCU$*} \
-		-ngspice models/ngspice/*.ngspice \
-		-xyce models/xyce/*.xyce \
+		-ngspice models/ngspice/*.spice \
+		-xyce models/xyce/*.spice \
 		2>&1 | tee -a ${GF180MCU$*}_make.log
 	# Install primitive device fixed layout cells from GDS
 	${STAGE} -source ${GF180MCU_PR_PATH} \
@@ -1003,6 +1003,22 @@
 		-gds cells/klayout/pymacros/cells/*/*.gds noextract \
 		-library primitive gf180mcu_fd_pr \
 		2>&1 | tee -a ${GF180MCU$*}_make.log
+	# Files in libs.tech/ngspice used to have a ".ngspice" suffix.  To
+	# avoid breaking existing simulation testbenches that may point to
+	# the original name, make a symbolic link.
+	for file in ${STAGING_PATH}/${GF180MCU$*}/libs.tech/ngspice/*.spice ; do \
+		name=$$(basename $$file); \
+		rootname=$${name%.*}; \
+		(cd ${STAGING_PATH}/${GF180MCU$*}/libs.tech/ngspice ; \
+		ln -s $${rootname}.spice $${rootname}.ngspice ); \
+	done
+	# Similarly for the files formerly named ".xyce".
+	for file in ${STAGING_PATH}/${GF180MCU$*}/libs.tech/xyce/*.spice ; do \
+		name=$$(basename $$file); \
+		rootname=$${name%.*}; \
+		(cd ${STAGING_PATH}/${GF180MCU$*}/libs.tech/xyce ; \
+		ln -s $${rootname}.spice $${rootname}.xyce ); \
+	done
 	# Add "device primitive" property to the bipolar devices and
 	# order the ports correctly to match the subcircuit model.  This
 	# ensures that the bipolar layouts extract correctly.

gf180mcu/gf180mcu.json

diff --git a/gf180mcu/gf180mcu.json b/gf180mcu/gf180mcu.json
index d0d3f29..f169a41 100644
--- a/gf180mcu/gf180mcu.json
+++ b/gf180mcu/gf180mcu.json
@@ -96,11 +96,11 @@
         "magic": "MAGIC_COMMIT"
     },
     "reference": {
-        "open_pdks": "fa87e57d4af3c4cab5addbf14d5172bdce90e6c4",
-        "magic": "67c6ed939514e537773f9f01cc2ecca5c3400c44",
+        "open_pdks": "9bd3b0328c7c742bbb87082f659cff3a11a6a5ff",
+        "magic": "d0e38df6bf11fcc424a7352006152fca02cb9b2a",
         "gf180mcu_pdk": "a897aa30369d3bcec87d9d50ce9b01f320f854ef",
-        "gf180mcu_fd_pr": "216e518bf74c8bbcce31ba06802000de998fe3f0",
-        "gf180mcu_fd_pv": "c2e63329c4a367471e3a9b8de5ef75c5faff5948",
+        "gf180mcu_fd_pr": "0ca9d87b1b4c4e5a71e69c25b74bb29a800470a6",
+        "gf180mcu_fd_pv": "c9e23a62ce171352640f8341feec71fe13f1c132",
         "gf180mcu_ws_klayout": "7636804aa430fed842535e3d660f94de8ac4754c",
         "gf180mcu_fd_io": "545621fdbac44f55344834e6c03486310c0862d7",
         "gf180mcu_fd_sc_mcu7t5v0": "5641d172662a7d9086e5b99c5d54506c05e65cee",

sky130/sky130.json

diff --git a/sky130/sky130.json b/sky130/sky130.json
index 6b1609b..37cf305 100644
--- a/sky130/sky130.json
+++ b/sky130/sky130.json
@@ -94,16 +94,16 @@
         "magic": "MAGIC_COMMIT"
     },
     "reference": {
-        "open_pdks": "fa87e57d4af3c4cab5addbf14d5172bdce90e6c4",
-        "magic": "67c6ed939514e537773f9f01cc2ecca5c3400c44",
+        "open_pdks": "9bd3b0328c7c742bbb87082f659cff3a11a6a5ff",
+        "magic": "d0e38df6bf11fcc424a7352006152fca02cb9b2a",
         "sky130_fd_pr": "403964dc7f9cca5ec1a8cc7b4f2a6f532b781676",
         "sky130_fd_io": "b0c377d9c91b4152e0edd3a766a19185df819888",
-        "sky130_fd_sc_hs": "a9f2ed0471c3f939a7bacc7ecca0a6e1277bb589",
+        "sky130_fd_sc_hs": "c3d7991a9bcb4fc33cbd43262b44bb5560d6fdd0",
         "sky130_fd_sc_ms": "29650994547dd83610ccd0a29bae14d665a9e556",
         "sky130_fd_sc_ls": "4283919deb7eb4ed195c2b6e95431a812491f6d0",
-        "sky130_fd_sc_lp": "b93a1a75fa1b864872ebb0b078f6a2dd6e318d7c",
+        "sky130_fd_sc_lp": "091cb454662cc662a14b6c9d48567ada50288591",
         "sky130_fd_sc_hd": "9cb2d7cb8ed4619094263614039a61b6b2d22a88",
-        "sky130_fd_sc_hdll": "3c6fd57c45114a0307dfff32b310f5995be41cf7",
+        "sky130_fd_sc_hdll": "bf6e0da690bce0e3947a56ab522dee0b15ced988",
         "sky130_fd_sc_hvl": "e5413e01fa071029ba84d9faa98d9acd80e75a38",
         "sky130_osu_sc_t12": "ac90ef0c622a9377a16b5218d9da3ac4169eeaaf",
         "sky130_osu_sc_t15": "95d1c19abb47e1b2945847acb4e817b1b8417c43",