Also support downloading release notes for newer systems, where this is no us/uc crazy naming

.gitignore

@@ -2,7 +2,7 @@
 # ignore the files that we do not have clear permission to distribute
 *.iso
 *.iso.orig
-*.iso.orig.txt
+*.txt.orig
 *.img
 *.img.orig
 *.img.enc

Makefile

@@ -30,15 +30,17 @@ list_laptops:
 
 .PHONY: list_laptops
 
-# Remove all the usual junk (including any patched firmware images)
+# Remove all the locally generated junk (including any patched firmware
+# images) and any small downloads
 clean:
 	rm -f patched.*.iso patched.*.img *.FL2 *.FL2.orig *.img.enc \
             *.img.enc.orig *.img.orig *.bat \
-            *.img
+            *.img \
+            *.txt.orig
 
-# Also remove large iso images and readme files, both downloaded from remote servers.
+# Also remove the large iso images downloaded from remote servers.
 really_clean: clean
-	rm -f *.iso.orig *.iso.orig.txt
+	rm -f *.iso.orig
 
 # manually managed list of laptops - update this if the BIOS versions change
 
@@ -181,11 +183,20 @@ $(DEPSDIR)/slice.insert.deps: Makefile
 
 # Download any README text file released alongside to ISO images.
 # Useful for looking up firmware versions and the changelog.
-# NOTE: Makes an assumption about the Lenovo URL not changing.
-%.iso.orig.txt:
+# Note that Lenovo produces two sets of release notes: *uc.txt and
+# *.us.txt - the "us" ones contain instructions for using the .exe
+# version of the bios update tool instead of the instructions for
+# bootable cdrom image, but other than that they /should/ be identical
+%uc.txt.orig:
 	@echo -n "Downloading release notes for "
-	@scripts/describe $(subst .txt,,$@)
-	wget -O $@ https://download.lenovo.com/pccbbs/mobiles/$(subst .iso.orig,,$@)
+	@scripts/describe $(subst uc.txt,us.iso,$@)
+	wget -O $@ https://download.lenovo.com/pccbbs/mobiles/$(basename $@)
+
+# For newer systems they have used names that match for the iso and the txt
+%.txt.orig:
+	@echo -n "Downloading release notes for "
+	@scripts/describe $(subst .txt.,.iso.,$@)
+	wget -O $@ https://download.lenovo.com/pccbbs/mobiles/$(basename $@)
 
 # Generate all the orig images so that we can diff against them later