Remove the many little .sha1 files and add this information to the description file

pull/22/head
Hamish Coleman 7 years ago
parent c666443e40
commit 61cdddaa9a

@ -1 +0,0 @@
856a1a3efee305d335df10932b54aa478f818677 8duj27us.iso.orig

@ -173,10 +173,10 @@ $(DEPSDIR)/slice.insert.deps: Makefile
#
# Download any ISO image that we have a checksum for
# NOTE: makes an assumption about the Lenovo URL not changing
%.iso.orig: %.iso.orig.sha1
%.iso.orig:
$(info Downloading $(shell scripts/describe $@))
wget -O $@ https://download.lenovo.com/pccbbs/mobiles/$(basename $@)
sha1sum -c $<
scripts/checksum --rm_on_fail $@
touch $@
# Generate all the orig images so that we can diff against them later
@ -185,9 +185,9 @@ $(DEPSDIR)/slice.insert.deps: Makefile
%.orig: %.slice scripts/slice.extract
./scripts/slice.extract $< $@
%.img.orig: %.img.enc.orig %.img.orig.sha1 mec-tools/mec_encrypt
%.img.orig: %.img.enc.orig mec-tools/mec_encrypt
mec-tools/mec_encrypt -d $< $@
sha1sum -c $@.sha1
scripts/checksum --rm_on_fail $@
# a generic encryptor
%.img.enc: %.img scripts/xx30.encrypt

@ -1,53 +1,60 @@
#
# This file contains the text descriptions of the various iso, FL2, decrypted
# EC files
# EC files.
#
# It is intended mostly for informational use, but is also used to add a
# description line into the generated output
# The text is mostly for informational use, but is also used to add a
# description line into the generated output.
#
# The format is a filename followed by whitespace and the rest of the line is
# free-form english
# The sha1sums are used to confirm that the right files have been
# downloaded.
#
# The format of this file is a filename followed by whitespace then the
# sha1sum and then whitespace - the rest of the line is the free-form
# english description.
# The iso images downloadable from Lenovo
8duj27us.iso.orig x220 BIOS 1.42 (8DET72WW) EC 1.24 (8DHT34WW)
g1uj25us.iso.orig t430 BIOS 2.57 (G1ET97WW) EC 1.12 (G1HT34WW)
g1uj40us.iso.orig t430 BIOS 2.72 (G1ETB2WW) EC 1.13 (G1HT35WW)
g2uj25us.iso.orig x230 BIOS 2.68 (G2ETA8WW) EC 1.14 (G2HT35WW)
g4uj30us.iso.orig t530 and t530i BIOS 2.66 (G4ETA6WW) EC 1.13 (G4HT39WW)
g4uj32us.iso.orig t530 and t530i BIOS 2.68 (G4ETA8WW) EC 1.13 (G4HT39WW)
g5uj28us.iso.orig w530 BIOS 2.65 (G5ETA5WW) EC 1.13 (G4HT39WW)
g5uj30us.iso.orig w530 BIOS 2.67 (G5ETA7WW) EC 1.13 (G4HT39WW)
g7uj18us.iso.orig t430s BIOS 2.64 (G7ETA4WW) EC 1.15 (G7HT39WW)
g7uj19us.iso.orig t430s BIOS 2.65 (G7ETA5WW) EC 1.15 (G7HT39WW)
g7uj21us.iso.orig t430s BIOS 2.67 (G7ETA7WW) EC 1.15 (G7HT39WW)
gcuj24us.iso.orig x230t BIOS 2.64 (GCETA4WW) EC 1.14 (GCHT25WW)
gcuj25us.iso.orig x230t BIOS 2.65 (GCETA5WW) EC 1.14 (GCHT25WW)
gcuj26us.iso.orig x230t BIOS 2.66 (GCETA6WW) EC 1.14 (GCHT25WW)
n10ur10w.iso.orig x250 BIOS 1.21 (N10ET42W) EC 1.16 (N10HT17W)
r02uj46d.iso.orig x260 BIOS 1.19 (R02ET46W) EC 1.11 (R02HT29W)
r0iuj09wd.iso.orig x270 BIOS 1.16 (R0IET38W) EC 1.12 (R0IHT30W)
8duj27us.iso.orig 856a1a3efee305d335df10932b54aa478f818677 x220 BIOS 1.42 (8DET72WW) EC 1.24 (8DHT34WW)
g1uj25us.iso.orig 759e27829c13d591b097cbda2f34843265ef8813 t430 BIOS 2.57 (G1ET97WW) EC 1.12 (G1HT34WW)
g1uj38us.iso.orig 50a2c12ca5ed37ec80c0dbcb4d53f2b49b165d17 t430 BIOS 2.70 (G1ETB0WW) EC 1.13 (G1HT35WW)
g1uj40us.iso.orig 8c80f344068291be558803f8444a8d0bffe345c8 t430 BIOS 2.72 (G1ETB2WW) EC 1.13 (G1HT35WW)
g2uj23us.iso.orig d4f9d597ea792f966257c01c3b5442354f0b3cc8 x230 BIOS 2.66 (G2ETA6WW) EC 1.14 (G2HT35WW)
g2uj25us.iso.orig 6a457ffd04d47afd00bdac7c7dd43c6da076029e x230 BIOS 2.68 (G2ETA8WW) EC 1.14 (G2HT35WW)
g3uj24us.iso.orig f88f7b6b530ad6747405ab8a998055ff978ac9ed l430 BIOS 2.67 (G3ETA7WW) EC 1.14 (G3HT40WW)
g4uj30us.iso.orig 8673a448abd5cba1a8d7d1cb2eeb7935c7a252cd t530 and t530i BIOS 2.66 (G4ETA6WW) EC 1.13 (G4HT39WW)
g4uj32us.iso.orig f86c7402fb57038143c81aa90ced615e95369844 t530 and t530i BIOS 2.68 (G4ETA8WW) EC 1.13 (G4HT39WW)
g5uj28us.iso.orig 4ed559b7c66957c3c66ca3f8c85c37a0e181da2a w530 BIOS 2.65 (G5ETA5WW) EC 1.13 (G4HT39WW)
g5uj30us.iso.orig d714e0f431ffb316bebb72d39ecdb0a19ade6836 w530 BIOS 2.67 (G5ETA7WW) EC 1.13 (G4HT39WW)
g7uj18us.iso.orig 418bdab59ed0cf8da52078c1f2949f3fec441f0b t430s BIOS 2.64 (G7ETA4WW) EC 1.15 (G7HT39WW)
g7uj19us.iso.orig be900c38e185831ae5fa93266a806bb394ba7ac7 t430s BIOS 2.65 (G7ETA5WW) EC 1.15 (G7HT39WW)
g7uj21us.iso.orig 58a90d4db266e0a7aba430d06ff68937e26b11b3 t430s BIOS 2.67 (G7ETA7WW) EC 1.15 (G7HT39WW)
gcuj24us.iso.orig 468e70cf4253d216bfa877ac31cc2c4ae322ca16 x230t BIOS 2.64 (GCETA4WW) EC 1.14 (GCHT25WW)
gcuj25us.iso.orig 09c1a0b14ba443fe1ab252023106624401782461 x230t BIOS 2.65 (GCETA5WW) EC 1.14 (GCHT25WW)
gcuj26us.iso.orig 8b9ffa924c92df33fe673c64766501a8bd83d4cb x230t BIOS 2.66 (GCETA6WW) EC 1.14 (GCHT25WW)
n10ur10w.iso.orig 0e4c4ffb99146e50867dc1345ee2ef88c60ea192 x250 BIOS 1.21 (N10ET42W) EC 1.16 (N10HT17W)
r02uj46d.iso.orig 876a68add32d9c961cbdf80c74b88f92a66443cf x260 BIOS 1.19 (R02ET46W) EC 1.11 (R02HT29W)
r0iuj09wd.iso.orig 21b3abf69b9ee7ecf12fe0880564312122b1ff75 x270 BIOS 1.16 (R0IET38W) EC 1.12 (R0IHT30W)
# The firmware files from inside the ISO images
t430.G1HT34WW.s01D2000.FL2.orig t430 EC 1.12 Flash File (unpatched)
t430.G1HT35WW.s01D2000.FL2.orig t430 EC 1.13 Flash File (unpatched)
t430s.G7HT39WW.s01D8000.FL2.orig t430s EC 1.15 Flash File (unpatched)
t530.G4HT39WW.s01D5100.FL2.orig t530 EC 1.13 Flash File (unpatched)
w530.G4HT39WW.s01D5200.FL2.orig w530 EC 1.13 Flash File (unpatched)
x220.8DHT34WW.s01CB000.FL2.orig x220 EC 1.24 Flash File (unpatched)
x230.G2HT35WW.s01D3000.FL2.orig x230 EC 1.14 Flash File (unpatched)
x230t.GCHT25WW.s01DA000.FL2.orig x230t EC 1.14 Flash File (unpatched)
x250.N10HT17W.s01E5000.FL2.orig x250 EC 1.16 Flash File (unpatched)
x260.R02HT29W.s0AR0200.FL2.orig x260 EC 1.11 Flash File (unpatched)
t430.G1HT34WW.s01D2000.FL2.orig FIXME t430 EC 1.12 Flash File (unpatched)
t430.G1HT35WW.s01D2000.FL2.orig FIXME t430 EC 1.13 Flash File (unpatched)
t430s.G7HT39WW.s01D8000.FL2.orig FIXME t430s EC 1.15 Flash File (unpatched)
t530.G4HT39WW.s01D5100.FL2.orig FIXME t530 EC 1.13 Flash File (unpatched)
w530.G4HT39WW.s01D5200.FL2.orig FIXME w530 EC 1.13 Flash File (unpatched)
x220.8DHT34WW.s01CB000.FL2.orig 770588d03c2dcccc833ef911f6247519cfbd6701 x220 EC 1.24 Flash File (unpatched)
x230.G2HT35WW.s01D3000.FL2.orig 55d419655d849334feb535c51a62795153e6af7f x230 EC 1.14 Flash File (unpatched)
x230t.GCHT25WW.s01DA000.FL2.orig FIXME x230t EC 1.14 Flash File (unpatched)
x250.N10HT17W.s01E5000.FL2.orig 0732e80cddd0efcca9ba72dcfbdd0110d3c29dae x250 EC 1.16 Flash File (unpatched)
x260.R02HT29W.s0AR0200.FL2.orig 35a9b0d623fea82a440aae816a91da2cb18f6801 x260 EC 1.11 Flash File (unpatched)
# The actual firmware extracted from the firmware file
t430.G1HT34WW.img.orig t430 EC 1.12 (decrypted)
t430.G1HT35WW.img.orig t430 EC 1.13 (decrypted)
t430s.G7HT39WW.img.orig t430s EC 1.15 (decrypted)
t530.G4HT39WW.img.orig t530 EC 1.13 (decrypted)
w530.G4HT39WW.img.orig w530 EC 1.13 (decrypted)
x220.8DHT34WW.img.enc.orig x220 EC 1.24 (encrypted)
x230.G2HT35WW.img.orig x230 EC 1.14 (decrypted)
x230t.GCHT25WW.img.orig x230t EC 1.14 (decrypted)
x250.N10HT17W.img.enc.orig x250 EC 1.16 (encrypted)
x260.R02HT29W.img.orig x260 EC 1.11 (not encrypted)
t430.G1HT34WW.img.orig d3fde28cbdcb628da23ff30ee6c4a57d976700bf t430 EC 1.12 (decrypted)
t430.G1HT35WW.img.orig 08ab64a0e61865781466fb2bfd97210fe0651bc8 t430 EC 1.13 (decrypted)
t430s.G7HT39WW.img.orig 6e68545a76b42d534c8a4b24a63bf7bece996522 t430s EC 1.15 (decrypted)
t530.G4HT39WW.img.orig 85257101482d8ec7a70d860e176a5fff805fd572 t530 EC 1.13 (decrypted)
w530.G4HT39WW.img.orig 85257101482d8ec7a70d860e176a5fff805fd572 w530 EC 1.13 (decrypted)
x220.8DHT34WW.img.enc.orig 5dccc0284991ef5144e2b9a114249edb77fa0b28 x220 EC 1.24 (encrypted)
x230.G2HT35WW.img.orig d70f5434ef316a66a6195651d9e231e84a2464a1 x230 EC 1.14 (decrypted)
x230t.GCHT25WW.img.orig d9db308756a6a82ff83ee8e3eae930b5ff550e28 x230t EC 1.14 (decrypted)
x250.N10HT17W.img.enc.orig FIXME x250 EC 1.16 (encrypted)
x260.R02HT29W.img.orig FIXME x260 EC 1.11 (not encrypted)

@ -1 +0,0 @@
759e27829c13d591b097cbda2f34843265ef8813 g1uj25us.iso.orig

@ -1 +0,0 @@
50a2c12ca5ed37ec80c0dbcb4d53f2b49b165d17 g1uj38us.iso.orig

@ -1 +0,0 @@
8c80f344068291be558803f8444a8d0bffe345c8 g1uj40us.iso.orig

@ -1 +0,0 @@
d4f9d597ea792f966257c01c3b5442354f0b3cc8 g2uj23us.iso.orig

@ -1 +0,0 @@
6a457ffd04d47afd00bdac7c7dd43c6da076029e g2uj25us.iso.orig

@ -1 +0,0 @@
8673a448abd5cba1a8d7d1cb2eeb7935c7a252cd g4uj30us.iso.orig

@ -1 +0,0 @@
4ed559b7c66957c3c66ca3f8c85c37a0e181da2a g5uj28us.iso.orig

@ -1 +0,0 @@
418bdab59ed0cf8da52078c1f2949f3fec441f0b g7uj18us.iso.orig

@ -1 +0,0 @@
be900c38e185831ae5fa93266a806bb394ba7ac7 g7uj19us.iso.orig

@ -1 +0,0 @@
468e70cf4253d216bfa877ac31cc2c4ae322ca16 gcuj24us.iso.orig

@ -1 +0,0 @@
0e4c4ffb99146e50867dc1345ee2ef88c60ea192 n10ur10w.iso.orig

@ -1 +0,0 @@
876a68add32d9c961cbdf80c74b88f92a66443cf r02uj46d.iso.orig

@ -0,0 +1,48 @@
#!/bin/bash
#
# Look up the given filename in the description file and confirm that
# the checksum matches
#
# FIXME
# - the description file is expected to be in the current dir
DESCRIPTIONS=descriptions.txt
if [ "$1" == "--rm_on_fail" ]; then
RM_ON_FAIL=yes
shift
fi
FILE="$1"
if [ -z "$1" ]; then
echo need filename
exit 1
fi
LINE=$(egrep "^$FILE " "$DESCRIPTIONS")
if [ $? -ne 0 ]; then
echo "Unknown file $FILE"
exit 1
fi
if [ ! -e "$FILE" ]; then
echo "File $FILE does not exist"
exit 1
fi
EXPECT=$(echo "$LINE" | awk -- '{print $2}')
GOT=$(sha1sum "$FILE" | cut -d" " -f1)
if [ "$EXPECT" != "$GOT" ]; then
echo "File $FILE failed checksum check"
if [ "$RM_ON_FAIL" ]; then
rm $FILE
fi
exit 1
fi
exit 0

@ -21,5 +21,5 @@ if [ $? -ne 0 ]; then
exit 1
fi
echo "$LINE" | cut -d" " -f2-
echo "$LINE" | perl -pe 's/^(\S+)\s+(\S+)\s+//'

@ -1 +0,0 @@
d3fde28cbdcb628da23ff30ee6c4a57d976700bf t430.G1HT34WW.img.orig

@ -1 +0,0 @@
08ab64a0e61865781466fb2bfd97210fe0651bc8 t430.G1HT35WW.img.orig

@ -1 +0,0 @@
6e68545a76b42d534c8a4b24a63bf7bece996522 t430s.G7HT39WW.img.orig

@ -1 +0,0 @@
85257101482d8ec7a70d860e176a5fff805fd572 t530.G4HT39WW.img.orig

@ -1 +0,0 @@
85257101482d8ec7a70d860e176a5fff805fd572 w530.G4HT39WW.img.orig

@ -1 +0,0 @@
5dccc0284991ef5144e2b9a114249edb77fa0b28 x220.8DHT34WW.img.enc.orig

@ -1 +0,0 @@
770588d03c2dcccc833ef911f6247519cfbd6701 x220.8DHT34WW.s01CB000_FL2.orig

@ -1 +0,0 @@
d70f5434ef316a66a6195651d9e231e84a2464a1 x230.G2HT35WW.img.orig

@ -1 +0,0 @@
55d419655d849334feb535c51a62795153e6af7f x230.G2HT35WW.s01D3000_FL2.orig

@ -1 +0,0 @@
d9db308756a6a82ff83ee8e3eae930b5ff550e28 x230t.GCHT25WW.img.orig

@ -1 +0,0 @@
0732e80cddd0efcca9ba72dcfbdd0110d3c29dae x250.N10HT17W.s01E5000.FL2.orig

@ -1 +0,0 @@
35a9b0d623fea82a440aae816a91da2cb18f6801 x260.R02HT29W.s0AR0200.FL2.orig
Loading…
Cancel
Save