diff options
66 files changed, 194 insertions, 62 deletions
diff --git a/config/data/uefitool/build.list b/config/data/uefitool/build.list new file mode 100644 index 00000000..2c59bb50 --- /dev/null +++ b/config/data/uefitool/build.list @@ -0,0 +1 @@ +uefiextract diff --git a/config/submodule/coreboot/coreboot413/vboot/module.cfg b/config/submodule/coreboot/coreboot413/vboot/module.cfg index 42e3835d..34656ba9 100644 --- a/config/submodule/coreboot/coreboot413/vboot/module.cfg +++ b/config/submodule/coreboot/coreboot413/vboot/module.cfg @@ -1,3 +1,3 @@ subrepo="https://review.coreboot.org/vboot.git" subrepo_bkup="https://github.com/coreboot/vboot" -subrev="4c523ed10f25de872ac0513ebd6ca53d3970b9de" +subhash="4c523ed10f25de872ac0513ebd6ca53d3970b9de" diff --git a/config/submodule/coreboot/default/R06_28_23.tar.gz/module.cfg b/config/submodule/coreboot/default/R06_28_23.tar.gz/module.cfg new file mode 100644 index 00000000..71ab78bc --- /dev/null +++ b/config/submodule/coreboot/default/R06_28_23.tar.gz/module.cfg @@ -0,0 +1,3 @@ +subfile="https://www.mirrorservice.org/sites/libreboot.org/release/misc/acpica/R06_28_23.tar.gz" +subfile_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/acpica/R06_28_23.tar.gz" +subhash="d64091202866cd306fef08bbf95b585584331704fdbe5ef0bfa99c8f9cb188e51a52880625c8d6bc971b3d251c8b13686b43a013058cadda861efe09b219c1b0" diff --git a/config/submodule/coreboot/default/arm-trusted-firmware/module.cfg b/config/submodule/coreboot/default/arm-trusted-firmware/module.cfg index ccf35b1b..3fb78c02 100644 --- a/config/submodule/coreboot/default/arm-trusted-firmware/module.cfg +++ b/config/submodule/coreboot/default/arm-trusted-firmware/module.cfg @@ -1,3 +1,3 @@ subrepo="https://review.coreboot.org/arm-trusted-firmware.git" subrepo_bkup="https://github.com/coreboot/arm-trusted-firmware" -subrev="23d6774ab53ded09d8065a184b4763504e9c8d9e" +subhash="23d6774ab53ded09d8065a184b4763504e9c8d9e" diff --git a/config/submodule/coreboot/default/binutils-2.41.tar.xz/module.cfg b/config/submodule/coreboot/default/binutils-2.41.tar.xz/module.cfg new file mode 100644 index 00000000..eb2d01b1 --- /dev/null +++ b/config/submodule/coreboot/default/binutils-2.41.tar.xz/module.cfg @@ -0,0 +1,3 @@ +subfile="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/binutils/binutils-2.41.tar.xz" +subfile_bkup="https://ftp.nluug.nl/pub/gnu/binutils/binutils-2.41.tar.xz" +subhash="5df45d0bd6ddabdce4f35878c041e46a92deef01e7dea5facc97fd65cc06b59abc6fba0eb454b68e571c7e14038dc823fe7f2263843e6e627b7444eaf0fe9374" diff --git a/config/submodule/coreboot/default/gcc-13.2.0.tar.xz/module.cfg b/config/submodule/coreboot/default/gcc-13.2.0.tar.xz/module.cfg new file mode 100644 index 00000000..dbcc0805 --- /dev/null +++ b/config/submodule/coreboot/default/gcc-13.2.0.tar.xz/module.cfg @@ -0,0 +1,3 @@ +subfile="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gcc/gcc-13.2.0/gcc-13.2.0.tar.xz" +subfile_bkup="https://ftp.nluug.nl/pub/gnu/gcc/gcc-13.2.0/gcc-13.2.0.tar.xz" +subhash="d99e4826a70db04504467e349e9fbaedaa5870766cda7c5cab50cdebedc4be755ebca5b789e1232a34a20be1a0b60097de9280efe47bdb71c73251e30b0862a2" diff --git a/config/submodule/coreboot/default/gmp-6.3.0.tar.xz/module.cfg b/config/submodule/coreboot/default/gmp-6.3.0.tar.xz/module.cfg new file mode 100644 index 00000000..fe274faf --- /dev/null +++ b/config/submodule/coreboot/default/gmp-6.3.0.tar.xz/module.cfg @@ -0,0 +1,3 @@ +subfile="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gmp/gmp-6.3.0.tar.xz" +subfile_bkup="https://ftp.nluug.nl/pub/gnu/gmp/gmp-6.3.0.tar.xz" +subhash="e85a0dab5195889948a3462189f0e0598d331d3457612e2d3350799dba2e244316d256f8161df5219538eb003e4b5343f989aaa00f96321559063ed8c8f29fd2" diff --git a/config/submodule/coreboot/default/intel-microcode/module.cfg b/config/submodule/coreboot/default/intel-microcode/module.cfg index a115badf..05a174b0 100644 --- a/config/submodule/coreboot/default/intel-microcode/module.cfg +++ b/config/submodule/coreboot/default/intel-microcode/module.cfg @@ -1,3 +1,3 @@ subrepo="https://review.coreboot.org/intel-microcode.git" subrepo_bkup="https://github.com/coreboot/intel-microcode" -subrev="ece0d294a29a1375397941a4e6f2f7217910bc89" +subhash="ece0d294a29a1375397941a4e6f2f7217910bc89" diff --git a/config/submodule/coreboot/default/libgfxinit/module.cfg b/config/submodule/coreboot/default/libgfxinit/module.cfg index c3db628b..7e2536f9 100644 --- a/config/submodule/coreboot/default/libgfxinit/module.cfg +++ b/config/submodule/coreboot/default/libgfxinit/module.cfg @@ -1,3 +1,3 @@ subrepo="https://review.coreboot.org/libgfxinit.git" subrepo_bkup="https://github.com/coreboot/libgfxinit" -subrev="a4be8a21b0e2c752da0042c79aae5942418f53e2" +subhash="a4be8a21b0e2c752da0042c79aae5942418f53e2" diff --git a/config/submodule/coreboot/default/libhwbase/module.cfg b/config/submodule/coreboot/default/libhwbase/module.cfg index 7996007e..2937b8b7 100644 --- a/config/submodule/coreboot/default/libhwbase/module.cfg +++ b/config/submodule/coreboot/default/libhwbase/module.cfg @@ -1,3 +1,3 @@ subrepo="https://review.coreboot.org/libhwbase.git" subrepo_bkup="https://github.com/coreboot/libhwbase" -subrev="584629b9f4771b7618951cec57df2ca3af9c6981" +subhash="584629b9f4771b7618951cec57df2ca3af9c6981" diff --git a/config/submodule/coreboot/default/module.list b/config/submodule/coreboot/default/module.list index b0cdf195..85fdafa5 100644 --- a/config/submodule/coreboot/default/module.list +++ b/config/submodule/coreboot/default/module.list @@ -3,3 +3,10 @@ 3rdparty/libgfxinit 3rdparty/libhwbase 3rdparty/vboot +util/crossgcc/tarballs/binutils-2.41.tar.xz +util/crossgcc/tarballs/gcc-13.2.0.tar.xz +util/crossgcc/tarballs/gmp-6.3.0.tar.xz +util/crossgcc/tarballs/mpc-1.3.1.tar.gz +util/crossgcc/tarballs/mpfr-4.2.1.tar.xz +util/crossgcc/tarballs/nasm-2.16.01.tar.bz2 +util/crossgcc/tarballs/R06_28_23.tar.gz diff --git a/config/submodule/coreboot/default/mpc-1.3.1.tar.gz/module.cfg b/config/submodule/coreboot/default/mpc-1.3.1.tar.gz/module.cfg new file mode 100644 index 00000000..f98b6444 --- /dev/null +++ b/config/submodule/coreboot/default/mpc-1.3.1.tar.gz/module.cfg @@ -0,0 +1,3 @@ +subfile="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/mpc/mpc-1.3.1.tar.gz" +subfile_bkup="https://ftp.nluug.nl/pub/gnu/mpc/mpc-1.3.1.tar.gz" +subhash="4bab4ef6076f8c5dfdc99d810b51108ced61ea2942ba0c1c932d624360a5473df20d32b300fc76f2ba4aa2a97e1f275c9fd494a1ba9f07c4cb2ad7ceaeb1ae97" diff --git a/config/submodule/coreboot/default/mpfr-4.2.1.tar.xz/module.cfg b/config/submodule/coreboot/default/mpfr-4.2.1.tar.xz/module.cfg new file mode 100644 index 00000000..3419bc30 --- /dev/null +++ b/config/submodule/coreboot/default/mpfr-4.2.1.tar.xz/module.cfg @@ -0,0 +1,3 @@ +subfile="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/mpfr/mpfr-4.2.1.tar.xz" +subfile_bkup="https://ftp.nluug.nl/pub/gnu/mpfr/mpfr-4.2.1.tar.xz" +subhash="bc68c0d755d5446403644833ecbb07e37360beca45f474297b5d5c40926df1efc3e2067eecffdf253f946288bcca39ca89b0613f545d46a9e767d1d4cf358475" diff --git a/config/submodule/coreboot/default/nasm-2.16.01.tar.bz2/module.cfg b/config/submodule/coreboot/default/nasm-2.16.01.tar.bz2/module.cfg new file mode 100644 index 00000000..53f022b4 --- /dev/null +++ b/config/submodule/coreboot/default/nasm-2.16.01.tar.bz2/module.cfg @@ -0,0 +1,3 @@ +subfile="https://www.nasm.us/pub/nasm/releasebuilds/2.16.01/nasm-2.16.01.tar.bz2" +subfile_bkup="https://www.mirrorservice.org/sites/distfiles.macports.org/nasm/nasm-2.16.01.tar.bz2" +subhash="daecc50d0c04cfa1e8a09bbece808548478fc03834b0c3fb06a9da56d3b51697e2d09a469cef8a4761290cdfc65e0eb46d76b6ca11dfa1dcd1051882c5e7fd88" diff --git a/config/submodule/coreboot/default/vboot/module.cfg b/config/submodule/coreboot/default/vboot/module.cfg index 53306d64..9a23ee96 100644 --- a/config/submodule/coreboot/default/vboot/module.cfg +++ b/config/submodule/coreboot/default/vboot/module.cfg @@ -1,3 +1,3 @@ subrepo="https://review.coreboot.org/vboot.git" subrepo_bkup="https://github.com/coreboot/vboot" -subrev="3d37d2aafe1f941c532def2a1fbbb58c8dd84182" +subhash="3d37d2aafe1f941c532def2a1fbbb58c8dd84182" diff --git a/config/submodule/coreboot/dell/intel-microcode/module.cfg b/config/submodule/coreboot/dell/intel-microcode/module.cfg index a115badf..05a174b0 100644 --- a/config/submodule/coreboot/dell/intel-microcode/module.cfg +++ b/config/submodule/coreboot/dell/intel-microcode/module.cfg @@ -1,3 +1,3 @@ subrepo="https://review.coreboot.org/intel-microcode.git" subrepo_bkup="https://github.com/coreboot/intel-microcode" -subrev="ece0d294a29a1375397941a4e6f2f7217910bc89" +subhash="ece0d294a29a1375397941a4e6f2f7217910bc89" diff --git a/config/submodule/coreboot/dell/libgfxinit/module.cfg b/config/submodule/coreboot/dell/libgfxinit/module.cfg index c3db628b..7e2536f9 100644 --- a/config/submodule/coreboot/dell/libgfxinit/module.cfg +++ b/config/submodule/coreboot/dell/libgfxinit/module.cfg @@ -1,3 +1,3 @@ subrepo="https://review.coreboot.org/libgfxinit.git" subrepo_bkup="https://github.com/coreboot/libgfxinit" -subrev="a4be8a21b0e2c752da0042c79aae5942418f53e2" +subhash="a4be8a21b0e2c752da0042c79aae5942418f53e2" diff --git a/config/submodule/coreboot/dell/libhwbase/module.cfg b/config/submodule/coreboot/dell/libhwbase/module.cfg index 7996007e..2937b8b7 100644 --- a/config/submodule/coreboot/dell/libhwbase/module.cfg +++ b/config/submodule/coreboot/dell/libhwbase/module.cfg @@ -1,3 +1,3 @@ subrepo="https://review.coreboot.org/libhwbase.git" subrepo_bkup="https://github.com/coreboot/libhwbase" -subrev="584629b9f4771b7618951cec57df2ca3af9c6981" +subhash="584629b9f4771b7618951cec57df2ca3af9c6981" diff --git a/config/submodule/coreboot/dell/vboot/module.cfg b/config/submodule/coreboot/dell/vboot/module.cfg index 53306d64..9a23ee96 100644 --- a/config/submodule/coreboot/dell/vboot/module.cfg +++ b/config/submodule/coreboot/dell/vboot/module.cfg @@ -1,3 +1,3 @@ subrepo="https://review.coreboot.org/vboot.git" subrepo_bkup="https://github.com/coreboot/vboot" -subrev="3d37d2aafe1f941c532def2a1fbbb58c8dd84182" +subhash="3d37d2aafe1f941c532def2a1fbbb58c8dd84182" diff --git a/config/submodule/coreboot/fam15h_rdimm/acpica-unix2-20190703.tar.gz/module.cfg b/config/submodule/coreboot/fam15h_rdimm/acpica-unix2-20190703.tar.gz/module.cfg new file mode 100644 index 00000000..e839b77e --- /dev/null +++ b/config/submodule/coreboot/fam15h_rdimm/acpica-unix2-20190703.tar.gz/module.cfg @@ -0,0 +1,3 @@ +subfile="https://www.mirrorservice.org/sites/libreboot.org/release/misc/acpica/acpica-unix2-20190703.tar.gz" +subfile_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/acpica/acpica-unix2-20190703.tar.gz" +subhash="8445a6d354ce3bcbfb5159f4ec0312b1e910c0b1b2033a2300f892e4ac580abab4e3f5b4ded379f0036299359d307330511ab7053678cfd9031d7df4c365f555" diff --git a/config/submodule/coreboot/fam15h_rdimm/binutils-2.32.tar.xz/module.cfg b/config/submodule/coreboot/fam15h_rdimm/binutils-2.32.tar.xz/module.cfg new file mode 100644 index 00000000..b549e139 --- /dev/null +++ b/config/submodule/coreboot/fam15h_rdimm/binutils-2.32.tar.xz/module.cfg @@ -0,0 +1,3 @@ +subfile="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/binutils/binutils-2.32.tar.xz" +subfile_bkup="https://ftp.nluug.nl/pub/gnu/binutils/binutils-2.32.tar.xz" +subhash="d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a" diff --git a/config/submodule/coreboot/fam15h_rdimm/blobs/module.cfg b/config/submodule/coreboot/fam15h_rdimm/blobs/module.cfg index c7ae4683..215caf4d 100644 --- a/config/submodule/coreboot/fam15h_rdimm/blobs/module.cfg +++ b/config/submodule/coreboot/fam15h_rdimm/blobs/module.cfg @@ -1,3 +1,3 @@ subrepo="https://review.coreboot.org/blobs.git" subrepo_bkup="https://github.com/coreboot/blobs" -subrev="034b27818450428f70aa9316c8bd0d65bacd8ee8" +subhash="034b27818450428f70aa9316c8bd0d65bacd8ee8" diff --git a/config/submodule/coreboot/fam15h_rdimm/gcc-8.3.0.tar.xz/module.cfg b/config/submodule/coreboot/fam15h_rdimm/gcc-8.3.0.tar.xz/module.cfg new file mode 100644 index 00000000..6ce00577 --- /dev/null +++ b/config/submodule/coreboot/fam15h_rdimm/gcc-8.3.0.tar.xz/module.cfg @@ -0,0 +1,3 @@ +subfile="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gcc/gcc-8.3.0/gcc-8.3.0.tar.xz" +subfile_bkup="https://ftp.nluug.nl/pub/gnu/gcc/gcc-8.3.0/gcc-8.3.0.tar.xz" +subhash="1811337ae3add9680cec64968a2509d085b6dc5b6783fc1e8c295e3e47416196fd1a3ad8dfe7e10be2276b4f62c357659ce2902f239f60a8648548231b4b5802" diff --git a/config/submodule/coreboot/fam15h_rdimm/gmp-6.1.2.tar.xz/module.cfg b/config/submodule/coreboot/fam15h_rdimm/gmp-6.1.2.tar.xz/module.cfg new file mode 100644 index 00000000..7caf1845 --- /dev/null +++ b/config/submodule/coreboot/fam15h_rdimm/gmp-6.1.2.tar.xz/module.cfg @@ -0,0 +1,3 @@ +subfile="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gmp/gmp-6.1.2.tar.xz" +subfile_bkup="https://ftp.nluug.nl/pub/gnu/gmp/gmp-6.1.2.tar.xz" +subhash="9f098281c0593b76ee174b722936952671fab1dae353ce3ed436a31fe2bc9d542eca752353f6645b7077c1f395ab4fdd355c58e08e2a801368f1375690eee2c6" diff --git a/config/submodule/coreboot/fam15h_rdimm/module.list b/config/submodule/coreboot/fam15h_rdimm/module.list index de2154e6..747c8912 100644 --- a/config/submodule/coreboot/fam15h_rdimm/module.list +++ b/config/submodule/coreboot/fam15h_rdimm/module.list @@ -1,2 +1,9 @@ 3rdparty/blobs 3rdparty/vboot +util/crossgcc/tarballs/acpica-unix2-20190703.tar.gz +util/crossgcc/tarballs/binutils-2.32.tar.xz +util/crossgcc/tarballs/gcc-8.3.0.tar.xz +util/crossgcc/tarballs/gmp-6.1.2.tar.xz +util/crossgcc/tarballs/mpc-1.1.0.tar.gz +util/crossgcc/tarballs/mpfr-4.0.2.tar.xz +util/crossgcc/tarballs/tarballs/nasm-2.14.02.tar.bz2 diff --git a/config/submodule/coreboot/fam15h_rdimm/mpc-1.1.0.tar.gz/module.cfg b/config/submodule/coreboot/fam15h_rdimm/mpc-1.1.0.tar.gz/module.cfg new file mode 100644 index 00000000..34e77772 --- /dev/null +++ b/config/submodule/coreboot/fam15h_rdimm/mpc-1.1.0.tar.gz/module.cfg @@ -0,0 +1,3 @@ +subfile="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/mpc/mpc-1.1.0.tar.gz" +subfile_bkup="https://ftp.nluug.nl/pub/gnu/mpc/mpc-1.1.0.tar.gz" +subhash="72d657958b07c7812dc9c7cbae093118ce0e454c68a585bfb0e2fa559f1bf7c5f49b93906f580ab3f1073e5b595d23c6494d4d76b765d16dde857a18dd239628" diff --git a/config/submodule/coreboot/fam15h_rdimm/mpfr-4.0.2.tar.xz/module.cfg b/config/submodule/coreboot/fam15h_rdimm/mpfr-4.0.2.tar.xz/module.cfg new file mode 100644 index 00000000..e33b1804 --- /dev/null +++ b/config/submodule/coreboot/fam15h_rdimm/mpfr-4.0.2.tar.xz/module.cfg @@ -0,0 +1,3 @@ +subfile="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/mpfr/mpfr-4.0.2.tar.xz" +subfile_bkup="https://ftp.nluug.nl/pub/gnu/mpfr/mpfr-4.0.2.tar.xz" +subhash="d583555d08863bf36c89b289ae26bae353d9a31f08ee3894520992d2c26e5683c4c9c193d7ad139632f71c0a476d85ea76182702a98bf08dde7b6f65a54f8b88" diff --git a/config/submodule/coreboot/fam15h_rdimm/nasm-2.14.02.tar.bz2/module.cfg b/config/submodule/coreboot/fam15h_rdimm/nasm-2.14.02.tar.bz2/module.cfg new file mode 100644 index 00000000..63cb78cf --- /dev/null +++ b/config/submodule/coreboot/fam15h_rdimm/nasm-2.14.02.tar.bz2/module.cfg @@ -0,0 +1,3 @@ +subfile="https://www.nasm.us/pub/nasm/releasebuilds/2.14.02/nasm-2.14.02.tar.bz2" +subfile_bkup="https://www.mirrorservice.org/sites/distfiles.macports.org/nasm/nasm-2.14.02.tar.bz2" +subhash="71e3d44736493b1a56d4230bc2e5519e858aaadde5d89a692f1472fad6755084460e36b42852707f4c862eff75d3f2c232aedcc4e61e9d9ffcc8c9ca6498292b" diff --git a/config/submodule/coreboot/fam15h_rdimm/vboot/module.cfg b/config/submodule/coreboot/fam15h_rdimm/vboot/module.cfg index 7a7ad3c6..5fac75c3 100644 --- a/config/submodule/coreboot/fam15h_rdimm/vboot/module.cfg +++ b/config/submodule/coreboot/fam15h_rdimm/vboot/module.cfg @@ -1,3 +1,3 @@ subrepo="https://review.coreboot.org/vboot.git" subrepo_bkup="https://github.com/coreboot/vboot" -subrev="ecdca931ae0637d1a9498f64862939bd5bb99e0b" +subhash="ecdca931ae0637d1a9498f64862939bd5bb99e0b" diff --git a/config/submodule/coreboot/fam15h_udimm/blobs/module.cfg b/config/submodule/coreboot/fam15h_udimm/blobs/module.cfg index c7ae4683..215caf4d 100644 --- a/config/submodule/coreboot/fam15h_udimm/blobs/module.cfg +++ b/config/submodule/coreboot/fam15h_udimm/blobs/module.cfg @@ -1,3 +1,3 @@ subrepo="https://review.coreboot.org/blobs.git" subrepo_bkup="https://github.com/coreboot/blobs" -subrev="034b27818450428f70aa9316c8bd0d65bacd8ee8" +subhash="034b27818450428f70aa9316c8bd0d65bacd8ee8" diff --git a/config/submodule/coreboot/fam15h_udimm/vboot/module.cfg b/config/submodule/coreboot/fam15h_udimm/vboot/module.cfg index 7a7ad3c6..5fac75c3 100644 --- a/config/submodule/coreboot/fam15h_udimm/vboot/module.cfg +++ b/config/submodule/coreboot/fam15h_udimm/vboot/module.cfg @@ -1,3 +1,3 @@ subrepo="https://review.coreboot.org/vboot.git" subrepo_bkup="https://github.com/coreboot/vboot" -subrev="ecdca931ae0637d1a9498f64862939bd5bb99e0b" +subhash="ecdca931ae0637d1a9498f64862939bd5bb99e0b" diff --git a/config/submodule/coreboot/haswell/R06_28_23.tar.gz/module.cfg b/config/submodule/coreboot/haswell/R06_28_23.tar.gz/module.cfg new file mode 100644 index 00000000..71ab78bc --- /dev/null +++ b/config/submodule/coreboot/haswell/R06_28_23.tar.gz/module.cfg @@ -0,0 +1,3 @@ +subfile="https://www.mirrorservice.org/sites/libreboot.org/release/misc/acpica/R06_28_23.tar.gz" +subfile_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/acpica/R06_28_23.tar.gz" +subhash="d64091202866cd306fef08bbf95b585584331704fdbe5ef0bfa99c8f9cb188e51a52880625c8d6bc971b3d251c8b13686b43a013058cadda861efe09b219c1b0" diff --git a/config/submodule/coreboot/haswell/binutils-2.42.tar.xz/module.cfg b/config/submodule/coreboot/haswell/binutils-2.42.tar.xz/module.cfg new file mode 100644 index 00000000..370a52ec --- /dev/null +++ b/config/submodule/coreboot/haswell/binutils-2.42.tar.xz/module.cfg @@ -0,0 +1,3 @@ +subfile="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/binutils/binutils-2.42.tar.xz" +subfile_bkup="https://ftp.nluug.nl/pub/gnu/binutils/binutils-2.42.tar.xz" +subhash="155f3ba14cd220102f4f29a4f1e5cfee3c48aa03b74603460d05afb73c70d6657a9d87eee6eb88bf13203fe6f31177a5c9addc04384e956e7da8069c8ecd20a6" diff --git a/config/submodule/coreboot/haswell/gcc-13.2.0.tar.xz/module.cfg b/config/submodule/coreboot/haswell/gcc-13.2.0.tar.xz/module.cfg new file mode 100644 index 00000000..dbcc0805 --- /dev/null +++ b/config/submodule/coreboot/haswell/gcc-13.2.0.tar.xz/module.cfg @@ -0,0 +1,3 @@ +subfile="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gcc/gcc-13.2.0/gcc-13.2.0.tar.xz" +subfile_bkup="https://ftp.nluug.nl/pub/gnu/gcc/gcc-13.2.0/gcc-13.2.0.tar.xz" +subhash="d99e4826a70db04504467e349e9fbaedaa5870766cda7c5cab50cdebedc4be755ebca5b789e1232a34a20be1a0b60097de9280efe47bdb71c73251e30b0862a2" diff --git a/config/submodule/coreboot/haswell/gmp-6.3.0.tar.xz/module.cfg b/config/submodule/coreboot/haswell/gmp-6.3.0.tar.xz/module.cfg new file mode 100644 index 00000000..fe274faf --- /dev/null +++ b/config/submodule/coreboot/haswell/gmp-6.3.0.tar.xz/module.cfg @@ -0,0 +1,3 @@ +subfile="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gmp/gmp-6.3.0.tar.xz" +subfile_bkup="https://ftp.nluug.nl/pub/gnu/gmp/gmp-6.3.0.tar.xz" +subhash="e85a0dab5195889948a3462189f0e0598d331d3457612e2d3350799dba2e244316d256f8161df5219538eb003e4b5343f989aaa00f96321559063ed8c8f29fd2" diff --git a/config/submodule/coreboot/haswell/intel-microcode/module.cfg b/config/submodule/coreboot/haswell/intel-microcode/module.cfg index 12b01372..90f7d273 100644 --- a/config/submodule/coreboot/haswell/intel-microcode/module.cfg +++ b/config/submodule/coreboot/haswell/intel-microcode/module.cfg @@ -1,3 +1,3 @@ subrepo="https://review.coreboot.org/intel-microcode.git" subrepo_bkup="https://github.com/coreboot/intel-microcode" -subrev="41af34500598418150aa298bb04e7edacc547897" +subhash="41af34500598418150aa298bb04e7edacc547897" diff --git a/config/submodule/coreboot/haswell/libgfxinit/module.cfg b/config/submodule/coreboot/haswell/libgfxinit/module.cfg index c3db628b..7e2536f9 100644 --- a/config/submodule/coreboot/haswell/libgfxinit/module.cfg +++ b/config/submodule/coreboot/haswell/libgfxinit/module.cfg @@ -1,3 +1,3 @@ subrepo="https://review.coreboot.org/libgfxinit.git" subrepo_bkup="https://github.com/coreboot/libgfxinit" -subrev="a4be8a21b0e2c752da0042c79aae5942418f53e2" +subhash="a4be8a21b0e2c752da0042c79aae5942418f53e2" diff --git a/config/submodule/coreboot/haswell/libhwbase/module.cfg b/config/submodule/coreboot/haswell/libhwbase/module.cfg index 7996007e..2937b8b7 100644 --- a/config/submodule/coreboot/haswell/libhwbase/module.cfg +++ b/config/submodule/coreboot/haswell/libhwbase/module.cfg @@ -1,3 +1,3 @@ subrepo="https://review.coreboot.org/libhwbase.git" subrepo_bkup="https://github.com/coreboot/libhwbase" -subrev="584629b9f4771b7618951cec57df2ca3af9c6981" +subhash="584629b9f4771b7618951cec57df2ca3af9c6981" diff --git a/config/submodule/coreboot/haswell/module.list b/config/submodule/coreboot/haswell/module.list index 3d968b1a..80e2cede 100644 --- a/config/submodule/coreboot/haswell/module.list +++ b/config/submodule/coreboot/haswell/module.list @@ -2,3 +2,10 @@ 3rdparty/libgfxinit 3rdparty/libhwbase 3rdparty/vboot +util/crossgcc/tarballs/binutils-2.42.tar.xz +util/crossgcc/tarballs/gcc-13.2.0.tar.xz +util/crossgcc/tarballs/gmp-6.3.0.tar.xz +util/crossgcc/tarballs/mpc-1.3.1.tar.gz +util/crossgcc/tarballs/mpfr-4.2.1.tar.xz +util/crossgcc/tarballs/nasm-2.16.01.tar.bz2 +util/crossgcc/tarballs/R06_28_23.tar.gz diff --git a/config/submodule/coreboot/haswell/mpc-1.3.1.tar.gz/module.cfg b/config/submodule/coreboot/haswell/mpc-1.3.1.tar.gz/module.cfg new file mode 100644 index 00000000..f98b6444 --- /dev/null +++ b/config/submodule/coreboot/haswell/mpc-1.3.1.tar.gz/module.cfg @@ -0,0 +1,3 @@ +subfile="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/mpc/mpc-1.3.1.tar.gz" +subfile_bkup="https://ftp.nluug.nl/pub/gnu/mpc/mpc-1.3.1.tar.gz" +subhash="4bab4ef6076f8c5dfdc99d810b51108ced61ea2942ba0c1c932d624360a5473df20d32b300fc76f2ba4aa2a97e1f275c9fd494a1ba9f07c4cb2ad7ceaeb1ae97" diff --git a/config/submodule/coreboot/haswell/mpfr-4.2.1.tar.xz/module.cfg b/config/submodule/coreboot/haswell/mpfr-4.2.1.tar.xz/module.cfg new file mode 100644 index 00000000..3419bc30 --- /dev/null +++ b/config/submodule/coreboot/haswell/mpfr-4.2.1.tar.xz/module.cfg @@ -0,0 +1,3 @@ +subfile="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/mpfr/mpfr-4.2.1.tar.xz" +subfile_bkup="https://ftp.nluug.nl/pub/gnu/mpfr/mpfr-4.2.1.tar.xz" +subhash="bc68c0d755d5446403644833ecbb07e37360beca45f474297b5d5c40926df1efc3e2067eecffdf253f946288bcca39ca89b0613f545d46a9e767d1d4cf358475" diff --git a/config/submodule/coreboot/haswell/nasm-2.16.01.tar.bz2/module.cfg b/config/submodule/coreboot/haswell/nasm-2.16.01.tar.bz2/module.cfg new file mode 100644 index 00000000..53f022b4 --- /dev/null +++ b/config/submodule/coreboot/haswell/nasm-2.16.01.tar.bz2/module.cfg @@ -0,0 +1,3 @@ +subfile="https://www.nasm.us/pub/nasm/releasebuilds/2.16.01/nasm-2.16.01.tar.bz2" +subfile_bkup="https://www.mirrorservice.org/sites/distfiles.macports.org/nasm/nasm-2.16.01.tar.bz2" +subhash="daecc50d0c04cfa1e8a09bbece808548478fc03834b0c3fb06a9da56d3b51697e2d09a469cef8a4761290cdfc65e0eb46d76b6ca11dfa1dcd1051882c5e7fd88" diff --git a/config/submodule/coreboot/haswell/vboot/module.cfg b/config/submodule/coreboot/haswell/vboot/module.cfg index a30a1cee..5ef2153c 100644 --- a/config/submodule/coreboot/haswell/vboot/module.cfg +++ b/config/submodule/coreboot/haswell/vboot/module.cfg @@ -1,3 +1,3 @@ subrepo="https://review.coreboot.org/vboot.git" subrepo_bkup="https://github.com/coreboot/vboot" -subrev="09fcd2184f9c714829503e84b8a7dfe7f2584e00" +subhash="09fcd2184f9c714829503e84b8a7dfe7f2584e00" diff --git a/config/submodule/coreboot/i945/R10_20_22.tar.gz/module.cfg b/config/submodule/coreboot/i945/R10_20_22.tar.gz/module.cfg new file mode 100644 index 00000000..3957836f --- /dev/null +++ b/config/submodule/coreboot/i945/R10_20_22.tar.gz/module.cfg @@ -0,0 +1,3 @@ +subfile="https://www.mirrorservice.org/sites/libreboot.org/release/misc/acpica/R10_20_22.tar.gz" +subfile_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/acpica/R10_20_22.tar.gz" +subhash="2ea1892383dfeae4b0fa089bb68aa397af644775496ce2a2f8f6ac7ebbb13de499c00ddb2608f427354f8e6f6e6d26cdeb162a7061458f8e6181fb2633e7c43e" diff --git a/config/submodule/coreboot/i945/binutils-2.37.tar.xz/module.cfg b/config/submodule/coreboot/i945/binutils-2.37.tar.xz/module.cfg new file mode 100644 index 00000000..c0565a0d --- /dev/null +++ b/config/submodule/coreboot/i945/binutils-2.37.tar.xz/module.cfg @@ -0,0 +1,3 @@ +subfile="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/binutils/binutils-2.37.tar.xz" +subfile_bkup="https://ftp.nluug.nl/pub/gnu/binutils/binutils-2.37.tar.xz" +subhash="5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7" diff --git a/config/submodule/coreboot/i945/gcc-11.2.0.tar.xz/module.cfg b/config/submodule/coreboot/i945/gcc-11.2.0.tar.xz/module.cfg new file mode 100644 index 00000000..fb925dc8 --- /dev/null +++ b/config/submodule/coreboot/i945/gcc-11.2.0.tar.xz/module.cfg @@ -0,0 +1,3 @@ +subfile="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gcc/gcc-11.2.0/gcc-11.2.0.tar.xz" +subfile_bkup="https://ftp.nluug.nl/pub/gnu/gcc/gcc-11.2.0/gcc-11.2.0.tar.xz" +subhash="d53a0a966230895c54f01aea38696f818817b505f1e2bfa65e508753fcd01b2aedb4a61434f41f3a2ddbbd9f41384b96153c684ded3f0fa97c82758d9de5c7cf" diff --git a/config/submodule/coreboot/i945/gmp-6.2.1.tar.xz/module.cfg b/config/submodule/coreboot/i945/gmp-6.2.1.tar.xz/module.cfg new file mode 100644 index 00000000..2b15cd44 --- /dev/null +++ b/config/submodule/coreboot/i945/gmp-6.2.1.tar.xz/module.cfg @@ -0,0 +1,3 @@ +subfile="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gmp/gmp-6.2.1.tar.xz" +subfile_bkup="https://ftp.nluug.nl/pub/gnu/gmp/gmp-6.2.1.tar.xz" +subhash="c99be0950a1d05a0297d65641dd35b75b74466f7bf03c9e8a99895a3b2f9a0856cd17887738fa51cf7499781b65c049769271cbcb77d057d2e9f1ec52e07dd84" diff --git a/config/submodule/coreboot/i945/intel-microcode/module.cfg b/config/submodule/coreboot/i945/intel-microcode/module.cfg index 07b2995a..6edc2d9f 100644 --- a/config/submodule/coreboot/i945/intel-microcode/module.cfg +++ b/config/submodule/coreboot/i945/intel-microcode/module.cfg @@ -1,3 +1,3 @@ subrepo="https://review.coreboot.org/intel-microcode.git" subrepo_bkup="https://github.com/coreboot/intel-microcode" -subrev="262f0c97f2fbc3839a59523cc6c6bcf500e2850b" +subhash="262f0c97f2fbc3839a59523cc6c6bcf500e2850b" diff --git a/config/submodule/coreboot/i945/libgfxinit/module.cfg b/config/submodule/coreboot/i945/libgfxinit/module.cfg index d8838af8..50153822 100644 --- a/config/submodule/coreboot/i945/libgfxinit/module.cfg +++ b/config/submodule/coreboot/i945/libgfxinit/module.cfg @@ -1,3 +1,3 @@ subrepo="https://review.coreboot.org/libgfxinit.git" subrepo_bkup="https://github.com/coreboot/libgfxinit" -subrev="066e52eeaa329d782ccee96265a6a351fc395bf1" +subhash="066e52eeaa329d782ccee96265a6a351fc395bf1" diff --git a/config/submodule/coreboot/i945/libhwbase/module.cfg b/config/submodule/coreboot/i945/libhwbase/module.cfg index 56fefb40..cd975dcb 100644 --- a/config/submodule/coreboot/i945/libhwbase/module.cfg +++ b/config/submodule/coreboot/i945/libhwbase/module.cfg @@ -1,3 +1,3 @@ subrepo="https://review.coreboot.org/libhwbase.git" subrepo_bkup="https://github.com/coreboot/libhwbase" -subrev="8be5a82b85ceb3ee8a1c4fbf36c75a4bfbda8900" +subhash="8be5a82b85ceb3ee8a1c4fbf36c75a4bfbda8900" diff --git a/config/submodule/coreboot/i945/module.list b/config/submodule/coreboot/i945/module.list index 3d968b1a..9440e333 100644 --- a/config/submodule/coreboot/i945/module.list +++ b/config/submodule/coreboot/i945/module.list @@ -2,3 +2,10 @@ 3rdparty/libgfxinit 3rdparty/libhwbase 3rdparty/vboot +util/crossgcc/tarballs/binutils-2.37.tar.xz +util/crossgcc/tarballs/gcc-11.2.0.tar.xz +util/crossgcc/tarballs/gmp-6.2.1.tar.xz +util/crossgcc/tarballs/mpc-1.3.1.tar.gz +util/crossgcc/tarballs/mpfr-4.2.0.tar.xz +util/crossgcc/tarballs/nasm-2.15.05.tar.bz2 +util/crossgcc/tarballs/R10_20_22.tar.gz diff --git a/config/submodule/coreboot/i945/mpc-1.3.1.tar.gz/module.cfg b/config/submodule/coreboot/i945/mpc-1.3.1.tar.gz/module.cfg new file mode 100644 index 00000000..f98b6444 --- /dev/null +++ b/config/submodule/coreboot/i945/mpc-1.3.1.tar.gz/module.cfg @@ -0,0 +1,3 @@ +subfile="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/mpc/mpc-1.3.1.tar.gz" +subfile_bkup="https://ftp.nluug.nl/pub/gnu/mpc/mpc-1.3.1.tar.gz" +subhash="4bab4ef6076f8c5dfdc99d810b51108ced61ea2942ba0c1c932d624360a5473df20d32b300fc76f2ba4aa2a97e1f275c9fd494a1ba9f07c4cb2ad7ceaeb1ae97" diff --git a/config/submodule/coreboot/i945/mpfr-4.2.0.tar.xz/module.cfg b/config/submodule/coreboot/i945/mpfr-4.2.0.tar.xz/module.cfg new file mode 100644 index 00000000..618fb3b2 --- /dev/null +++ b/config/submodule/coreboot/i945/mpfr-4.2.0.tar.xz/module.cfg @@ -0,0 +1,3 @@ +subfile="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/mpfr/mpfr-4.2.0.tar.xz" +subfile_bkup="https://ftp.nluug.nl/pub/gnu/mpfr/mpfr-4.2.0.tar.xz" +subhash="58e843125884ca58837ae5159cd4092af09e8f21931a2efd19c15de057c9d1dc0753ae95c592e2ce59a727fbc491af776db8b00a055320413cdcf2033b90505c" diff --git a/config/submodule/coreboot/i945/nasm-2.15.05.tar.bz2/module.cfg b/config/submodule/coreboot/i945/nasm-2.15.05.tar.bz2/module.cfg new file mode 100644 index 00000000..8cc5d518 --- /dev/null +++ b/config/submodule/coreboot/i945/nasm-2.15.05.tar.bz2/module.cfg @@ -0,0 +1,3 @@ +subfile="https://www.nasm.us/pub/nasm/releasebuilds/2.15.05/nasm-2.15.05.tar.bz2" +subfile_bkup="https://www.mirrorservice.org/sites/distfiles.macports.org/nasm/nasm-2.15.05.tar.bz2" +subhash="e608222eea4970249f0ee1638207b3368fb43b87117cfdb2788b2c7fd6e221f567ee8dd9b910f9e0c4837dc4866606cd9baf5c3266b81188037059b79635ea79" diff --git a/config/submodule/coreboot/i945/vboot/module.cfg b/config/submodule/coreboot/i945/vboot/module.cfg index 75ce2cf2..352e4222 100644 --- a/config/submodule/coreboot/i945/vboot/module.cfg +++ b/config/submodule/coreboot/i945/vboot/module.cfg @@ -1,3 +1,3 @@ subrepo="https://review.coreboot.org/vboot.git" subrepo_bkup="https://github.com/coreboot/vboot" -subrev="5b8596cefd1a61252501943f2534323708338732" +subhash="5b8596cefd1a61252501943f2534323708338732" diff --git a/config/submodule/docs/html/module.cfg b/config/submodule/docs/html/module.cfg index 0c5ee4cd..6f5f0773 100644 --- a/config/submodule/docs/html/module.cfg +++ b/config/submodule/docs/html/module.cfg @@ -1,3 +1,3 @@ -subrev="20fd775c855428ecff647a42823746863fd57efe" +subhash="20fd775c855428ecff647a42823746863fd57efe" subrepo="https://codeberg.org/libreboot/lbwww" subrepo_bkup="https://git.disroot.org/libreboot/lbwww" diff --git a/config/submodule/docs/img/module.cfg b/config/submodule/docs/img/module.cfg index 82bcf8b1..07c4ab89 100644 --- a/config/submodule/docs/img/module.cfg +++ b/config/submodule/docs/img/module.cfg @@ -1,3 +1,3 @@ -subrev="625bb7535d388a235bec47a8ce822cda10b53692" +subhash="625bb7535d388a235bec47a8ce822cda10b53692" subrepo="https://codeberg.org/libreboot/lbwww-img" subrepo_bkup="https://git.disroot.org/libreboot/lbwww-img" diff --git a/config/submodule/docs/untitled/module.cfg b/config/submodule/docs/untitled/module.cfg index 5608c457..35e950e7 100644 --- a/config/submodule/docs/untitled/module.cfg +++ b/config/submodule/docs/untitled/module.cfg @@ -1,3 +1,3 @@ -subrev="d8e2043c1512eb1171c274559ce82e8093ef393f" +subhash="d8e2043c1512eb1171c274559ce82e8093ef393f" subrepo="https://codeberg.org/vimuser/untitled-website" subrepo_bkup="https://notabug.org/untitled/untitled-website" diff --git a/config/submodule/grub/default/gnulib/module.cfg b/config/submodule/grub/default/gnulib/module.cfg index 26c28561..6fd77871 100644 --- a/config/submodule/grub/default/gnulib/module.cfg +++ b/config/submodule/grub/default/gnulib/module.cfg @@ -1,3 +1,3 @@ subrepo="git://git.sv.gnu.org/gnulib" subrepo_bkup="https://codeberg.org/libreboot/gnulib" -subrev="9f48fb992a3d7e96610c4ce8be969cff2d61a01b" +subhash="9f48fb992a3d7e96610c4ce8be969cff2d61a01b" diff --git a/config/submodule/grub/xhci/gnulib/module.cfg b/config/submodule/grub/xhci/gnulib/module.cfg index 26c28561..6fd77871 100644 --- a/config/submodule/grub/xhci/gnulib/module.cfg +++ b/config/submodule/grub/xhci/gnulib/module.cfg @@ -1,3 +1,3 @@ subrepo="git://git.sv.gnu.org/gnulib" subrepo_bkup="https://codeberg.org/libreboot/gnulib" -subrev="9f48fb992a3d7e96610c4ce8be969cff2d61a01b" +subhash="9f48fb992a3d7e96610c4ce8be969cff2d61a01b" diff --git a/config/submodule/pico-sdk/tinyusb/module.cfg b/config/submodule/pico-sdk/tinyusb/module.cfg index 68798daa..43b71534 100644 --- a/config/submodule/pico-sdk/tinyusb/module.cfg +++ b/config/submodule/pico-sdk/tinyusb/module.cfg @@ -1,3 +1,3 @@ -subrev="86c416d4c0fb38432460b3e11b08b9de76941bf5" +subhash="86c416d4c0fb38432460b3e11b08b9de76941bf5" subrepo="https://codeberg.org/libreboot/tinyusb" subrepo_bkup="https://github.com/hathach/tinyusb.git" diff --git a/config/submodule/stm32-vserprog/libopencm3/module.cfg b/config/submodule/stm32-vserprog/libopencm3/module.cfg index b8c46854..9fb3460b 100644 --- a/config/submodule/stm32-vserprog/libopencm3/module.cfg +++ b/config/submodule/stm32-vserprog/libopencm3/module.cfg @@ -1,3 +1,3 @@ -subrev="458250dc6147dc807eec9e4d5a6caf38a699ecb1" +subhash="458250dc6147dc807eec9e4d5a6caf38a699ecb1" subrepo="https://codeberg.org/libreboot/libopencm3" subrepo_bkup="https://github.com/libopencm3/libopencm3" diff --git a/include/git.sh b/include/git.sh index 63300fe8..5fe41fb3 100755 --- a/include/git.sh +++ b/include/git.sh @@ -3,7 +3,7 @@ # Copyright (c) 2022 Caleb La Grange <thonkpeasant@protonmail.com> eval "$(setvars "" _target rev _xm loc url bkup_url depend tree_depend xtree \ - mdir subrev subrepo subrepo_bkup)" + mdir subhash subrepo subrepo_bkup subfile subfile_bkup)" fetch_project_trees() { @@ -114,19 +114,31 @@ prep_submodules() fetch_submodule() { mcfgdir="$mdir/${1##*/}" - eval "$(setvars "" subrev subrepo subrepo_bkup)" + eval "$(setvars "" subhash subrepo subrepo_bkup subfile subfile_bkup)" [ ! -f "$mcfgdir/module.cfg" ] || . "$mcfgdir/module.cfg" || \ $err "! . $mcfgdir/module.cfg" - [ -z "$subrepo" ] && [ -z "$subrepo_bkup" ] && return 0 - for mvar in subrepo subrepo_bkup subrev; do - eval "[ -n \"\$$mvar\" ] || $err \"$1, $mdir: $mvar unset\"" + st="" + for _st in repo file; do + _seval="if [ -n \"\$sub$_st\" ] || [ -n \"\$sub${_st}_bkup\" ]" + eval "$_seval; then st=\"\$st \$_st\"; fi" done + st="${st# }" + [ "$st" = "repo file" ] && $err "$mdir: repo/file both defined" - rm -Rf "$tmpgit/$1" || $err "!rm '$mdir' '$1'" + [ -z "$st" ] && return 0 # subrepo/subfile not defined - tmpclone "$subrepo" "$subrepo_bkup" "$tmpgit/$1" "$subrev" \ - "$mdir/${1##*/}/patches" + for mvar in "sub${st}" "sub${st}_bkup" "subhash"; do + eval "[ -n \"\$$mvar\" ] || $err \"$1, $mdir: $mvar unset\"" + done + + if [ "$st" = "repo" ]; then + rm -Rf "$tmpgit/$1" || $err "!rm '$mdir' '$1'" + tmpclone "$subrepo" "$subrepo_bkup" "$tmpgit/$1" "$subhash" \ + "$mdir/${1##*/}/patches" + else + download "$subfile" "$subfile_bkup" "$tmpgit/$1" "$subhash" + fi } tmpclone() diff --git a/include/lib.sh b/include/lib.sh index 39d3bc99..9d66ea8d 100755 --- a/include/lib.sh +++ b/include/lib.sh @@ -6,6 +6,8 @@ export LC_COLLATE=C export LC_ALL=C +_ua="Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0" + tmpdir_was_set="y" cbdir="src/coreboot/default" ifdtool="elf/ifdtool/default/ifdtool" @@ -210,7 +212,7 @@ e() [ $# -gt 1 ] && es_t="$2" es2="already exists" estr="[ -$es_t \"\$1\" ] || return 1" - [ $# -gt 2 ] && estr="[ -$es_t \"\$1\" ] && return 1" && es2="not found" + [ $# -gt 2 ] && estr="[ -$es_t \"\$1\" ] && return 1" && es2="missing" eval "$estr" printf "%s %s\n" "$1" "$es2" 1>&2 @@ -225,3 +227,27 @@ singletree() [ -f "$targetfile" ] && return 1 done } + +download() +{ + dl_fail="y" # 1 url, 2 url backup, 3 destination, 4 checksum + vendor_checksum "$4" "$3" || dl_fail="n" + [ "$dl_fail" = "n" ] && e "$3" f && return 0 + x_ mkdir -p "${3%/*}" + for url in "$1" "$2"; do + [ "$dl_fail" = "n" ] && break + [ -z "$1" ] && continue + x_ rm -f "$3" + curl --location --retry 3 -A "$_ua" "$1" -o "$3" || \ + wget --tries 3 -U "$_ua" "$1" -O "$3" || continue + vendor_checksum "$4" "$3" || dl_fail="n" + done + [ "$dl_fail" = "y" ] && $err "$1 $2 $3 $4: file missing"; return 0 +} + +vendor_checksum() +{ + [ "$(sha512sum "$2" | awk '{print $1}')" != "$1" ] || return 1 + printf "Bad checksum for file: %s\n" "$2" 1>&2 + rm -f "$2" || : +} diff --git a/include/vendor.sh b/include/vendor.sh index 651766df..4a0e7ae6 100755 --- a/include/vendor.sh +++ b/include/vendor.sh @@ -3,13 +3,12 @@ # Copyright (c) 2022 Ferass El Hafidi <vitali64pmemail@protonmail.com> # Copyright (c) 2023-2024 Leah Rowe <leah@libreboot.org> -_ua="Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0" _7ztest="a" e6400_unpack="$PWD/src/bios_extract/dell_inspiron_1100_unpacker.py" me7updateparser="$PWD/util/me7_update_parser/me7_update_parser.py" pfs_extract="$PWD/src/biosutilities/Dell_PFS_Extract.py" -uefiextract="$PWD/src/uefitool/uefiextract" +uefiextract="$PWD/elf/uefitool/uefiextract" nvmutil="util/nvmutil/nvm" vendir="vendorfiles" appdir="$vendir/app" @@ -115,20 +114,7 @@ fetch() _dest="${5##*../}" _dl="$vendir/cache/$dlsum" - x_ mkdir -p "${_dl%/*}" - - dl_fail="y" - vendor_checksum "$dlsum" "$_dl" || dl_fail="n" - for url in "$dl" "$dl_bkup"; do - [ "$dl_fail" = "n" ] && break - [ -z "$url" ] && continue - x_ rm -f "$_dl" - curl --location --retry 3 -A "$_ua" "$url" -o "$_dl" || \ - wget --tries 3 -U "$_ua" "$url" -O "$_dl" || continue - vendor_checksum "$dlsum" "$_dl" || dl_fail="n" - done - [ "$dl_fail" = "y" ] && \ - $err "fetch $dlsum: matched file unavailable" + download "$dl" "$dl_bkup" "$_dl" "$dlsum" x_ rm -Rf "${_dl}_extracted" mkdirs "$_dest" "extract_$dl_type" || return 0 @@ -139,13 +125,6 @@ fetch() $err "extract_$dl_type (fetch): missing file: '$_dest'" } -vendor_checksum() -{ - [ "$(sha512sum "$2" | awk '{print $1}')" != "$1" ] || return 1 - printf "Bad checksum for file: %s\n" "$2" 1>&2 - rm -f "$2" || : -} - mkdirs() { e "$1" f && return 1 @@ -154,7 +133,7 @@ mkdirs() remkdir "$appdir" extract_archive "$_dl" "$appdir" || \ [ "$2" = "extract_e6400vga" ] || \ - $err "mkdirs $1 $2: !extract" + $err "mkdirs $1 $2: !extract"; return 0 } extract_intel_me() diff --git a/script/trees b/script/trees index e413f610..dc8b7988 100755 --- a/script/trees +++ b/script/trees @@ -39,6 +39,8 @@ main() cfgsdir="config/$project" listfile="$datadir/build.list" # needed on multi, optional on single + remkdir "${tmpgit%/*}" + _cmd="build_projects" singletree "$project" || _cmd="build_targets" $_cmd $@ |