diff options
Diffstat (limited to 'resources/scripts/build/release')
| -rwxr-xr-x | resources/scripts/build/release/roms | 84 | ||||
| -rwxr-xr-x | resources/scripts/build/release/src | 27 |
2 files changed, 3 insertions, 108 deletions
diff --git a/resources/scripts/build/release/roms b/resources/scripts/build/release/roms index d81ec09a..62fe91bc 100755 --- a/resources/scripts/build/release/roms +++ b/resources/scripts/build/release/roms @@ -26,9 +26,6 @@ version="version-unknown" versiondate="version-date-unknown" cbtree="default" target="" -CONFIG_HAVE_MRC="" -CONFIG_HAVE_ME_BIN="" -CONFIG_KBC1126_FIRMWARE="" ifdtool="cbutils/${cbtree}/ifdtool" cbfstool="cbutils/${cbtree}/cbfstool" @@ -73,25 +70,6 @@ make_archive() continue fi - CONFIG_HAVE_MRC="y" - CONFIG_HAVE_ME_BIN="y" - CONFIG_KBC1126_FIRMWARE="y" - grep "CONFIG_HAVE_ME_BIN=y" \ - "resources/coreboot/${target}/config/"* \ - || CONFIG_HAVE_ME_BIN="n" - grep "CONFIG_HAVE_MRC=y" \ - "resources/coreboot/${target}/config/"* \ - || CONFIG_HAVE_MRC="n" - grep "CONFIG_KBC1126_FIRMWARE=y" \ - "resources/coreboot/${target}/config"/* \ - || CONFIG_KBC1126_FIRMWARE="n" - - # remove ME/MRC/EC firmware from ROM images - if [ "${CONFIG_HAVE_ME_BIN}" = "y" ] \ - || [ "${target}" = "e6400nvidia_4mb" ]; then - strip_archive "${romdir}" - fi - printf "Generating release/%s/roms/%s-%s_%s.tar.xz\n" \ "${version}" "${projectname}" \ "${version}" "${target##*/}" @@ -109,68 +87,6 @@ make_archive() fi } -strip_archive() -{ - romdir=${1} - - if [ ! -d coreboot/${cbtree} ]; then - ./download coreboot ${cbtree} || exit 1 - fi - ./build module cbutils ${cbtree} || exit 1 - - rm -Rf "${romdir}_tmp" # dirty hack, to reduce disk io later - # rather than using /tmp, which might not be tmpfs - mkdir "${romdir}_tmp" - - # Hash the rom before removing blobs - if [ ! -f "${romdir}/blobhashes" ]; then - printf "ROMs must match these hashes after blob insertion:" \ - > "${romdir}/blobhashes" - fi - ( - cd ${romdir} || err "subshell: cd" - sha1sum *.rom >> blobhashes || err "subshell: sha1sum" - ) - - for romfile in "${romdir}"/*.rom - do - strip_rom_image "${romfile}" - done -} - -strip_rom_image() -{ - romfile=${1} - - if [ ! -f "${romfile}" ]; then - continue - fi - - if [ "${CONFIG_HAVE_ME_BIN}" = "y" ]; then - ${ifdtool} --nuke me "${romfile}" || exit 1 - mv "${romfile}" "${romdir}_tmp"/ - mv "${romfile}.new" "${romfile}" - fi - - if [ "${CONFIG_HAVE_MRC}" = "y" ] - then - ${cbfstool} "${romfile}" remove -n mrc.bin || exit 1 - ${cbfstool} "${romfile}" print - fi - - if [ "${CONFIG_KBC1126_FIRMWARE}" = "y" ]; then - ${cbfstool} "${romfile}" remove -n ecfw1.bin || exit 1 - ${cbfstool} "${romfile}" remove -n ecfw2.bin || exit 1 - fi - - # TODO: replace this board-specific hack - if [ "${target}" = "e6400nvidia_4mb" ]; then - ${cbfstool} "${romfile}" remove \ - -n "pci10de,06eb.rom" \ - || exit 1 - fi -} - err() { printf "%s: %s\n" $0 $1 diff --git a/resources/scripts/build/release/src b/resources/scripts/build/release/src index 7a2f94d7..267b3eea 100755 --- a/resources/scripts/build/release/src +++ b/resources/scripts/build/release/src @@ -23,12 +23,11 @@ set -u -e projectname="$(cat projectname)" -modlist="coreboot flashrom grub memtest86plus seabios me_cleaner u-boot" -modlist="${modlist} bios_extract" +modlist="coreboot flashrom grub memtest86plus seabios u-boot" -dirlist="resources util" # do not add blobs directory here. it's handled below +dirlist="resources util" -filelist="lbmk blobutil modify download build README.md COPYING Makefile update" +filelist="lbmk modify download build README.md COPYING Makefile update" filelist="${filelist} version versiondate projectname .gitcheck gitclone" version="version-unknown" @@ -88,8 +87,6 @@ copy_files() cp -R "${dir}/" "${srcdir}/" done - copy_blobs - for i in ${filelist}; do if [ ! -f "${i}" ]; then rm -Rf "${srcdir}" @@ -99,23 +96,6 @@ copy_files() done } -copy_blobs() -{ - mkdir -p "${srcdir}"/blobs - # do not copy intel ME etc, but do copy ifd/gbe files - for i in t440p xx20 xx30 hp8200sff hp_ivybridge hp_sandybridge \ - hp8300usdt; do - for j in ifd gbe 16_ifd; do - if [ -f "blobs/${i}/${j}.bin" ]; then - if [ ! -e "${srcdir}/blobs/${i}" ]; then - mkdir -p "${srcdir}/blobs/${i}" - fi - cp blobs/${i}/${j}.bin "${srcdir}/blobs/${i}" - fi - done - done -} - purge_files() { ( @@ -127,7 +107,6 @@ purge_files() cd "${i}/" || err "cd2" make distclean || err "make-distclean1" ) - make clean -BC default/util/kbc1126/ || err "make-clean1" done ) |