From 01ad8a01f6a0d885f5992018147caa5ce223dd0e Mon Sep 17 00:00:00 2001 From: Hamish Coleman Date: Fri, 5 Aug 2016 14:56:28 +1000 Subject: [PATCH 1/2] BUG: fix incorrectly updated line (see #9) This fixes an issue introduced with 48b019b6603f3563cdf633ac99ceafebfce0645f --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index 86bd384..86ebb4f 100644 --- a/Makefile +++ b/Makefile @@ -276,7 +276,6 @@ $(call rule_iso,t430.G1HT34WW.s01D2000.FL2,g1uj25us.iso) $(call rule_iso,x230.G2HT35WW.s01D3000.FL2,g2uj23us.iso) $(call rule_iso,t530.G4HT39WW.s01D5100.FL2,g4uj30us.iso) $(call rule_iso,w530.G4HT39WW.s01D5200.FL2,g5uj28us.iso) -$(call rule_iso,t430s.G7HT39WW.s01D8000.FL2,g7uj18us.iso) $(call rule_iso,t430s.G7HT39WW.s01D8000.FL2,g7uj19us.iso) $(call rule_iso,x230t.GCHT25WW.s01DA000.FL2,gcuj24us.iso) From 0eabb0b9f41a51bae42d8f08129a387ed4eaf439 Mon Sep 17 00:00:00 2001 From: Hamish Coleman Date: Thu, 11 Aug 2016 17:28:07 +1000 Subject: [PATCH 2/2] BUG: fix a command execution order issue - the make 'shell' command was expanded before the geteltorito command, which meant that there was no file for stat to use --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 86ebb4f..36f02dd 100644 --- a/Makefile +++ b/Makefile @@ -208,7 +208,7 @@ GETELTORITO := ./geteltorito # extract the DOS boot image from an iso (and fix it up so qemu can boot it) %.img: %.iso $(GETELTORITO) -o $@ $< - ./hexpatch.pl $@ fix-hdd-image-$(shell stat -c %s $@).patch + ./hexpatch.pl $@ fix-hdd-image-`stat -c %s $@`.patch $(call build_info,$<.bat) # $1 is the lenovo named iso