move ifd/gbe configs into config/ifd/

it doesn't really make sense for them to be under
blobs/ - nominally, they are blobs, but they are
well-understood data files containing config data,
that is easily parsed by tools like ich9show or
ifdtool (and tools like bincfg or nvmutil)

blobs/ has been re-purposed: this directory no longer
exists in lbmk, but it is created (and on .gitignore)
when needed, by blobutil

thus, the blobs/ directory shall only contain vendor
files, and only those files that libreboot scrubs from
releases. therefore, build/release/src can (and has
been) simplified; it currently copies just the ifd and
gbe files from blobs/, selectively, and this logic is
quite error prone, requiring maintenance. now, the
build/release/src script simply copies config/ (which
only ever contains distributable files) and entirely
ignores the blobs/ directory

the blob download script already creates the required
directory, except for the sch5545 download; this is
now fixed

lbmk code size is slightly smaller, due to this patch

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2023-09-04 01:17:23 +01:00
parent 6ddb0e0974
commit 03788d14fb
116 changed files with 179 additions and 198 deletions
+1 -22
View File
@@ -29,8 +29,7 @@ trees_fetch_list="coreboot u-boot seabios"
simple_fetch_list="flashrom grub memtest86plus me_cleaner uefitool"
simple_fetch_list="${simple_fetch_list} bios_extract biosutilities"
# do not add blobs directory here. it's handled below
dirlist="resources util script include"
dirlist="resources util script include config"
filelist="lbmk modify build README.md COPYING update version handle"
filelist="${filelist} versiondate projectname checkgit"
@@ -115,8 +114,6 @@ copy_files()
err "copy_files: !cp -R ${dir}/ ${srcdir}/"
done
copy_blobs
for i in ${filelist}; do
if [ ! -f "${i}" ]; then
rm -Rf "${srcdir}" || \
@@ -128,24 +125,6 @@ copy_files()
done
}
copy_blobs()
{
mkdir -p "${srcdir}"/blobs || \
err "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 t1650 e6430 ich9m; do
for j in ifd gbe 4_ifd_nogbe 4_ifd 8_ifd 12_ifd 16_ifd; do
[ -f "blobs/${i}/${j}.bin" ] || continue
[ -e "${srcdir}/blobs/${i}" ] || \
mkdir -p "${srcdir}/blobs/${i}" || \
err "copy_blobs: ! -d ${srcdir}/blobs/${i}"
cp "blobs/${i}/${j}.bin" "${srcdir}/blobs/${i}" || \
err "copy_blobs: ! -f ${srcdir}/blobs/${i}"
done
done
}
purge_files()
{
(
+3
View File
@@ -423,6 +423,9 @@ extract_sch5545ec()
printf "sch5545 firmware already downloaded\n" 1>&2
return 0
fi
[ -d "${_sch5545ec_destination%/*}" ] || \
mkdir -p "${_sch5545ec_destination%/*}" || \
err "extract_sch: can't mkdir ${_sch5545ec_destination%/*}"
[ ! -d "${appdir}" ] || rm -Rf "${appdir}" || \
err "extract_sch5545ec: can't remove ${appdir}"