diff options
| author | Leah Rowe <leah@libreboot.org> | 2023-10-12 22:21:02 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2023-10-12 22:21:02 +0100 |
| commit | 09881212c3ce8938156ac779463d8859dcddff6b (patch) | |
| tree | 9ceaa0ffc1ee2c33cd51b2f6d5cb715b6d4fd32d | |
| parent | 1f3316422d50158a56183672088d1991c02bede6 (diff) | |
use me_cleaner from coreboot instead of upstream
coreboot closely matches upstream, whose current release
is version 1.2 from 2018, and coreboot has not changed it
in any meaningful way.
the upstream did add patches since, but they are documentation
patches only.
this means: we do not need to use the upstream version
Signed-off-by: Leah Rowe <leah@libreboot.org>
| -rw-r--r-- | config/git/me_cleaner | 5 | ||||
| -rwxr-xr-x | include/vendor.sh | 2 | ||||
| -rwxr-xr-x | script/update/project/release | 2 | ||||
| -rwxr-xr-x | script/update/vendor/download | 2 |
4 files changed, 3 insertions, 8 deletions
diff --git a/config/git/me_cleaner b/config/git/me_cleaner deleted file mode 100644 index fd5197c7..00000000 --- a/config/git/me_cleaner +++ /dev/null @@ -1,5 +0,0 @@ -{me_cleaner}{ - rev: 43612a630c79f3bc6f2653bfe90dfe0b7b137e08 - loc: me_cleaner - url: https://github.com/corna/me_cleaner.git -} diff --git a/include/vendor.sh b/include/vendor.sh index d6cb3cf8..51daba82 100755 --- a/include/vendor.sh +++ b/include/vendor.sh @@ -13,7 +13,7 @@ cbfstool="cbutils/default/cbfstool" nvmutil="util/nvmutil/nvm" pciromsdir="pciroms" -mecleaner="${PWD}/src/me_cleaner/me_cleaner.py" +mecleaner="${PWD}/src/coreboot/default/util/me_cleaner/me_cleaner.py" me7updateparser="${PWD}/util/me7_update_parser/me7_update_parser.py" e6400_unpack="${PWD}/src/bios_extract/dell_inspiron_1100_unpacker.py" kbc1126_ec_dump="${PWD}/${cbdir}/util/kbc1126/kbc1126_ec_dump" diff --git a/script/update/project/release b/script/update/project/release index 8843f2d1..3b869f6a 100755 --- a/script/update/project/release +++ b/script/update/project/release @@ -11,7 +11,7 @@ eval "$(setvars "" vdir basename src_dirname srcdir _nogit _xm target romdir \ microcode_required CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN \ CONFIG_KBC1126_FIRMWARE CONFIG_INCLUDE_SMSC_SCH5545_EC_FW)" -_f="coreboot u-boot seabios flashrom grub memtest86plus me_cleaner uefitool" +_f="coreboot u-boot seabios flashrom grub memtest86plus uefitool" _f="${_f} bios_extract biosutilities pico-serprog stm32-vserprog" _f="${_f} rpi-pico-serprog" diff --git a/script/update/vendor/download b/script/update/vendor/download index de5abb68..2d90b9b0 100755 --- a/script/update/vendor/download +++ b/script/update/vendor/download @@ -42,7 +42,7 @@ build_dependencies() { [ -d ${cbdir} ] || \ x_ ./update project trees -f coreboot ${cbdir##*/} - for d in uefitool biosutilities bios_extract me_cleaner; do + for d in uefitool biosutilities bios_extract; do [ -d "src/${d}" ] && continue x_ ./update project trees -f "${d}" done |