@ -161,24 +161,6 @@ define patch_disable
$( call patch_mv,$1 ,$1 .OFF)
e n d e f
- i n c l u d e $( DEPSDIR ) / s l i c e . e x t r a c t . d e p s
CLEAN_FILES += $( DEPSDIR) /slice.extract.deps
$(DEPSDIR)/slice.extract.deps : Makefile
for i in *.slice; do read SLICEE other <$$ i; echo $$ i: $$ SLICEE; done >$@ .tmp
mv $@ .tmp $@
- i n c l u d e $( DEPSDIR ) / s l i c e . i n s e r t . d e p s
CLEAN_FILES += $( DEPSDIR) /slice.insert.deps
$(DEPSDIR)/slice.insert.deps : Makefile
for i in *.slice; do read SLICEE other <$$ i; echo ` basename $$ SLICEE .orig` : $$ i ` basename $$ i .slice` ; done >$@ .tmp
mv $@ .tmp $@
# FIXME - the slice.deps targets basically do not handle add/del/change of
# the *.slice files. I dont use any of the regular tricks because I also
# dont want to download every .iso file as a result of depending on the %.slice
# file - and I dont want to work around that with makefile magic as that would
# defeat the purpose of keeping the makefile simple
# TODO - the scripts/describe output depends on Descriptions.txt -
# could parse that file and create some deps
@ -207,10 +189,6 @@ $(DEPSDIR)/slice.insert.deps: Makefile
# Generate all the orig images so that we can diff against them later
# A generic binary extractor
%.orig : %.slice scripts /slice .extract
./scripts/slice.extract $< $@
# TODO - checking the checksum here is probably too strict - it adds
# more barriers to downloading some random bios ISO and starting to port
# the code to it.
@ -328,7 +306,7 @@ mec-tools/mec_encrypt: mec-tools/Makefile
# $1 = encoded EC firmware
# $2 = FL2 filename
d e f i n e r u l e _ f l 2 _ p a t c h
$( 2) : $( 1) ; ./scripts/slice.insert $( 1) .slice $( 1) $( 2 )
$( 2) : $( 1) ; cp --reflink= auto $( 2) .orig $( 2) && ./scripts/FL2_copyIMG to_fl2 $( 2) $( 1 )
e n d e f
# Create a new ISO image with patches applied
@ -342,8 +320,8 @@ endef
# accidentally be used for BIOS updates
# Extract the FL2 file from an ISO image
# Note that the parameters here are essentially the same as rule_iso, but you cannot
# define two targets with one define..
# Note that the parameters here are intentionally the same as rule_iso,
# but you cannot define two targets with one define..
# $1 = FL2 linux filename basename
# $2 = pattern to match FL2 file in ISO image
# $3 = ISO image basename
@ -357,9 +335,20 @@ define rule_fl2_extract
$( 1) .orig: $( 3) .orig ; ./scripts/copyFL2 from_iso $( 3) .orig $( 1) .orig $( 2)
e n d e f
# Extract the IMG file from an FL2 file
# Note that the parameters here are intentionallty the same as rule_fl2_patch,
# but you cannot define two targets with one define..
# $1 = IMG file basename
# $2 = FL2 file basename
d e f i n e r u l e _ i m g _ e x t r a c t
$( 1) .orig: $( 2) .orig ./scripts/FL2_copyIMG ; ./scripts/FL2_copyIMG from_fl2 $( 2) .orig $( 1) .orig
e n d e f
#
# TODO:
# - add a simple method to autogenerate these non-generic rules
# - this is getting closer with the replacement of the .slice files with
# generic scripts.
# - once that is done, convert the defines back to action bodies, not
# rule definitions
@ -372,6 +361,15 @@ $(call rule_fl2_patch,w530.G4HT39WW.img.enc,w530.G4HT39WW.s01D5200.FL2)
$( call rule_fl 2_patch ,x 230.G 2HT 35WW .img .enc ,x 230.G 2HT 35WW .s 01D 3000.FL 2)
$( call rule_fl 2_patch ,x 230t .GCHT 25WW .img .enc ,x 230t .GCHT 25WW .s 01DA 000.FL 2)
$( call rule_img_extract ,x 220.8DHT 34WW .img .enc ,x 220.8DHT 34WW .s 01CB 000.FL 2)
$( call rule_img_extract ,t 430.G 1HT 34WW .img .enc ,t 430.G 1HT 34WW .s 01D 2000.FL 2)
$( call rule_img_extract ,t 430.G 1HT 35WW .img .enc ,t 430.G 1HT 35WW .s 01D 2000.FL 2)
$( call rule_img_extract ,t 430s .G 7HT 39WW .img .enc ,t 430s .G 7HT 39WW .s 01D 8000.FL 2)
$( call rule_img_extract ,t 530.G 4HT 39WW .img .enc ,t 530.G 4HT 39WW .s 01D 5100.FL 2)
$( call rule_img_extract ,w 530.G 4HT 39WW .img .enc ,w 530.G 4HT 39WW .s 01D 5200.FL 2)
$( call rule_img_extract ,x 230.G 2HT 35WW .img .enc ,x 230.G 2HT 35WW .s 01D 3000.FL 2)
$( call rule_img_extract ,x 230t .GCHT 25WW .img .enc ,x 230t .GCHT 25WW .s 01DA 000.FL 2)
$( call rule_iso ,t 430.G 1HT 34WW .s 01D 2000.FL 2,01D 2000.FL 2,g 1uj 25us .iso )
$( call rule_iso ,t 430.G 1HT 35WW .s 01D 2000.FL 2,01D 2000.FL 2,g 1uj 40us .iso )
$( call rule_iso ,x 230.G 2HT 35WW .s 01D 3000.FL 2,01D 3000.FL 2,g 2uj 25us .iso )
@ -380,6 +378,7 @@ $(call rule_iso,w530.G4HT39WW.s01D5200.FL2,01D5200.FL2,g5uj28us.iso)
$( call rule_iso ,t 430s .G 7HT 39WW .s 01D 8000.FL 2,01D 8000.FL 2,g 7uj 19us .iso )
$( call rule_iso ,x 230t .GCHT 25WW .s 01DA 000.FL 2,01DA 000.FL 2,gcuj 24us .iso )
$( call rule_fl 2_extract ,x 220.8DHT 34WW .s 01CB 000.FL 2,01CB 000.FL 2,8duj 27us .iso )
$( call rule_fl 2_extract ,t 430.G 1HT 35WW .s 01D 2000.FL 2,01D 2000.FL 2,g 1uj 40us .iso )
$( call rule_fl 2_extract ,t 430.G 1HT 34WW .s 01D 2000.FL 2,01D 2000.FL 2,g 1uj 25us .iso )
$( call rule_fl 2_extract ,x 230.G 2HT 35WW .s 01D 3000.FL 2,01D 3000.FL 2,g 2uj 25us .iso )