search

linuxboot / heads

A minimal Linux that runs as a coreboot or LinuxBoot ROM payload to provide a secure, flexible boot environment for laptops, workstations and servers.
https://osresearch.net/
GNU General Public License v2.0
1.41k stars 185 forks source link

coreboot (rom stitching) not reproducible #1633

Closed tlaurion closed 5 months ago

tlaurion commented 5 months ago

All coreboot forks currently used do not stich the final rom reproducibily.

One example:

user@heads-tests-deb12-clean:~/heads$ wget -q https://output.circle-artifacts.com/output/job/b7236410-3202-441e-aa15-fedf09627fb6/artifacts/0/build/x86/librem_15v4/hashes.txt -O hashes.txt
user@heads-tests-deb12-clean:~/heads$ rm -f ./bad_hashes ./identical_hashes ./output_non_reproducible && grep / hashes.txt | awk -F " " '{print $1}'| while read hash; do grep -q $hash ~/heads/build/x86/librem_15v4/hashes.txt; if [ $? == 0 ]; then echo $hash >> ./identical_hashes; else echo $hash >> ./bad_hashes;fi;done; cat ./bad_hashes| while read bad; do grep $bad hashes.txt >> ./output_non_reproducible; done;
user@heads-tests-deb12-clean:~/heads$ cat output_non_reproducible 
77d95bf358a3fede66dded0a77e4279eae9dbb6490133cf761ead12984b2ade3  /root/heads/build/x86/librem_15v4/heads-librem_15v4-v0.2.0-2050-g8208c86.rom

Originally posted by @tlaurion in https://github.com/linuxboot/heads/issues/1630#issuecomment-2038101225

tlaurion commented 5 months ago

Only insight of the moment is that we hardcode flags passed down to coreboot when rom is built from modules/coreboot: EXTRA_FLAGS ?= -fdebug-prefix-map=$(pwd)=heads -gno-record-gcc-switches -Wno-error=packed-not-aligned -Wno-address-of-packed-member

tlaurion commented 5 months ago

Diffoscope doesn't help :(

user@heads-tests-deb12-clean:~/heads$ docker run --rm -t -w $(pwd) -v $(pwd):$(pwd):ro registry.salsa.debian.org/reproducible-builds/diffoscope heads-x230-hotp-maximized-v0.2.0-2050-g8208c86.rom build/x86/x230-hotp-maximized/heads-x230-hotp-maximized-v0.2.0-2050-g8208c86.rom 
Unable to find image 'registry.salsa.debian.org/reproducible-builds/diffoscope:latest' locally
latest: Pulling from reproducible-builds/diffoscope
5fd0f220e694: Pull complete 
1812f988493a: Pull complete 
8876f5223738: Pull complete 
4f4fb700ef54: Pull complete 
Digest: sha256:415e41f9f20f31a28543a5b068ce2598ed61db38b177bbbb9670c91a7a474e0f
Status: Downloaded newer image for registry.salsa.debian.org/reproducible-builds/diffoscope:latest
--- heads-x230-hotp-maximized-v0.2.0-2050-g8208c86.rom
+++ build/x86/x230-hotp-maximized/heads-x230-hotp-maximized-v0.2.0-2050-g8208c86.rom
│┄ Command `cbfstool heads-x230-hotp-maximized-v0.2.0-2050-g8208c86.rom extract -n fallback/romstage -f «TEMP»/diffoscope_8r8y6tsx_pmaximized/tmpdog07tsu_CbfsContainer/romstage` failed with exit code 1. (No output)
@@ -28642,228 +28642,228 @@
 0006fe10: 1d37 5956 da86 60fd d095 588d 1a4a 9b78  .7YV..`...X..J.x
 0006fe20: cc3d c32a 9674 92b6 6ad3 8f65 76ef 11b9  .=.*.t..j..ev...
 0006fe30: 252c c935 2ff3 5497 a9c5 1537 d1e2 0537  %,.5/.T....7...7
 0006fe40: 57a5 c451 ffff ffff ffff ffff ffff ffff  W..Q............
 0006fe50: ffff ffff ffff ffff ffff ffff ffff ffff  ................
 0006fe60: ffff ffff ffff ffff ffff ffff ffff ffff  ................
 0006fe70: ffff ffff ffff ffff ffff ffff ffff ffff  ................
-0006fe80: 4c41 5243 4849 5645 0000 0d25 0000 0050  LARCHIVE...%...P
+0006fe80: 4c41 5243 4849 5645 0000 0d2c 0000 0050  LARCHIVE...,...P
 0006fe90: 0000 0020 0000 0030 636f 6e66 6967 0000  ... ...0config..
-0006fea0: 4243 5a4c 0000 0010 0000 0001 0000 29c0  BCZL..........).
-0006feb0: 0100 3000 00c0 2900 0000 0000 0000 1188  ..0...).........
+0006fea0: 4243 5a4c 0000 0010 0000 0001 0000 29de  BCZL..........).
+0006feb0: 0100 3000 00de 2900 0000 0000 0000 1188  ..0...).........
 0006fec0: 8a95 ee5b 5f2d de0a e00f 3bdc bda4 1e19  ...[_-....;.....
 0006fed0: be28 21a5 4c09 3966 25c0 f57a 548f 9848  .(!.L.9f%..zT..H
 0006fee0: 625d dd04 8f62 6d70 57ce 73fe a205 9cfb  b]...bmpW.s.....
 0006fef0: 90d0 6835 82c8 1680 d919 d778 c339 bdc9  ..h5.......x.9..
 0006ff00: cfc9 d76d ea91 6b6d b9ad dc0c dfb6 e16b  ...m..km.......k
 0006ff10: 2d56 d380 b58b b03f 6548 0695 7c35 eb66  -V.....?eH..|5.f
 0006ff20: 1647 eaeb 6f4a 85ad 6cad 58ec 9c72 e519  .G..oJ..l.X..r..
 0006ff30: 2e80 a370 82d0 12a7 42f3 b41a 08ff ded2  ...p....B.......
 0006ff40: 0481 45ce d63c 0be9 64be cd86 1244 537f  ..E..<..d....DS.
 0006ff50: 11dc 7ff5 5218 e768 6a08 239f d1a7 74c0  ....R..hj.#...t.
-0006ff60: 6ce3 9e39 4f50 ee8f 6ea5 2902 18ae 61c5  l..9OP..n.)...a.
-0006ff70: 710a d929 50a8 59b5 25fc d59c 1095 5256  q..)P.Y.%.....RV
-0006ff80: eb44 0ee1 8773 fa14 284b 7fd6 7a6a 1e1a  .D...s..(K..zj..
-0006ff90: 739f 06a2 005a d4d4 b0e0 e37e 3d65 5282  s....Z.....~=eR.
-0006ffa0: 2d06 2faf 29bd e3c0 b07c eecf 0dbf 055e  -./.)....|.....^
-0006ffb0: b4d4 2ce8 5659 44b1 9d1e 9dfd 5a31 15f7  ..,.VYD.....Z1..
-0006ffc0: afed 8a9e 0912 f1e0 c394 1a08 b4cf e0ab  ................
-0006ffd0: c929 e101 316f 1c42 21c8 996e 7ae9 a155  .)..1o.B!..nz..U
-0006ffe0: d4c9 d804 73c4 7a33 2429 95fd 91e9 223d  ....s.z3$)...."=
-0006fff0: 76df 8edb 4f19 a889 8f4e 60db 7934 7676  v...O....N`.y4vv
-00070000: 39ba b980 fb2c df58 2b2f e5e0 6356 563e  9....,.X+/..cVV>
-00070010: 268d 49f8 79cb 2118 e354 efbf a1c9 e342  &.I.y.!..T.....B
-00070020: 5b5c f14a 30c1 be08 f0ed cac2 9500 34b2  [\.J0.........4.
-00070030: e695 b0e2 d2eb 4ff5 e1fc 4856 5fff 418c  ......O...HV_.A.
-00070040: b9d9 532a f768 fa8b 2cbe 72fe 7220 9b4f  ..S*.h..,.r.r .O
-00070050: c5ff 4a1a 1a20 393e 7f29 d3a7 9997 21bc  ..J.. 9>.)....!.
-00070060: 4e96 f143 f9fc d240 7656 577d 812e 2313  N..C...@vVW}..#.
-00070070: 9c01 d30d 9750 60d4 4b2a 2217 0401 6008  .....P`.K*"...`.
-00070080: d2d4 930c ea23 63a8 511f fa04 5729 f9c2  .....#c.Q...W)..
-00070090: ec72 287d 32b0 b859 2c32 8a4a cd30 23c3  .r(}2..Y,2.J.0#.
-000700a0: 5ed5 2aad 693e 7837 b258 5093 ba42 f894  ^.*.i>x7.XP..B..
-000700b0: 5167 9006 1e9c 4d9f e6ae 53f1 017d 0c30  Qg....M...S..}.0
-000700c0: 15d9 5e85 c8f3 2421 e0d7 ed3b 6c50 e6b6  ..^...$!...;lP..
-000700d0: c95f fefb ef10 e155 4d54 d15d 76b7 c55d  ._.....UMT.]v..]
-000700e0: 62b7 9de9 4f5c 11b7 cf9c 075a 724d 149b  b...O\.....ZrM..
-000700f0: 7842 77d7 3c58 60b4 f020 09dc 0d4a 9680  xBw.<X`.. ...J..
-00070100: 3fd6 f22f c956 980f 6126 1f12 4dfc b73e  ?../.V..a&..M..>
-00070110: 8591 fc60 93b3 a5a0 fe63 3c9d 4bb9 1df5  ...`.....c<.K...
-00070120: c4c9 2809 b50f d2be 0206 9ad5 a7fd 175b  ..(............[
-00070130: 18ae 0454 6c55 e72a d032 9cfd b31d 53d1  ...TlU.*.2....S.
-00070140: b91a cdf6 a4a8 3fed 3030 4682 dea4 22e9  ......?.00F...".
-00070150: 6cf8 5167 7ecf a3ff be64 061d 0038 25c6  l.Qg~....d...8%.
-00070160: 48fc 7c39 6425 cf5f 68fa 9a6a 6a16 9ed6  H.|9d%._h..jj...
-00070170: 57d5 7b2d 7400 b92b 8a8b 3fbf 291b 37b7  W.{-t..+..?.).7.
-00070180: 35b4 4e31 a86f 741c 22b6 fdb2 a5bd d237  5.N1.ot."......7
-00070190: 6507 f01a 70f6 455f ee62 3887 a1ca 25a9  e...p.E_.b8...%.
-000701a0: 8d13 ab1d 3179 b14b 7b75 bacb 806e b065  ....1y.K{u...n.e
-000701b0: b17b 3e4a 825b cb4b 5811 403f 9246 322b  .{>J.[.KX.@?.F2+
-000701c0: c681 cf81 6bf1 84fd 6841 f8f2 7b64 7efa  ....k...hA..{d~.
-000701d0: 118d 1fa0 31f8 e2ac 6568 1bc4 56ce de1f  ....1...eh..V...
-000701e0: b6c0 b70a 0fbc fb49 0cf6 29b9 05c6 b7c6  .......I..).....
-000701f0: d56e be18 e527 94f3 a339 fa14 9878 4603  .n...'...9...xF.
-00070200: 7d58 7f51 1cf7 1c1d d55b ec09 a6cb 3b0d  }X.Q.....[....;.
-00070210: b50b c47c 8080 9c54 342a 7dd2 0cb7 96c9  ...|...T4*}.....
-00070220: 2e1e fc99 49fb a935 ef3c 4a19 89fb ac8c  ....I..5.<J.....
-00070230: 0765 be6f d2f8 6726 8143 c502 0590 c892  .e.o..g&.C......
-00070240: e698 ffa4 59ca 68eb bff8 f73f 042d d56d  ....Y.h....?.-.m
-00070250: d49e 1037 21e7 3843 b14a 3ac0 b5fa a9d9  ...7!.8C.J:.....
-00070260: 56b0 ee78 6620 6b4c fe31 9e69 9b9b e326  V..xf kL.1.i...&
-00070270: 47cf 22df 4923 ed27 7c94 84e3 ca2e 8f49  G.".I#.'|......I
-00070280: bb84 97ad a7c1 362a 718a 70bb 5d91 5521  ......6*q.p.].U!
-00070290: 0bbe 823d 9cb9 e7a0 0733 254c c610 c2d8  ...=.....3%L....
-000702a0: 432d 77f1 1b74 5398 94b6 8515 6568 8b09  C-w..tS.....eh..
-000702b0: 3344 31f0 40ac 8be3 ca25 37e0 04d2 8330  3D1.@....%7....0
-000702c0: aec3 99b9 88bf 1278 98a4 4e44 3f11 8f50  .......x..ND?..P
-000702d0: 16d7 5d5f dd95 b96f be89 33ac 553f cad4  ..]_...o..3.U?..
-000702e0: 447e ad7e 5cf3 bac9 5b17 1970 b07b 5fb3  D~.~\...[..p.{_.
-000702f0: 51f5 936a da35 ea3a ec4f f0f8 7716 e563  Q..j.5.:.O..w..c
-00070300: fa15 7f3f ca61 37bc 6dc0 743c 1f6e 2d24  ...?.a7.m.t<.n-$
-00070310: 999e 0358 e81e a986 e910 6b8c ec6f cbee  ...X......k..o..
-00070320: 893d 0a3e 6fb5 b248 8c95 71f8 24f0 2966  .=.>o..H..q.$.)f
-00070330: 5f4b 2bbc 6c55 4dbd b025 9fb3 bb24 ddf5  _K+.lUM..%...$..
-00070340: d05a b45b 0e39 49c1 f7b9 f3be e873 8860  .Z.[.9I......s.`
-00070350: 7f66 2861 5f29 eaa4 b91b 9410 7f5c 48a1  .f(a_).......\H.
-00070360: 378d dadf 35e0 5d0e 005d 7c48 d84c 4beb  7...5.]..]|H.LK.
-00070370: e232 8d75 a64e 43ca 3581 940a 3397 1361  .2.u.NC.5...3..a
-00070380: fe08 4713 5d7e 1fce db81 1ff1 6a3c 932d  ..G.]~......j<.-
-00070390: d761 e17b aa9b 2aeb e6bb 99f0 bc18 99c6  .a.{..*.........
-000703a0: f9c7 9078 873a 65cf 7827 1872 f63a e44c  ...x.:e.x'.r.:.L
-000703b0: 3365 a8a2 a486 87b9 bc3b eab7 ac22 2ce6  3e.......;...",.
-000703c0: da7b 1a6c cb7a 0070 1e9e 7daa cf4c 296b  .{.l.z.p..}..L)k
-000703d0: e4bd 252b b026 6206 dcc4 a566 bf7f 15f5  ..%+.&b....f....
-000703e0: 0ef6 57b9 e0d2 a23d 30b0 f500 2d71 9fe9  ..W....=0...-q..
-000703f0: 2118 583c 8339 c3b2 470b 3af7 9295 f891  !.X<.9..G.:.....
-00070400: 36b9 ba7e 2b63 979f 0633 f91d 5de1 218b  6..~+c...3..].!.
-00070410: abb2 86a2 3766 c934 ecf7 73ac d4af 992e  ....7f.4..s.....
-00070420: 8359 390b 09fd 7c54 3d3d b673 ebb2 4b8b  .Y9...|T==.s..K.
-00070430: d2d5 4e6a d9af 199d 1857 85d4 e5f6 bbab  ..Nj.....W......
-00070440: 4a9a a0f2 8190 49f4 a367 8cee 25b9 5b6d  J.....I..g..%.[m
-00070450: 9ed4 89b9 3838 91c6 21ea 0ea9 486e 67fe  ....88..!...Hng.
-00070460: cf0a b402 6831 41de 797d 6fcd 3e1c a20c  ....h1A.y}o.>...
-00070470: fc9f d5c2 70bf 0c38 d96e 140e 4b93 20c2  ....p..8.n..K. .
-00070480: cb89 1f36 b079 147c 95f3 aee2 82c1 04cc  ...6.y.|........
-00070490: 6337 5981 6543 3ae8 5b6f e171 1db6 71e1  c7Y.eC:.[o.q..q.
-000704a0: a2e7 34cf 9b9d a58f 3655 b4ff dcc4 2228  ..4.....6U...."(
-000704b0: 6c9b 1407 9a91 94d1 395b d18a b31d 33c7  l.......9[....3.
-000704c0: d543 c40c 354c c684 4b83 8132 9a1e 8db8  .C..5L..K..2....
-000704d0: 1f2a 3f05 3b0e 9853 d86c 1609 4110 08a3  .*?.;..S.l..A...
-000704e0: 6423 cec9 6de9 c05c 8bb2 5a5c 4f3e e88e  d#..m..\..Z\O>..
-000704f0: b0c9 ea63 e4a5 13c4 41d7 faf4 92c4 1220  ...c....A...... 
-00070500: 5a7e ccdd f3e4 7988 73fa c08d 8305 7ce0  Z~....y.s.....|.
-00070510: 499c e85e 0f6c 48c7 c15d 61a0 50d8 01d6  I..^.lH..]a.P...
-00070520: 0d9a e39f 4cac 5029 346f 4527 3a83 7da4  ....L.P)4oE':.}.
-00070530: 4a45 3bd0 e739 7485 88a1 f945 e51a 758c  JE;..9t....E..u.
-00070540: cae9 b22d 21dd eee7 701a 7295 b598 7fa7  ...-!...p.r.....
-00070550: d081 1569 2952 6c3a fa74 8150 519b 5c93  ...i)Rl:.t.PQ.\.
-00070560: e1cd a5c5 1eec 73e7 05bc af34 c2be 1794  ......s....4....
-00070570: 9e2c 4936 315f a684 39dd df4b 2553 b446  .,I61_..9..K%S.F
-00070580: 61be aff2 5873 0f59 0d20 fafa 8f02 6e6c  a...Xs.Y. ....nl
-00070590: 6137 5eb6 a565 86a8 d47a 238f d60f d61c  a7^..e...z#.....
-000705a0: 5e89 91c9 393b 95d0 23eb 868f 79b1 68c7  ^...9;..#...y.h.
-000705b0: c922 d93b b5dc 1b84 59f6 0638 0d85 6e2f  .".;....Y..8..n/
-000705c0: 5701 dcad 13f1 7d50 50f0 4296 c2ad 1f7c  W.....}PP.B....|
-000705d0: c712 ec99 3dd4 317b 39a3 13f7 ea36 7f9b  ....=.1{9....6..
-000705e0: ff38 fa4e 7cb9 c514 976a 4f01 0419 ca2c  .8.N|....jO....,
-000705f0: d47c 97a8 0c34 3ec6 bd7f 9b5c b9a5 4cb5  .|...4>....\..L.
-00070600: f34e 23f2 310b dc92 257f f5fc 2360 8271  .N#.1...%...#`.q
-00070610: 098d 32bc ad4d 0e67 72c8 95ec 9e5e 8fb5  ..2..M.gr....^..
-00070620: f6a5 5e55 3dfe 9a34 bc13 b9fa a8d6 ffe4  ..^U=..4........
-00070630: d4af 4699 2d77 e221 9631 9e34 9890 6187  ..F.-w.!.1.4..a.
-00070640: a166 0a72 cf96 a8e5 503d f1a8 fec8 d0ba  .f.r....P=......
-00070650: 3c95 b207 935f 0f0b 46ec c069 87a9 a0b3  <...._..F..i....
-00070660: 5f7e 74a0 7cd9 b85c 2eff 1911 8aef d2e8  _~t.|..\........
-00070670: b455 4976 cfe8 ebda 5af6 1cd8 21db 4916  .UIv....Z...!.I.
-00070680: 94bf be02 0a83 c528 70df 4fa5 d000 44a8  .......(p.O...D.
-00070690: eeb3 594a a683 373f c8dd d2ec f85f fc76  ..YJ..7?....._.v
-000706a0: 7cf9 abfb dd42 37da 125e f3ad f1de 26b5  |....B7..^....&.
-000706b0: bf6d 410a c256 ccc2 e882 4906 b88b 7513  .mA..V....I...u.
-000706c0: 3cf8 7116 dc08 1f27 b8e0 39a7 58fd fc62  <.q....'..9.X..b
-000706d0: f61e 9f6d eb8d d599 b60c 9014 12e9 af04  ...m............
-000706e0: fb9b 71af aebe 1c59 d96d db48 03ac 4ad8  ..q....Y.m.H..J.
-000706f0: 8014 e843 4074 d729 ba5f 2387 4301 921f  ...C@t.)._#.C...
-00070700: a896 3f5a 2724 e521 ff18 acf9 087a d2ab  ..?Z'$.!.....z..
-00070710: a7db cc72 15a3 6d1a d1bb f473 dc43 3f16  ...r..m....s.C?.
-00070720: 657c 03bd 5550 ee55 8d31 9d82 daaf acd9  e|..UP.U.1......
-00070730: 543d 8194 dd9a 4e65 20c1 b02d 7e51 794f  T=....Ne ..-~QyO
-00070740: 6ed4 790a aa15 19e6 09d5 ea40 6866 fc2c  n.y........@hf.,
-00070750: b940 fa12 0309 0d1f 925e 7ecd 7e80 71bf  .@.......^~.~.q.
-00070760: 5838 c396 a1f1 7fa6 d187 c7b6 884e 8ee1  X8...........N..
-00070770: 5837 0757 4a30 a816 cbe8 def6 5889 e7ea  X7.WJ0......X...
-00070780: 4b04 53c9 a00f f336 c41c 341c ad49 518e  K.S....6..4..IQ.
-00070790: 30ea 3958 a125 c756 1785 f75e 58d7 9adb  0.9X.%.V...^X...
-000707a0: 098f ef80 d378 5d20 372e b0ea 4442 debe  .....x] 7...DB..
-000707b0: 3424 6fa6 d2bb f05c 24ba 3d33 3706 dd38  4$o....\$.=37..8
-000707c0: 98b6 e37a 00eb a615 c8a0 eecd d067 9615  ...z.........g..
-000707d0: 8dc6 e528 ca22 c466 5655 bdc3 18c2 992c  ...(.".fVU.....,
-000707e0: ffa5 9e6d ec20 1345 8dcc 6e36 a495 9ac7  ...m. .E..n6....
-000707f0: 3eb3 8032 4361 0b97 9eef 2273 5218 418f  >..2Ca...."sR.A.
-00070800: b6f7 3e0b 8e82 f0e7 2372 4125 7c18 26b2  ..>.....#rA%|.&.
-00070810: d696 b654 2e1b 753c 1eb8 69f9 e2d4 2487  ...T..u<..i...$.
-00070820: 5a0f 043e de64 0fef f971 7436 8738 cd2a  Z..>.d...qt6.8.*
-00070830: 9217 b5a0 2b34 e215 ba71 b648 de81 9c74  ....+4...q.H...t
-00070840: 86c8 1733 0dc4 a9a0 9ece c5dd 4a1f e821  ...3........J..!
-00070850: 3cbb 7c36 b2a2 6a93 4378 73e6 8050 77bb  <.|6..j.Cxs..Pw.
-00070860: df67 1046 da89 2008 ca06 2e31 7579 c9b8  .g.F.. ....1uy..
-00070870: 303c 0158 9b8b 16d9 15f3 f403 1467 a818  0<.X.........g..
-00070880: 9b14 ca1f a25e 1608 bbb4 d7cf 6168 8de7  .....^......ah..
-00070890: bcf8 9974 974f 1c21 5c0a 45ef a7f1 7b26  ...t.O.!\.E...{&
-000708a0: 6e76 c091 9aee c70b da82 01ce d9e0 f6ae  nv..............
-000708b0: 861e 2a64 1584 d695 4b0b 6ddd 8340 c420  ..*d....K.m..@. 
-000708c0: d4b7 864e c71a 7f50 c713 698e 547b 6bcc  ...N...P..i.T{k.
-000708d0: 5d31 fe72 f801 4096 5121 c4ee 2ea3 c6f8  ]1.r..@.Q!......
-000708e0: 67cc 723c 9220 02e8 191b 58a2 3541 2dc0  g.r<. ....X.5A-.
-000708f0: e1b1 40f6 9236 d86c 47c4 0147 c1d8 c022  ..@..6.lG..G..."
-00070900: 4826 3d5e d6ca 8eae 2213 11ae 03f4 374b  H&=^....".....7K
-00070910: 803f 408d eb1d 9190 1745 f99e a07f 8b0a  .?@......E......
-00070920: 8ce6 3cc7 e7b4 70b8 610a 8386 b942 4baa  ..<...p.a....BK.
-00070930: 5067 7165 51ce 3444 81e8 6f41 0a80 dc57  PgqeQ.4D..oA...W
-00070940: 9e8c 562b 4803 e71d 61c6 9ec0 f6c2 7ae4  ..V+H...a.....z.
-00070950: f54e 5b6c f285 6d13 8e17 9b8c b5e5 4373  .N[l..m.......Cs
-00070960: ff0d b018 e2fe 1978 210a 4f07 87fd bf11  .......x!.O.....
-00070970: ac67 6187 ef9a b685 0498 6776 46eb ba3e  .ga.......gvF..>
-00070980: 53ff 2e91 7ff7 995c b634 b2a8 2dea 078c  S......\.4..-...
-00070990: 68b7 e9db 5d7b 7455 4a36 4b73 ca38 8942  h...]{tUJ6Ks.8.B
-000709a0: 9e66 e232 f5dd 41c6 73e6 3972 1eef 783c  .f.2..A.s.9r..x<
-000709b0: 292f b784 062e 7ee6 dfd9 74f7 e121 4d77  )/....~...t..!Mw
-000709c0: 185b f86e 74ce 26e7 baf4 04be e134 2001  .[.nt.&......4 .
-000709d0: b5b4 f16b e0bf c837 2a89 04dc 3295 01bc  ...k...7*...2...
-000709e0: 660b b836 8de1 28ca 1f32 8733 e2b7 257d  f..6..(..2.3..%}
-000709f0: a1d4 5acf 294c 2f33 459f f28f afe0 54e9  ..Z.)L/3E.....T.
-00070a00: 82e9 0dd9 eb25 9695 28fd f2a6 a424 25f8  .....%..(....$%.
-00070a10: 7ffe c67e 69da 7e9f c5b0 af82 cb7c 244b  ...~i.~......|$K
-00070a20: 96d1 848d 6dd0 3933 eeb7 fe77 54bc ea1c  ....m.93...wT...
-00070a30: 3efc 91ef b59e 936d 5d01 87d0 16e3 98f1  >......m].......
-00070a40: 5676 c26d dcfa 2a2c 6ea5 8b50 f9c2 3807  Vv.m..*,n..P..8.
-00070a50: 208d 20d6 d97c 64c7 68fa 4fe9 579c b7f9   . ..|d.h.O.W...
-00070a60: ec6a 9281 da10 07e2 610c 31fd ac59 2806  .j......a.1..Y(.
-00070a70: 3e8f 8772 bf02 1ae4 5a35 673d ae1a 526c  >..r....Z5g=..Rl
-00070a80: 56b7 f7b0 119b 2d22 72ab 994f 7eda 7979  V.....-"r..O~.yy
-00070a90: f6d4 66d0 e965 65dc 9caa 115e ade6 60d8  ..f..ee....^..`.
-00070aa0: 5a03 1953 866f 64ab 7bca 2fd8 f91e 33c2  Z..S.od.{./...3.
-00070ab0: f9db 2c1d 172f 2942 e52b 7f67 33f3 5a84  ..,../)B.+.g3.Z.
-00070ac0: 70dc d423 dc9c 4572 f8a5 29e5 a5bd c89c  p..#..Er..).....
-00070ad0: fe97 9063 6de4 e7cd d0f5 2b97 b69e 46ad  ...cm.....+...F.
-00070ae0: afea 5b70 bad0 7dd0 1621 d0ac c592 99d7  ..[p..}..!......
-00070af0: 2c83 deb4 befc 8a13 4afa fd6b fd81 8543  ,.......J..k...C
-00070b00: d8ad 7f8a 22ba 16a9 3831 725d f669 ae04  ...."...81r].i..
-00070b10: 1aef bf39 d714 1be8 10e4 c698 16f6 627f  ...9..........b.
-00070b20: 1409 e886 36b9 ba50 3212 741b 45f5 36cf  ....6..P2.t.E.6.
-00070b30: eacc f5c4 75c1 13a7 dab0 567a 8248 915c  ....u.....Vz.H.\
-00070b40: fbbd 9bb0 8ad9 0304 83a4 f3af 207e a2da  ............ ~..
-00070b50: 9df7 59a0 000a d0ce 459e 8b70 2c2a 9892  ..Y.....E..p,*..
-00070b60: f2f7 5a81 88d7 bdbd f9ac 334a f8ed 3b49  ..Z.......3J..;I
-00070b70: cfa9 dabc b9a7 eb41 b7a7 d7b7 92fe 32f2  .......A......2.
-00070b80: 5d13 284b dd09 b3b5 9109 bf4e e24c 60b6  ].(K.......N.L`.
-00070b90: b234 29a3 7811 fce3 f0b9 d22d 621d 0f57  .4).x......-b..W
-00070ba0: 056f 0643 b1ab 8d08 eca3 5096 9e89 bf31  .o.C......P....1
-00070bb0: 8a48 b051 1353 a85f 590c 790d d851 7def  .H.Q.S._Y.y..Q}.
-00070bc0: 29b7 97bf 79a7 5064 a41d d1c0 d550 a178  )...y.Pd.....P.x
-00070bd0: 73e7 5b80 bfff ffff ffff ffff ffff ffff  s.[.............
+0006ff60: 6114 4c95 7ae8 23b7 8a72 d3c2 759b f203  a.L.z.#..r..u...
+0006ff70: 6cb4 4384 bc05 85ed 839b 2336 c31a 63c3  l.C.......#6..c.
+0006ff80: 1f24 ec5a d6aa 51df 668e a38f 223f 6ced  .$.Z..Q.f..."?l.
+0006ff90: c04c 9a27 b4f9 2468 a88b 20f6 9490 9431  .L.'..$h.. ....1
+0006ffa0: 1f76 4318 4dfd 56bd e3bd 8afb 0879 271f  .vC.M.V......y'.
+0006ffb0: c46b 5a94 0387 8e88 74ae e53f e8bf 7576  .kZ.....t..?..uv
+0006ffc0: ee50 4e38 effd 42bf 9e68 44ad b0a3 9848  .PN8..B..hD....H
+0006ffd0: 120d df16 1e3e c835 e9c0 f00a 7a0e 13c2  .....>.5....z...
+0006ffe0: 599a cc6d 30db 7023 66f4 c842 30fc 9f76  Y..m0.p#f..B0..v
+0006fff0: 428a 4af9 ca4c 8ce7 df82 3bba 3b9e 15b2  B.J..L....;.;...
+00070000: a5fa de60 f51e 7da7 bfd1 e594 8eee 8fe4  ...`..}.........
+00070010: 2283 3b7b 3472 4133 f76a 88a6 ac85 6e7d  ".;{4rA3.j....n}
+00070020: 0fe8 4cf0 80a7 788b 29a0 a726 892d c79d  ..L...x.)..&.-..
+00070030: da95 6de5 efa8 0bfa a9f4 494c 86f2 fb66  ..m.......IL...f
+00070040: 6a25 4321 f60d b970 26a2 ba27 e012 6d64  j%C!...p&..'..md
+00070050: ecb6 6a8f 1bdf 781b bcb2 17dc 06ae 06ac  ..j...x.........
+00070060: 3165 7f9d b4ac ffab 9b1e 434f f88d 0a1f  1e........CO....
+00070070: c9d9 506a a62e 4a6a 67bb 3b2d 7090 7101  ..Pj..Jjg.;-p.q.
+00070080: 8f1e 484c b0d7 ed01 c80f ddcd 7be3 31f0  ..HL........{.1.
+00070090: b2f9 6ce2 bf03 1347 1680 160b b129 a358  ..l....G.....).X
+000700a0: f477 fa74 21cb d49b f6a6 282e 20f0 e424  .w.t!.....(. ..$
+000700b0: 3700 5e7c ed6c 6d4a 4fdc 828b 363b 5035  7.^|.lmJO...6;P5
+000700c0: 736a 16a7 eb84 772b 10a7 98ff a568 b3e6  sj....w+.....h..
+000700d0: e48e eb90 80cb cf71 d554 2a67 2f54 1b50  .......q.T*g/T.P
+000700e0: df16 2fba 6dab 8e5b 4e84 be25 e544 284f  ../.m..[N..%.D(O
+000700f0: 4f90 7fef 1fb0 ad11 e10a f198 c2a8 d5d2  O...............
+00070100: b9ba 54cc 39b4 ec4f a6b0 9165 0280 b7b3  ..T.9..O...e....
+00070110: 400c 3a49 1e0e 80b4 5b2d de83 052e 6210  @.:I....[-....b.
+00070120: 2636 c236 5bab 8907 4fdd c574 2efd be0c  &6.6[...O..t....
+00070130: 3901 267f 44f7 adad 888b 3989 d29f 7931  9.&.D.....9...y1
+00070140: ae0f 75a0 e8f6 1126 9cf8 a380 64ce 7560  ..u....&....d.u`
+00070150: de18 2bd5 e854 ad4a 48f1 3bda b40d a7e8  ..+..T.JH.;.....
+00070160: 1c7d 5157 7a1c 53e3 61a2 2124 6991 eb5f  .}QWz.S.a.!$i.._
+00070170: de69 9dc5 a25b 8e85 74cf 1f48 73dc 1409  .i...[..t..Hs...
+00070180: 1d64 547e b068 dbe2 8bed 9aa0 f299 5bf8  .dT~.h........[.
+00070190: 288b fc56 c486 7b65 b70d 8bdf c27b d518  (..V..{e.....{..
+000701a0: ac30 2a90 f4fe aed4 8a85 8dd7 155c 2220  .0*..........\" 
+000701b0: 7db6 db33 cb7e 87dc 37c7 cee1 c51f fdae  }..3.~..7.......
+000701c0: 224a 8687 bb13 0426 b255 42bc 5ef4 5bad  "J.....&.UB.^.[.
+000701d0: c8b9 cac7 1e18 a909 d6a5 baf9 f2ab 4228  ..............B(
+000701e0: ec7b f9fb 1d55 b1c5 fa0a eeec 9076 c120  .{...U.......v. 
+000701f0: 9ce9 b9a4 1d81 3578 c1e6 6c58 6786 1589  ......5x..lXg...
+00070200: 2502 fe92 bbda da64 5cfb 00c8 2b58 ed0a  %......d\...+X..
+00070210: d495 d639 e53f c260 1e9e b51e 735c 9141  ...9.?.`....s\.A
+00070220: 73ba 9c54 150d a715 b34e 19b4 3eaf 97c2  s..T.....N..>...
+00070230: 96a4 b445 0881 9dfa aaa3 7c07 e3d5 14f3  ...E......|.....
+00070240: 2f32 205f 685c d83e b787 aff4 5043 dd0b  /2 _h\.>....PC..
+00070250: a14a b9d6 82c1 1967 1dd4 d9ba 215d 9fee  .J.....g....!]..
+00070260: dc48 67e1 59f6 6507 6159 6666 2d96 4162  .Hg.Y.e.aYff-.Ab
+00070270: 76d6 f9ae c6ef 0c1e 4cdd 72ca c65b 6b23  v.......L.r..[k#
+00070280: 0058 f675 1e4d 069f 1428 3733 9304 5f4f  .X.u.M...(73.._O
+00070290: 5f91 3422 91c7 d904 af1b a92c fced d5ec  _.4".......,....
+000702a0: bac9 e36c 8f19 bd95 0e0c 8cfd 7c01 f79e  ...l........|...
+000702b0: af51 6156 43d4 ff2e 307c 2089 0ed1 7f89  .QaVC...0| .....
+000702c0: 1a52 2b3c 53b8 1e1a 4673 b699 e423 f8ca  .R+<S...Fs...#..
+000702d0: 3fae fd1c 11a6 5091 21cd 1fbb d0e0 5af9  ?.....P.!.....Z.
+000702e0: b125 7085 2f92 c42a 6353 59f6 c176 c511  .%p./..*cSY..v..
+000702f0: b582 6ffe bf25 8431 d772 4309 f3bc 03c9  ..o..%.1.rC.....
+00070300: cedb a6f6 7cf7 1f58 1f67 e362 c9ee 08b8  ....|..X.g.b....
+00070310: af7a c93e e3e8 a950 e964 3ec6 f51f 5b63  .z.>...P.d>...[c
+00070320: ca71 f868 f379 b679 94e7 200d 477d 969e  .q.h.y.y.. .G}..
+00070330: 246f d2ce f309 af46 5ed5 adc3 7850 54ca  $o.....F^...xPT.
+00070340: d779 0543 d77e 19c6 65b5 586e 60cf d087  .y.C.~..e.Xn`...
+00070350: 89c5 680c c988 61f4 a68d c87a 328c 9ae3  ..h...a....z2...
+00070360: 6497 8072 8a74 37ce 7a25 e949 4b5f 9f97  d..r.t7.z%.IK_..
+00070370: 69af 5bdd 3b15 a9c9 b2f4 e05e a6f4 b4db  i.[.;......^....
+00070380: e692 d4b5 6409 9660 7005 0a67 a4ea 68e6  ....d..`p..g..h.
+00070390: edcd 6b67 7cb3 b430 7b52 4d08 8a6d b8ad  ..kg|..0{RM..m..
+000703a0: 6b4e 7c48 8fe2 3c79 b675 f565 dd4f 31c8  kN|H..<y.u.e.O1.
+000703b0: 5b13 7ea7 d857 03db e55b f7d2 dc80 21ac  [.~..W...[....!.
+000703c0: 719a bc15 fced d4f1 b999 dbd2 0831 ae0c  q............1..
+000703d0: 69b1 dafc d2b8 f492 1475 3a4d 8b02 5aea  i........u:M..Z.
+000703e0: 51f7 c1d5 fe9a 6216 afd3 8d40 8f95 9b63  Q.....b....@...c
+000703f0: ee3f 06fb ae2c 3e72 96d4 bf4c afcb 793a  .?...,>r...L..y:
+00070400: 81c5 0072 6a58 7e81 bd4c d862 5169 aadb  ...rjX~..L.bQi..
+00070410: 65b9 63e3 6bc4 0dc5 25f3 7d53 305c d7e4  e.c.k...%.}S0\..
+00070420: efc8 66c2 cec4 88b7 c2ba e0df e8f0 32bb  ..f...........2.
+00070430: df37 5e1f f4a7 80f4 f53b ada0 24ea 9fe9  .7^......;..$...
+00070440: c654 5745 0668 4c1b 8140 ea01 63f7 5969  .TWE.hL..@..c.Yi
+00070450: ac5d e7fd 2b8e fe4b f77b e1ff cde0 ac79  .]..+..K.{.....y
+00070460: 1ac6 8d64 f241 cae6 b715 9615 8168 fc6b  ...d.A.......h.k
+00070470: 1bb8 677a 6dc1 4eb6 4fcb 283c 4a90 c497  ..gzm.N.O.(<J...
+00070480: 668c 9602 331f b07b 4d34 680b f02f c39e  f...3..{M4h../..
+00070490: fac1 0419 b70a fa67 69fb 524d b42f ceaa  .......gi.RM./..
+000704a0: 2884 e363 76b7 5397 1b45 b03b 5488 473a  (..cv.S..E.;T.G:
+000704b0: 2a3c 0867 40a6 fbb6 c9ea 6800 45c6 d4f1  *<.g@.....h.E...
+000704c0: 8e3f e88c 904a 94de e48b 0cfe 33da 5e32  .?...J......3.^2
+000704d0: c58e 9a5d 4c8f c89e b4ec 32d1 bfed 2b16  ...]L.....2...+.
+000704e0: 01c6 2add a963 1cbb 50d9 6763 f68c e465  ..*..c..P.gc...e
+000704f0: 7667 803c 0bcc ee94 8a91 8eed db4b 3011  vg.<.........K0.
+00070500: aa7b 53d7 bbf4 2a93 7c79 2be7 355f 77ca  .{S...*.|y+.5_w.
+00070510: 3275 9271 8dc7 42c9 5b75 7fe6 5770 1a7e  2u.q..B.[u..Wp.~
+00070520: e9cc 37d2 6044 bf73 2d80 19d1 701e 9627  ..7.`D.s-...p..'
+00070530: d92d cd52 0586 0e0d d265 89e5 082c 5824  .-.R.....e...,X$
+00070540: fb74 ee31 3106 78eb a969 f771 fa94 0d2d  .t.11.x..i.q...-
+00070550: cee1 3c3f e5fe e7aa d01d fe64 b57b ec95  ..<?.......d.{..
+00070560: 8753 c561 d35b 2815 9647 8690 93ed c5a0  .S.a.[(..G......
+00070570: dd38 f3ff 6ec6 a0bf 2af7 950d c971 f5fd  .8..n...*....q..
+00070580: 28ec 3ffa ee59 f4cc c31b 9d00 111d 8c07  (.?..Y..........
+00070590: e8f6 fb73 c052 b114 a326 ca92 b410 9b9c  ...s.R...&......
+000705a0: 8c9f 8b70 3cc9 86cc f0f5 143a 7560 c26c  ...p<......:u`.l
+000705b0: ab4c 2d65 ab7c 9f2b 18a7 03d6 4ef5 e805  .L-e.|.+....N...
+000705c0: e785 57ff 63c9 db48 c6f0 337a 0a1d 9c26  ..W.c..H..3z...&
+000705d0: e863 1c6b d132 71b8 47fe a7c9 39dd 100a  .c.k.2q.G...9...
+000705e0: 1bc1 9c7a e64f 40c9 95bf 8925 fe5f 0533  ...z.O@....%._.3
+000705f0: 53a3 6584 e385 6b84 655f 75de 6908 e0fe  S.e...k.e_u.i...
+00070600: f801 7baf 341e cb44 02fd 09cd b6d8 b1ed  ..{.4..D........
+00070610: c29b 9e43 dcf7 ce74 2dd6 cf55 2d34 d883  ...C...t-..U-4..
+00070620: 6508 25a6 f8cb ee58 7568 84f5 9a03 fd84  e.%....Xuh......
+00070630: 741a 0f30 0ff1 91a4 424f f900 bb20 f4d2  t..0....BO... ..
+00070640: e471 4ee7 b39e 2158 378b 8530 ddc0 4b46  .qN...!X7..0..KF
+00070650: 2da5 4170 6445 22af 6944 d536 264b b924  -.ApdE".iD.6&K.$
+00070660: 8dda 366e 8401 a7be 037a a75d 61b9 1a50  ..6n.....z.]a..P
+00070670: 7b18 6ed5 9596 6960 7882 85eb a291 d9f1  {.n...i`x.......
+00070680: 7c33 19ec 463f 43fd b308 09a2 d66a 2c29  |3..F?C......j,)
+00070690: 202b fce4 6dc8 44d9 1a50 42bc 28ac 4246   +..m.D..PB.(.BF
+000706a0: f476 bee2 471f b4f9 0266 fe8f af50 2169  .v..G....f...P!i
+000706b0: 6bd4 1712 9d20 4523 6f0d e10b baed 75e1  k.... E#o.....u.
+000706c0: 228e fb31 50ec 2fef ad2c c1d0 31bc bda3  "..1P./..,..1...
+000706d0: df71 7b32 bfb0 53c6 6c02 9d1b 35ce eff4  .q{2..S.l...5...
+000706e0: efa5 7379 47ec 52d8 03a7 b8ae 3035 76f4  ..syG.R.....05v.
+000706f0: c02f 651a dc2f 31bd ba2d d9e3 d9f3 c1a6  ./e../1..-......
+00070700: 28ad 66ce 4c47 1ce8 b156 4b21 074a 1d02  (.f.LG...VK!.J..
+00070710: cdf6 17ac a695 4781 e39a 4be5 3652 4991  ......G...K.6RI.
+00070720: dff6 f3e0 8425 244f 958c 13c2 c1a2 3030  .....%$O......00
+00070730: cea4 5f5b 30e9 007c de84 b450 65de 60b6  .._[0..|...Pe.`.
+00070740: 46a3 c472 c42f 8b2b 2fef 52c2 4c2a 257b  F..r./.+/.R.L*%{
+00070750: cf01 e34a b87e 1627 2d6f 2d50 ea35 da87  ...J.~.'-o-P.5..
+00070760: 90cc 9190 bcea 9441 fd8f 139d d24c 566c  .......A.....LVl
+00070770: 9087 c10c ca6f f72b f45e 729f 4c95 132e  .....o.+.^r.L...
+00070780: b888 1134 aa3a 7c75 8a7e 8281 6bc3 1f2d  ...4.:|u.~..k..-
+00070790: 6639 98b2 74b2 a83e 4883 8666 5c91 00df  f9..t..>H..f\...
+000707a0: b11c b71a e16a 88b8 c4cd fd81 15f5 2db4  .....j........-.
+000707b0: cc3b 7c76 6caa e371 97e5 654e 8bc6 f0a8  .;|vl..q..eN....
+000707c0: 856c afd7 2ddb 5b28 bf05 c180 61db 6d03  .l..-.[(....a.m.
+000707d0: 7aab f761 b22d ad1b d484 92e2 922b 4d53  z..a.-.......+MS
+000707e0: de58 284d 5635 c2a9 6807 ec3a 1f17 9756  .X(MV5..h..:...V
+000707f0: 30ed 9a9e 58f6 8f0c 2800 5d4d 443e 1efa  0...X...(.]MD>..
+00070800: ffe3 898e dc7d 9e3b 5127 abd6 d557 0c12  .....}.;Q'...W..
+00070810: 99f8 c5fd 084c b8fa 12d1 b4d3 98d8 5027  .....L........P'
+00070820: 2faa 92dc 7dc8 ab90 bae1 6c22 f54e 7ee2  /...}.....l".N~.
+00070830: 0b3f 1240 8161 2e90 63d4 ca0d 86f9 a09e  .?.@.a..c.......
+00070840: 22fa 92fd 12de 08d7 75c9 10e5 48e5 e876  ".......u...H..v
+00070850: 94b2 131b 6bf0 863a b638 c829 3413 6fef  ....k..:.8.)4.o.
+00070860: 5a0e d841 de1c 7e49 a3e9 0db3 3225 33a3  Z..A..~I....2%3.
+00070870: 4ecf 2706 14f5 8fa7 1426 012f 436a 078b  N.'......&./Cj..
+00070880: faf5 7fc4 b66d 9a8a 1981 6490 f2ff 36a8  .....m....d...6.
+00070890: bd9a c91b 8c6d d9dd f077 ae6d 21e2 cbbc  .....m...w.m!...
+000708a0: d460 468b ac73 4c42 0f59 b93b 25ec 0e18  .`F..sLB.Y.;%...
+000708b0: 1e0e 7225 8d19 28eb 538e 53fb 91b5 9b5d  ..r%..(.S.S....]
+000708c0: 04c9 0190 e386 7332 7361 9fb1 88ff d3a7  ......s2sa......
+000708d0: 4970 e336 96f7 7788 fb04 1f6c 8770 5dda  Ip.6..w....l.p].
+000708e0: fc13 1a7c 2932 b13f 7595 a945 95ec aa3c  ...|)2.?u..E...<
+000708f0: 3424 2b35 c114 4695 8166 9dab 33ab c5cb  4$+5..F..f..3...
+00070900: cdb2 d68c 3795 ad0b 6082 3a5e 1628 cd55  ....7...`.:^.(.U
+00070910: d098 0271 7877 71d2 fbac 2651 a7c2 2c03  ...qxwq...&Q..,.
+00070920: 9e70 c981 9bc1 3150 4e4f 1d16 b337 a536  .p....1PNO...7.6
+00070930: d84b 91cf fb85 6767 296a 2a17 2df3 9102  .K....gg)j*.-...
+00070940: d878 f459 e0c4 46f4 7be6 4c02 0aa9 1437  .x.Y..F.{.L....7
+00070950: 2309 8c1c 5514 9dd6 7d6b 7685 47e8 2981  #...U...}kv.G.).
+00070960: ed76 6b58 dcfd f38b a953 944d 3440 a264  .vkX.....S.M4@.d
+00070970: c5dd ee91 ee8f 943a e0d5 cc24 e6dc cad2  .......:...$....
+00070980: 6474 ce72 6cfe a220 93d9 c7b0 ef96 e2e0  dt.rl.. ........
+00070990: d513 aebd fd68 5c3c c80b c535 d947 a366  .....h\<...5.G.f
+000709a0: ff86 e5f3 feb6 7ed7 12cb e402 d4f3 b9f3  ......~.........
+000709b0: 814e 2524 7bc9 c964 4615 832f 8001 10c2  .N%${..dF../....
+000709c0: 2fd0 de01 c17a 86bb e0e7 65bb c093 ac5d  /....z....e....]
+000709d0: 6642 5ba8 45f7 7ede 3575 5ac9 899b 66b6  fB[.E.~.5uZ...f.
+000709e0: aa6c d783 5b67 5609 cc65 b714 4c85 5a39  .l..[gV..e..L.Z9
+000709f0: 16ff 7157 269e 17c6 79f6 0a81 6610 d93b  ..qW&...y...f..;
+00070a00: 986b 938f 55d7 d0db 2473 d4df 31be 0001  .k..U...$s..1...
+00070a10: d831 8307 a45e 73c8 de87 c463 9bc2 5eea  .1...^s....c..^.
+00070a20: a4a5 037a cfd6 f975 adf2 97f4 afe1 de74  ...z...u.......t
+00070a30: 6a66 fc72 199c 30eb 87bb 7848 7420 c205  jf.r..0...xHt ..
+00070a40: 78b7 3646 6fca 8f97 1258 f626 67d5 4cde  x.6Fo....X.&g.L.
+00070a50: 8924 757d 2703 e32c f5be 62af 69e6 86b7  .$u}'..,..b.i...
+00070a60: a8f3 4b49 6c92 4f7d e0d2 834e c2ff b439  ..KIl.O}...N...9
+00070a70: 4736 4dfe 7eba b16d a7f8 dc83 8f83 3d2c  G6M.~..m......=,
+00070a80: 741b 0c0b fb71 c4ce d63c 3796 3b7f 3c54  t....q...<7.;.<T
+00070a90: 63fd 4e79 2ed2 a8c4 4007 b066 2ab1 0239  c.Ny....@..f*..9
+00070aa0: 8d31 7d19 3944 1aad 0ab2 6293 8eb9 5265  .1}.9D....b...Re
+00070ab0: 3c8d cee8 3c4e b1ae 8384 fb80 c5b5 193f  <...<N.........?
+00070ac0: 73a0 4260 8094 c456 67e9 f1da e2d3 06e4  s.B`...Vg.......
+00070ad0: b82e cd05 d43d eebf b045 0ebb 0abd 9c1e  .....=...E......
+00070ae0: 32db a7c4 23a4 1830 24f2 6658 45ff 3cb5  2...#..0$.fXE.<.
+00070af0: 8919 780d bb9e 4446 7c67 a08a a5d7 f1d0  ..x...DF|g......
+00070b00: 4783 c8cc a447 a695 7d79 e652 dbee da54  G....G..}y.R...T
+00070b10: 5abd 50c0 93ed 41fa 1c58 4504 2b9e 4518  Z.P...A..XE.+.E.
+00070b20: 36e8 fbaa 4c84 b098 04d0 eb2f 3795 6980  6...L....../7.i.
+00070b30: 9673 dd11 4694 838f 2a8a f02a 1588 3b11  .s..F...*..*..;.
+00070b40: b958 cdda 87cd 0ecf 2a87 5add 7592 960d  .X......*.Z.u...
+00070b50: af42 28fa 6c11 8e63 7c18 0c57 e973 0960  .B(.l..c|..W.s.`
+00070b60: d5c8 e3b8 df9d 4d40 bc9f 8601 44f2 ef48  ......M@....D..H
+00070b70: 1b9b 02c3 7a66 0754 7d4f 26ac 7d1c b087  ....zf.T}O&.}...
+00070b80: ef6d e440 f524 956f 59db c35f 50d4 b0b0  .m.@.$.oY.._P...
+00070b90: 77df 3d92 4d1f 3fad c054 6257 9b69 52fb  w.=.M.?..TbW.iR.
+00070ba0: 1cb0 2372 4c92 4473 6de5 9a3e 0776 09f6  ..#rL.Dsm..>.v..
+00070bb0: ed19 7c61 9ca1 4f4b 4c72 8f52 9b54 51f4  ..|a..OKLr.R.TQ.
+00070bc0: 1678 4607 f925 bde5 fb5c 5b60 d9ff f653  .xF..%...\[`...S
+00070bd0: c3ed cc02 362c 27b8 88c1 b64e ffff ffff  ....6,'....N....
 00070be0: ffff ffff ffff ffff ffff ffff ffff ffff  ................
 00070bf0: ffff ffff ffff ffff ffff ffff ffff ffff  ................
 00070c00: 4c41 5243 4849 5645 0000 02d4 0000 0050  LARCHIVE.......P
 00070c10: 0000 0000 0000 0024 7265 7669 7369 6f6e  .......$revision
 00070c20: 0000 0000 2f2a 2062 7569 6c64 2073 7973  ..../* build sys
 00070c30: 7465 6d20 6465 6669 6e69 7469 6f6e 7320  tem definitions 
 00070c40: 2861 7574 6f67 656e 6572 6174 6564 2920  (autogenerated)
tlaurion commented 5 months ago

cbfstool above fails. Needs investigation :/

tlaurion commented 5 months ago

But points to romstage being different which is still a start

JonathonHall-Purism commented 5 months ago

@tlaurion TL;DR - CI seems to lack the v5.0.1 tag (and possibly others), causing git describe --tags --abbrev=7 --dirty to produce a different version.

If you pick apart the coreboot stages, that appears to be the only difference (with #1630). E.g.:

$ diff -u <(xxd ci/cbfs/fallback/romstage) <(xxd local_clean/cbfs/fallback/romstage)
--- /dev/fd/63  2024-04-08 13:50:28.844606505 -0400
+++ /dev/fd/62  2024-04-08 13:50:28.844606505 -0400
@@ -2067,8 +2067,8 @@
 00008120: dc2e 02ff 382d 02ff 0000 00b0 5468 7520  ....8-......Thu 
 00008130: 4a61 6e20 3031 2030 303a 3030 3a30 3020  Jan 01 00:00:00 
 00008140: 5554 4320 3139 3730 0066 9090 2d48 6561  UTC 1970.f..-Hea
-00008150: 6473 2d76 302e 322e 302d 3230 3530 2d67  ds-v0.2.0-2050-g
-00008160: 3832 3038 6338 3600 2d54 494d 454c 4553  8208c86.-TIMELES
+00008150: 6473 2d76 352e 302e 312d 3939 382d 6738  ds-v5.0.1-998-g8
+00008160: 3230 3863 3836 0090 2d54 494d 454c 4553  208c86..-TIMELES
 00008170: 532d 2d4c 4553 5354 494d 452d 0066 9090  S--LESSTIME-.f..
 00008180: 5145 4d55 0066 9090 0000 1000 0000 2000  QEMU.f........ .
 00008190: 0000 8000 6690 6690 b896 0100 0040 0000  ....f.f......@..

There is also still a difference in Busybox affecting the initrd also, have not looked into that.

One option could be to get CircleCI to sync the tags if that's possible. Or we could stop setting a version based on tags - Heads isn't tagging any releases anyway, but I do tag downstream PureBoot releases and might still want the tag in the version downstream.

There could be a middle ground where we only use the tag if it's pointing to this commit (never tag+commit height), but that doesn't seem to be something git-describe will readily do, we'd have to do it ourselves.

tlaurion commented 5 months ago

Let's revisit once #1630 is merged.

JonathonHall-Purism commented 5 months ago

Deleting the v5.0.1 tag from our local repos and the tlaurion fork fixed these issues - @tlaurion I think we can close this