diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..256078d --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "deark"] + path = deark + url = https://github.com/jsummers/deark.git diff --git a/Dockerfile b/Dockerfile index 00919d5..cf0dc66 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,6 +37,10 @@ COPY . /biostools RUN cd /biostools/bios_extract && \ make +# Compile deark. +RUN cd /biostools/deark && + make + # Create final image. FROM debian:bullseye @@ -57,5 +61,5 @@ RUN pip install -r /biostools/requirements.txt VOLUME /bios WORKDIR /biostools -# Run our entry point script. +# Run our entrypoint script. ENTRYPOINT ["/bin/sh", "/biostools/docker-entrypoint.sh"] diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..083217d --- /dev/null +++ b/Makefile @@ -0,0 +1,9 @@ +.PHONY: all + +all: + make -C bios_extract all + make -C deark all + +%: + make -C bios_extract "$@" + make -C deark "$@" diff --git a/README.md b/README.md index 28fa958..114d3fe 100644 --- a/README.md +++ b/README.md @@ -34,12 +34,11 @@ A toolkit for extracting and analyzing x86 BIOS ROM images (mostly) within the c ### Installation 1. Clone this repository. -2. Build the `bios_extract` tool: +2. Build the `bios_extract` and `deark` tools: ``` -cd bios_extract +cd /path/to/bios-tools make -cd .. ``` 3. Download the `UEFIExtract` tool from its [GitHub repository](https://github.com/LongSoft/UEFITool/releases) and place its executable on the repository's root directory. Prebuilt versions are only available for `x86_64`, but this tool is optional, and only required for UEFI extraction. diff --git a/bios_extract/README.md b/bios_extract/README.md index 7c23ade..d6ddd96 100644 --- a/bios_extract/README.md +++ b/bios_extract/README.md @@ -5,6 +5,7 @@ Fork of the [coreboot bios_extract tool](https://github.com/coreboot/bios_extrac ## Modifications * Added some sanity checks +* Added automatic saving of parts of the image that were not processed, like PHOEDECO * Improved AMI, Award and Phoenix BIOS detection * Improved AMIBIOS extraction * Improved Award extraction on semi-compressed v4.50 BIOSes diff --git a/deark b/deark new file mode 160000 index 0000000..267c41a --- /dev/null +++ b/deark @@ -0,0 +1 @@ +Subproject commit 267c41acec828b851891c4f7cd6c9959df1df918 diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 212a540..c1a8e45 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -7,7 +7,7 @@ # # This file is part of the 86Box BIOS Tools distribution. # -# Docker container entry point for running the tools. +# Docker container entrypoint for running the tools. # # #