summaryrefslogtreecommitdiff
path: root/resources/scripts/build
diff options
context:
space:
mode:
Diffstat (limited to 'resources/scripts/build')
-rwxr-xr-xresources/scripts/build/boot/roms8
-rwxr-xr-xresources/scripts/build/boot/roms_helper148
-rwxr-xr-xresources/scripts/build/clean/cbutils6
-rwxr-xr-xresources/scripts/build/clean/crossgcc3
-rwxr-xr-xresources/scripts/build/clean/seabios3
-rwxr-xr-xresources/scripts/build/clean/u-boot7
-rwxr-xr-xresources/scripts/build/coreboot/utils17
-rwxr-xr-xresources/scripts/build/descriptors/ich9m3
-rwxr-xr-xresources/scripts/build/grub/payload21
-rwxr-xr-xresources/scripts/build/grub/utils18
-rwxr-xr-xresources/scripts/build/release/roms93
-rwxr-xr-xresources/scripts/build/release/src114
-rwxr-xr-xresources/scripts/build/src/for20
13 files changed, 279 insertions, 182 deletions
diff --git a/resources/scripts/build/boot/roms b/resources/scripts/build/boot/roms
index 966750a2..0aedfdb1 100755
--- a/resources/scripts/build/boot/roms
+++ b/resources/scripts/build/boot/roms
@@ -66,11 +66,11 @@ main()
if [ "${firstoption}" = "all" ]; then
for boardname in $(listboards); do
- buildrom "${boardname}" || err "build/roms: error"
+ buildrom "${boardname}" || err "build/roms (1): error"
done
else
for board in ${boards}; do
- buildrom "${board}" || err "build/roms: error"
+ buildrom "${board}" || err "build/roms (2): error"
done
fi
@@ -104,7 +104,7 @@ usage()
listboards()
{
for boarddir in resources/coreboot/*; do
- [ ! -d "${boarddir}" ] && continue
+ [ -d "${boarddir}" ] || continue
board="${boarddir##resources/coreboot/}"
board="${board%/}"
printf '%s\n' "${board##*/}"
@@ -115,7 +115,7 @@ listboards()
buildrom() {
[ -d "resources/coreboot/${1}/" ] || \
err "build/roms: target not defined: ${1}"
- ./build boot roms_helper ${1}${opts}
+ ./build boot roms_helper ${1}${opts} || return 1
}
main $@
diff --git a/resources/scripts/build/boot/roms_helper b/resources/scripts/build/boot/roms_helper
index 6136e708..a8e7635d 100755
--- a/resources/scripts/build/boot/roms_helper
+++ b/resources/scripts/build/boot/roms_helper
@@ -63,10 +63,10 @@ done
printf "\n\nboard is %s , kb is %s , displaymode is %s , payloads is %s\n" \
${board} ${keyboard_layouts} ${displaymodes} ${payloads} 1>&2
-[ ! -d "resources/coreboot/${board}" ] && \
+[ -d "resources/coreboot/${board}" ] || \
err "Target not defined: ${board}"
-[ ! -f "resources/coreboot/${board}/target.cfg" ] && \
+[ -f "resources/coreboot/${board}/target.cfg" ] || \
err "Missing target.cfg for target: ${board}"
grub_scan_disk="undefined"
@@ -114,7 +114,7 @@ fi
if [ "${payload_grub}" != "y" ] && [ "${payload_seabios}" != "y" ] && \
[ "${payload_uboot}" != "y" ]; then
for configfile in "resources/coreboot/${board}/config/"*; do
- [ ! -e "${configfile}" ] && continue
+ [ -e "${configfile}" ] || continue
err "target '${board}' defines no payload"
done
fi
@@ -158,19 +158,22 @@ if [ ! -f "${seavgabiosrom}" ] \
|| [ ! -f elf/seabios/default/libgfxinit/bios.bin.elf ] \
|| [ ! -f elf/seabios/default/vgarom/bios.bin.elf ] \
|| [ ! -f elf/seabios/default/normal/bios.bin.elf ]; then
- [ "${payload_seabios}" = "y" ] && \
- ./handle config file -b seabios
+ [ "${payload_seabios}" != "y" ] || \
+ ./handle config file -b seabios || \
+ err "cannot build seabios"
fi
memtest_bin="memtest86plus/build${arch#*_}/memtest.bin"
-[ "${payload_memtest}" = "y" ] && [ ! -f "${memtest_bin}" ] && \
- ./build src for -b ${memtest_bin%/*}
+[ "${payload_memtest}" != "y" ] || [ -f "${memtest_bin}" ] || \
+ ./build src for -b ${memtest_bin%/*} || \
+ err "cannot build memtest86+"
-[ -d "${romdir}/" ] || mkdir -p "${romdir}/"
-rm -f "${romdir}"/*
+[ -d "${romdir}/" ] || mkdir -p "${romdir}/" || \
+ err "cannot create rom directory: \"${romdir}\""
+rm -f "${romdir}"/* || err "cannot: rm -f \"${romdir}\"/*"
-if [ "${payload_grub}" = "y" ] \
- || [ "${payload_seabios_withgrub}" = "y" ]; then
+if [ "${payload_grub}" = "y" ] || \
+ [ "${payload_seabios_withgrub}" = "y" ]; then
if [ -f "elf/grub/grub_usqwerty.cfg" ]; then
sha1sumcmd="sha1sum resources/grub/config/grub.cfg"
grubrefchecksum="$(${sha1sumcmd} | awk '{print $1}')"
@@ -179,10 +182,12 @@ if [ "${payload_grub}" = "y" ] \
grubbuildchecksum="$(${sha1sumcmd} | awk '{print $1}')"
if [ "${grubrefchecksum}" != "${grubbuildchecksum}" ]; then
- printf "Changes detected to GRUB. Re-building now:\n"
+ printf "Changes detected to GRUB. Re-building now.\n" \
+ 1>&2
fi
else
- printf "Required GRUB payloads not yet built. Building now:\n"
+ printf "Required GRUB payloads not yet built. Building now.\n" \
+ 1>&2
fi
for keymapfile in ${kmapdir}/*; do
[ -f "${keymapfile}" ] || continue
@@ -196,13 +201,14 @@ if [ "${payload_grub}" = "y" ] \
if [ ! -f "${grubelf}" ] || [ ! -f "${grubcfg}" ] || \
[ ! -f "${grubtestcfg}" ]; then
- ./build grub payload
+ ./build grub payload || err "cannot build grub payload"
fi
done
fi
if [ "${payload_uboot}" = "y" ]; then
- ./handle config file -b u-boot ${board}
+ ./handle config file -b u-boot ${board} || \
+ err "cannot build u-boot target: ${board}"
ubdir="elf/u-boot/${board}/${uboot_config}"
ubootelf="${ubdir}/u-boot.elf"
[ ! -f "${ubootelf}" ] && [ -f "${ubdir}/u-boot.bin" ] && \
@@ -225,55 +231,61 @@ moverom() {
if [ "${cuttype}" = "4MiB IFD BIOS region" ]; then
dd if=${rompath} of=${newrompath} bs=1 \
- skip=$(($(stat -c %s ${rompath}) - 0x400000)) count=4194304
+ skip=$(($(stat -c %s ${rompath}) - 0x400000)) \
+ count=4194304 || err "moverom: cannot cut 4MB section"
else
- cp ${rompath} ${newrompath}
+ cp ${rompath} ${newrompath} || err "moverom: cannot copy rom"
fi
# pike2008 cards cause a system hang when loading option roms in seabios
# if there is an empty option rom in cbfs, no option rom will be loaded
if [ "${cuttype}" = "d8d16sas" ]; then
emptyrom=$(mktemp -t coreboot_rom.XXXXXXXXXX)
- rm -f "${emptyrom}"
- touch "${emptyrom}"
+ rm -f "${emptyrom}" || err "cannot remove fake oprom"
+ touch "${emptyrom}" || err "cannot create fake oprom"
for deviceID in "0072" "3050"; do
"${cbfstool}" "${newrompath}" add -f "${emptyrom}" \
- -n pci1000,${deviceID}.rom -t raw
+ -n pci1000,${deviceID}.rom -t raw || \
+ err "moverom: cannot insert fake pike2008 rom"
done
- rm -f "${emptyrom}"
+ rm -f "${emptyrom}" || err "moverom: cannot remove pike2008 rom"
fi
for romsize in 4 8 16; do
ifdgbe="descriptors/ich9m/ich9fdgbe_${romsize}m.bin"
if [ "${cuttype}" = "${romsize}MiB ICH9 IFD NOR flash" ]; then
[ -f "${ifdgbe}" ] || \
- ./build descriptors ich9m
+ ./build descriptors ich9m || \
+ err "moverom: cannot create ich9m ifd"
dd if=${ifdgbe} of=${newrompath} bs=1 count=12k \
- conv=notrunc
+ conv=notrunc || err "moverom: cant insert ich9m ifd"
fi
cmpstr="${romsize}MiB ICH9 IFD NOGBE NOR flash"
ifdgbe="descriptors/ich9m/ich9fdnogbe_${romsize}m.bin"
if [ "${cuttype}" = "${cmpstr}" ]; then
[ -f "${ifdgbe}" ] || \
- ./build descriptors ich9m
+ ./build descriptors ich9m || \
+ err "moverom: cannot create ich9m ifd"
dd if=${ifdgbe} of=${newrompath} bs=1 count=4k \
- conv=notrunc
+ conv=notrunc || err "moverom: cant insert ich9m ifd"
fi
done
if [ "${cuttype}" = "i945 laptop" ]; then
dd if=${newrompath} of=top64k.bin bs=1 \
- skip=$(($(stat -c %s ${newrompath}) - 0x10000)) count=64k
+ skip=$(($(stat -c %s ${newrompath}) - 0x10000)) count=64k \
+ || err "moverom: cannot copy boot block from i945 rom"
dd if=top64k.bin of=${newrompath} bs=1 \
seek=$(($(stat -c %s ${newrompath}) - 0x20000)) count=64k \
- conv=notrunc
- rm -f top64k.bin
+ conv=notrunc || \
+ err "moverom: cannot copy boot block into i945 rom"
+ rm -f top64k.bin || err "moverom: can't remove top64k.bin"
fi
if [ "${microcode_required}" = "n" ]; then
_newrom_b="${newrompath%.rom}_nomicrocode.rom"
cp "${newrompath}" "${_newrom_b}" || \
- err "cannot do: cp \"${newrompath}\" \"${_newrom_b}\""
+ err "moverom: cp \"${newrompath}\" \"${_newrom_b}\""
microcode_present="y"
"${cbfstool}" "${_newrom_b}" remove -n \
cpu_microcode_blob.bin || microcode_present="n"
@@ -283,7 +295,7 @@ moverom() {
${newrompath}
printf "Renaming default ROM file instead.\n"
mv "${newrompath}" "${_newrom_b}" || \
- err "fail: mv \"${newrompath}\" \"${_newrom_b}\""
+ err "moverom: mv \"${newrompath}\" \"${_newrom_b}\""
fi
fi
}
@@ -299,33 +311,34 @@ mkSeabiosRom() {
tmprom=$(mktemp -t coreboot_rom.XXXXXXXXXX)
- cp "${target_cbrom}" "${tmprom}"
+ cp "${target_cbrom}" "${tmprom}" || \
+ err "mkSeabiosRom: cannot copy to tmprom"
"${cbfstool}" "${tmprom}" add-payload -f "${target_seabioself}" \
-n ${target_seabios_cbfs_path} -c lzma || \
- err "cannot add payload, ${target_seabioself}, to tmprom, ${tmprom}"
+ err "mkSeabiosRom: can't add payload, ${target_seabioself}, to rom"
"${cbfstool}" "${tmprom}" add-int -i 3000 -n etc/ps2-keyboard-spinup \
- || err "cannot add-int etc/ps2-keyboard-spinup to tmprom, ${tmprom}"
+ || err "mkSeabiosRom: cbfs add-int etc/ps2-keyboard-spinup 3000"
if [ "${target_initmode}" = "normal" ] || \
[ "${target_initmode}" = "libgfxinit" ]; then
"${cbfstool}" "${tmprom}" add-int -i 2 \
-n etc/pci-optionrom-exec || \
- err "cannot add-int etc/pci-optionrom-exec 2 to tmprom"
+ err "mkSeabiosRom: cbfs add-int etc/pci-optionrom-exec 2"
elif [ "${target_initmode}" = "vgarom" ]; then # coreboot executes it
"${cbfstool}" "${tmprom}" add-int -i 0 \
-n etc/pci-optionrom-exec || \
- err "cannot add-int etc/pci-optionrom-exec 0 to tmprom"
+ err "mkSeabiosRom: cbfs add-int etc/pci-optionrom-exec 0"
fi # for undefined modes, don't add this integer. use SeaBIOS defaults
"${cbfstool}" "${tmprom}" add-int -i 0 -n etc/optionroms-checksum || \
- err "cannot add-int etc/optionroms-checksum 0 to tmprom"
+ err "mkSeabiosRom: cbfs add-int etc/optionroms-checksum 0"
[ "${target_initmode}" != "libgfxinit" ] || \
"${cbfstool}" "${tmprom}" add -f "${seavgabiosrom}" \
-n vgaroms/seavgabios.bin -t raw || \
- err "cannot add vgaroms/seavgabios.bin to tmprom"
+ err "mkSeabiosRom: cbfs add-raw vgaroms/seavgabios.bin"
printf "%s\n" "${tmprom}"
}
@@ -343,14 +356,15 @@ mkUbootRom() {
[ -f "${target_ubootelf}" ] || \
target_ubootelf="${target_ubdir}/u-boot.bin"
[ -f "${target_ubootelf}" ] || \
- err "Could not find u-boot build for board, ${board}"
+ err "mkUbootRom: cant find u-boot build for board, ${board}"
tmprom=$(mktemp -t coreboot_rom.XXXXXXXXXX)
- cp "${target_cbrom}" "${tmprom}"
+ cp "${target_cbrom}" "${tmprom}" || \
+ err "mkUbootRom: cannot copy to tmprom"
"${cbfstool}" "${tmprom}" add-payload -f "${target_ubootelf}" \
-n ${target_uboot_cbfs_path} -c lzma || \
- err "cannot add u-boot to tmprom"
+ err "mkUbootRom: cannot add u-boot to tmprom"
printf "%s\n" "${tmprom}"
}
@@ -379,20 +393,23 @@ mkGrubRom() {
if [ "${grub_scan_disk}" = "ahci" ]; then
sed \
's/set\ grub_scan_disk=\"both\"/set\ grub_scan_disk=\"ahci\"/' \
- "${grubcfg}" > "${tmpgrubcfg}"
+ "${grubcfg}" > "${tmpgrubcfg}" || err "mkGrubRom: sed1"
sed \
's/set\ grub_scan_disk=\"both\"/set\ grub_scan_disk=\"ahci\"/' \
- "${grubtestcfg}" > "${tmpgrubtestcfg}"
+ "${grubtestcfg}" > "${tmpgrubtestcfg}" || \
+ err "mkGrubRom: sed2"
elif [ "${grub_scan_disk}" = "ata" ]; then
sed \
's/set\ grub_scan_disk=\"both\"/set\ grub_scan_disk=\"ata\"/' \
- "${grubcfg}" > "${tmpgrubcfg}"
+ "${grubcfg}" > "${tmpgrubcfg}" || err "mkGrubRom: sed3"
sed \
's/set\ grub_scan_disk=\"both\"/set\ grub_scan_disk=\"ata\"/' \
- "${grubtestcfg}" > "${tmpgrubtestcfg}"
+ "${grubtestcfg}" > "${tmpgrubtestcfg}" || \
+ err "mkGrubRom: sed4"
else
- cp "${grubcfg}" "${tmpgrubcfg}"
- cp "${grubtestcfg}" "${tmpgrubtestcfg}"
+ cp "${grubcfg}" "${tmpgrubcfg}" || err "mkGrubRom: grub.cfg cp"
+ cp "${grubtestcfg}" "${tmpgrubtestcfg}" || \
+ err "mkGrubRom: grubtest.cfg cp"
fi
"${cbfstool}" "${tmprom}" add -f "${tmpgrubcfg}" -n grub.cfg -t raw || \
@@ -400,7 +417,8 @@ mkGrubRom() {
"${cbfstool}" "${tmprom}" add -f "${tmpgrubtestcfg}" -n grubtest.cfg \
-t raw || err "mkGrubRom: cannot add grubtest.cfg to tmprom"
- rm -f "${tmpgrubcfg}" "${tmpgrubtestcfg}"
+ rm -f "${tmpgrubcfg}" "${tmpgrubtestcfg}" || \
+ err "mkGrubRom: cannot remove tmp grub.cfg / grubtest.cfg"
backgroundfile="background1280x800.png"
if [ "${board}" = "x60" ] || [ "${board}" = "t60_intelgpu" ]; then
@@ -429,7 +447,8 @@ mkRomsWithGrub() {
elif [ "${payload_seabios_withgrub}" ] && \
[ "${firstpayloadname}" != "grub" ]; then
mv "$(mkSeabiosRom "${x}" "fallback/payload" "$y")" \
- "${tmprompath}"
+ "${tmprompath}" || \
+ err "mkRomsWithGrub: cannot move SeaBIOS ROM to tmprom"
fi
keymaps=""
@@ -469,8 +488,9 @@ mkRomsWithGrub() {
newrompath="${newrompath}${initmode}_${displaymode}_"
newrompath="${newrompath}${keymap}.rom"
fi
- moverom "${tmpgrubrom}" "${newrompath}" "${romtype}"
- rm -f "${tmpgrubrom}"
+ moverom "${tmpgrubrom}" "${newrompath}" "${romtype}" || \
+ err "mkRomsWithGrub, moverom"
+ rm -f "${tmpgrubrom}" || err "rm tmpgrubrom, mkRomsWithGrub"
done
}
@@ -483,18 +503,20 @@ mkRoms()
if [ ! -f "${cbcfgpath}" ]; then
printf "'%s' does not exist. Skipping build for %s %s %s\n" \
- ${cbcfgpath} ${board} ${displaymode} ${initmode}
+ "${cbcfgpath}" "${board}" "${displaymode}" "${initmode}" \
+ 1>&2
return 0
fi
- ./handle config file -b coreboot ${board}
+ ./handle config file -b coreboot ${board} || \
+ err "mkRoms: cannot build coreboot for target: ${board}"
_corebootrom="elf/coreboot/${board}/${initmode}_${displaymode}"
[ "${initmode}" = "normal" ] && \
_corebootrom="${_corebootrom%_${displaymode}}"
_corebootrom="${_corebootrom}/coreboot.rom"
corebootrom="$(mktemp -t coreboot_rom.XXXXXXXXXX)"
- cp "${_corebootrom}" "${corebootrom}"
+ cp "${_corebootrom}" "${corebootrom}" || err "mkRoms: cannot copy rom"
if [ "${payload_memtest}" = "y" ]; then
"${cbfstool}" "${corebootrom}" add-payload \
@@ -516,20 +538,23 @@ mkRoms()
newrompath="${newrompath}${displaymode}.rom"
fi
- moverom "${t}" "${newrompath}" "${romtype}"
- rm -f "${t}"
+ moverom "${t}" "${newrompath}" "${romtype}" || \
+ err "mkRoms: cannot copy rom"
+ rm -f "${t}" || err "cannot rm ${t}"
else
tmprom=$(mktemp -t coreboot_rom.XXXXXXXXXX)
cp "${corebootrom}" "${tmprom}"
mkRomsWithGrub "${tmprom}" "${initmode}" \
- "${displaymode}" "seabios_withgrub"
- rm -f "${tmprom}"
+ "${displaymode}" "seabios_withgrub" || \
+ err "mkRoms: cannot build grub roms, seabios w/grub"
+ rm -f "${tmprom}" || err "mkRoms: can't remove tmprom"
fi
fi
- [ "${payload_grub}" = "y" ] && \
+ [ "${payload_grub}" != "y" ] || \
mkRomsWithGrub "${corebootrom}" "${initmode}" \
- "${displaymode}" "grub"
+ "${displaymode}" "grub" || \
+ err "mkRoms: mkRomsWithGrub failed"
if [ "${payload_uboot}" = "y" ]; then
x=${corebootrom}
@@ -543,8 +568,9 @@ mkRoms()
newrompath="${romdir}/uboot_payload_${board}_"
newrompath="${newrompath}${initmode}_${displaymode}.rom"
fi
- moverom "${tmpubootrom}" "${newrompath}" "${romtype}"
- rm -f "${tmpubootrom}"
+ moverom "${tmpubootrom}" "${newrompath}" "${romtype}" || \
+ err "mkRoms: moverom fail (u-boot)"
+ rm -f "${tmpubootrom}" || err "mkRoms: cannot rm u-boot rom"
fi
}
diff --git a/resources/scripts/build/clean/cbutils b/resources/scripts/build/clean/cbutils
index 067c2cb2..bdacc45a 100755
--- a/resources/scripts/build/clean/cbutils
+++ b/resources/scripts/build/clean/cbutils
@@ -44,15 +44,15 @@ clean_cbutils()
# Clean coreboot, of course
make -C "${tree}/" distclean || \
- err "cannot distclean coreboot tree, ${tree}"
+ err "clean_cbutils: ${tree}: cannot distclean"
# Clean its utilities as well
for util in cbfstool ifdtool nvramtool cbmem; do
make distclean -C "${tree}/util/${util}/" || \
- err "cannot clean util, ${util}, at ${tree}"
+ err "clean_cbutils: ${cbtree} ${util}: can't clean"
done
make distclean -C "${tree}/payloads/libpayload/" || \
- err "cannot distclean libpayload, at ${tree}"
+ err "clean_cbutils: ${tree}: can't distclean libpayload"
done
}
diff --git a/resources/scripts/build/clean/crossgcc b/resources/scripts/build/clean/crossgcc
index 7b1765f8..c76d1849 100755
--- a/resources/scripts/build/clean/crossgcc
+++ b/resources/scripts/build/clean/crossgcc
@@ -37,7 +37,8 @@ clean_crossgcc()
for board in coreboot/*; do
[ -d "${board}" ] || continue
[ "${board##*/}" = "coreboot" ] && continue
- make -C "${board}/" crossgcc-clean || err "make-clean"
+ make -C "${board}/" crossgcc-clean || \
+ err "clean_crossgcc: ${board}: !make crossgcc-clean"
done
}
diff --git a/resources/scripts/build/clean/seabios b/resources/scripts/build/clean/seabios
index c6759e83..0178a729 100755
--- a/resources/scripts/build/clean/seabios
+++ b/resources/scripts/build/clean/seabios
@@ -40,7 +40,8 @@ clean_seabios()
for x in seabios/*; do
[ ! -d "${x}" ] && continue
[ "${x}" = "seabios/seabios" ] && continue
- make -C "${x}" distclean || err "cannot distclean tree, ${x}"
+ make -C "${x}" distclean || \
+ err "clean_seabios: cannot distclean tree, ${x}"
done
}
diff --git a/resources/scripts/build/clean/u-boot b/resources/scripts/build/clean/u-boot
index 7ba3a4a9..5deff216 100755
--- a/resources/scripts/build/clean/u-boot
+++ b/resources/scripts/build/clean/u-boot
@@ -39,11 +39,12 @@ clean_uboot()
fi
make -C "${board}/" distclean || \
- err "cannot distclean u-boot dir, ${board}"
+ err "clean_uboot: cannot distclean ${board}"
- [ ! -e "${board}/.git" ] || \
+ if [ -e "${board}/.git" ]; then
git -C "${board}" clean -fdx || \
- err "cannot clean u-boot git repo, ${board}"
+ err "clean_uboot: ${board}: cannot clean git files"
+ fi
done
}
diff --git a/resources/scripts/build/coreboot/utils b/resources/scripts/build/coreboot/utils
index d381f9e2..bf0c47a7 100755
--- a/resources/scripts/build/coreboot/utils
+++ b/resources/scripts/build/coreboot/utils
@@ -48,7 +48,7 @@ build_for_mainboard() {
tree="undefined"
. "resources/coreboot/${board}/target.cfg" # source
[ "${tree}" = "undefined" ] && \
- err "build/cbutils: improper tree definition for '${board}'"
+ err "build_for_mainboard: improper tree definition for '${board}'"
buildutils "${tree}"
}
@@ -56,19 +56,22 @@ buildutils() {
tree="${1}"
[ -d "coreboot/${tree}/" ] || \
./fetch_trees coreboot $tree || \
- err "cannot fetch ${tree}"
+ err "buildutils: cannot fetch ${tree}"
for util in cbfstool ifdtool; do
[ -f "cbutils/${tree}/${util}" ] && continue
[ -d "cbutils/${tree}" ] || \
mkdir -p "cbutils/${tree}" || \
- err "cannot create directory, cbutils/${tree}"
+ err "buildutils: can't mkdir cbutils/${tree}"
utildir="coreboot/${tree}/util/${util}"
- make distclean -C "${utildir}" || err "cannot clean ${utildir}"
- make -j$(nproc) -C "${utildir}" || err "cannot build ${utildir}"
+ make distclean -C "${utildir}" || \
+ err "buildutils: cannot clean ${utildir}"
+ make -j$(nproc) -C "${utildir}" || \
+ err "buildutils: cannot build ${utildir}"
cp "${utildir}/${util}" "cbutils/${tree}" || \
- err "cannot copy util, ${util}, to cbutils/${tree}/"
- make distclean -C "${utildir}" || err "can't clean ${utildir}"
+ err "buildutils: can't cp ${util} cbutils/${tree}/"
+ make distclean -C "${utildir}" || \
+ err "buildutils: can't clean ${utildir}"
done
}
diff --git a/resources/scripts/build/descriptors/ich9m b/resources/scripts/build/descriptors/ich9m
index 40d95d42..3bfed53c 100755
--- a/resources/scripts/build/descriptors/ich9m
+++ b/resources/scripts/build/descriptors/ich9m
@@ -29,7 +29,8 @@ main()
err "ich9utils make"
[ ! -f "${ich9gen}" ] && err "ich9gen doesn't exist"
- [ -d "descriptors/ich9m/" ] || mkdir -p "descriptors/ich9m/"
+ [ -d "descriptors/ich9m/" ] || mkdir -p "descriptors/ich9m/" || \
+ err "can't create directory: descriptors/ich9m"
rm -f descriptors/ich9m/* || err "rm-rf"
(
diff --git a/resources/scripts/build/grub/payload b/resources/scripts/build/grub/payload
index 7f1d239f..00ed4d44 100755
--- a/resources/scripts/build/grub/payload
+++ b/resources/scripts/build/grub/payload
@@ -46,13 +46,16 @@ main()
handle_dependencies()
{
[ -d "grub/" ] || \
- ./fetch grub || err "cannot fetch grub"
+ ./fetch grub || \
+ err "handle_dependencies: cannot fetch grub"
[ -f "grub/grub-mkstandalone" ] || \
- ./build grub utils || err "cannot build grub utils"
+ ./build grub utils || \
+ err "handle_dependencies: cannot build grub utils"
[ -d "elf/grub" ] || \
- mkdir -p elf/grub || err "cannot create directory, elf/grub"
-
- rm -f elf/grub/* || err "cannot delete files in directory, elf/grub/"
+ mkdir -p elf/grub || \
+ err "handle_dependencies: cannot mkdir elf/grub"
+ rm -f elf/grub/* || \
+ err "handle_dependencies: cannot rm inside: elf/grub/"
}
build_grub_payloads()
@@ -85,15 +88,17 @@ build_grub_elf()
--modules="${grub_modules}" \
--install-modules="${grub_install_modules}" \
${gcfg} ${grubk} || \
- err "cannot create grub payload (grub-mkstandalone)"
+ err "build_grub_elf: cannot build grub payload (grub-mkstandalone)"
}
create_grub_config()
{
sed "s/usqwerty/${keymap}/" < ${grubcfgsdir}/config/grub.cfg \
- > elf/grub/grub_${keymap}.cfg || err "sed failed: grub.cfg"
+ > elf/grub/grub_${keymap}.cfg || \
+ err "create_grub_config: sed failed: grub.cfg"
sed "s/grubtest.cfg/grub.cfg/" < elf/grub/grub_${keymap}.cfg \
- > elf/grub/grub_${keymap}_test.cfg || err "sed failed: grubtest.cfg"
+ > elf/grub/grub_${keymap}_test.cfg || \
+ err "create_grub_config: sed failed: grubtest.cfg"
}
main $@
diff --git a/resources/scripts/build/grub/utils b/resources/scripts/build/grub/utils
index 3ef78227..f0449ed7 100755
--- a/resources/scripts/build/grub/utils
+++ b/resources/scripts/build/grub/utils
@@ -34,12 +34,18 @@ main()
build_grub()
{
(
- cd grub/ || err "cd"
- [ ! -d Makefile ] || make distclean || err "make-distclean"
- ./bootstrap --gnulib-srcdir=gnulib/ --no-git || err "bootstrap"
- ./autogen.sh || err "autogen"
- ./configure --with-platform=coreboot || err "configure"
- make -j$(nproc) || err "make"
+ cd grub/ || \
+ err "build_grub: cd"
+ [ ! -d Makefile ] || make distclean || \
+ err "build_grub: make-distclean"
+ ./bootstrap --gnulib-srcdir=gnulib/ --no-git || \
+ err "build_grub: gnulib bootstrap"
+ ./autogen.sh || \
+ err "build_grub: autogen.sh"
+ ./configure --with-platform=coreboot || \
+ err "build_grub: autoconf"
+ make -j$(nproc) || \
+ err "build_grub: make"
)
}
diff --git a/resources/scripts/build/release/roms b/resources/scripts/build/release/roms
index 8afba9bf..bdc54c9b 100755
--- a/resources/scripts/build/release/roms
+++ b/resources/scripts/build/release/roms
@@ -50,20 +50,26 @@ main()
init_check()
{
- [ -f version ] && \
+ if [ -f version ]; then
version="$(cat version)"
[ -f versiondate ] && \
versiondate="$(cat versiondate)"
[ ! -d "bin/" ] && \
- err "no ROMs built yet. exiting"
- [ ! -d "release/" ] && \
- mkdir -p release/
- [ ! -d "release/${version}/" ] && \
- mkdir -p "release/${version}/"
- [ -d "release/${version}/roms/" ] && \
- rm -Rf "release/${version}/roms/"
- [ ! -d "release/${version}/roms/" ] && \
- mkdir -p "release/${version}/roms/"
+ err "init_check: no ROMs built yet (error)"
+ [ -d "release/" ] || \
+ mkdir -p release/ || \
+ err "init_check: !mkdir -p release/"
+ [ -d "release/${version}/" ] || \
+ mkdir -p "release/${version}/" || \
+ err "init_check: !mkdir -p release/${version}/"
+ [ ! -d "release/${version}/roms/" ] || \
+ rm -Rf "release/${version}/roms/" || \
+ err "init_check: !rm -Rf release/${version}/roms/"
+
+ if [ ! -d "release/${version}/roms/" ]; then
+ mkdir -p "release/${version}/roms/" || \
+ err "init_check: !mkdir -p release/${version}/roms/"
+ fi
}
make_archive()
@@ -90,24 +96,28 @@ make_archive()
CONFIG_INCLUDE_SMSC_SCH5545_EC_FW="n"
# remove ME/MRC/EC firmware from ROM images
- if [ "${CONFIG_HAVE_ME_BIN}" = "y" ] \
- || [ "${target}" = "e6400nvidia_4mb" ]; then
+ 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##*/}"
- printf "%s\n" "${version}" > "${romdir}/version"
- printf "%s\n" "${versiondate}" > "${romdir}/versiondate"
- printf "%s\n" "${projectname}" > "${romdir}/projectname"
+ "${version}" "${projectname}" "${version}" "${target##*/}"
+ printf "%s\n" "${version}" > "${romdir}/version" || \
+ err "make_archive: can't create ${romdir}/version"
+ printf "%s\n" "${versiondate}" > "${romdir}/versiondate" || \
+ err "make_archive: can't create ${romdir}/versiondate"
+ printf "%s\n" "${projectname}" > "${romdir}/projectname" || \
+ err "make_archive: can't create ${romdir}/projectname"
f="release/${version}/roms/${projectname}-${version}_${target##*/}"
- tar -c "${romdir}/" | xz -9e > "${f}.tar.xz"
+ tar -c "${romdir}/" | xz -9e > "${f}.tar.xz" || \
+ err "make_archive: can't create ${f}.tar.xz"
if [ -d "${romdir}_tmp" ]; then
- rm -Rf "${romdir}"
- mv "${romdir}_tmp" "${romdir}"
+ rm -Rf "${romdir}" || err "make_archive: !rm -Rf ${romdir}"
+ mv "${romdir}_tmp" "${romdir}" || \
+ err "make_archive: !mv \"${romdir}_tmp\" \"${romdir}\""
fi
}
@@ -117,21 +127,25 @@ strip_archive()
[ -d coreboot/${tree} ] || \
./fetch_trees coreboot ${tree} || \
- err "cannot fetch source tree, coreboot/${tree}"
+ err "strip_archive: coreboot/${tree}: can't fetch source"
./build coreboot utils ${tree} || \
- err "cannot build utils for coreboot/${tree}"
+ err "strip_archive: coreboot/${tree}: can't build utils"
- rm -Rf "${romdir}_tmp" # dirty hack, to reduce disk io later
+ # dirty hack, to reduce disk io later
# rather than using /tmp, which might not be tmpfs
- mkdir "${romdir}_tmp"
+ rm -Rf "${romdir}_tmp" || err "strip_archive: !rm -Rf ${romdir}_tmp"
+ mkdir "${romdir}_tmp" || err "strip_archive: !mkdir ${romdir}_tmp"
# Hash the rom before removing blobs
- [ -f "${romdir}/blobhashes" ] || \
- printf "ROMs must match these hashes after blob insertion:" \
- > "${romdir}/blobhashes"
+ rm -f "${romdir}/blobhashes" || \
+ err "strip_archive: !rm -f ${blobdir}/blobhashes"
+ touch "${romdir}/blobhashes" || \
+ err "strip_archive: !touch ${blobdir}/blobhashes"
+
(
- cd ${romdir} || err "subshell: cd"
- sha1sum *.rom >> blobhashes || err "subshell: sha1sum"
+ cd ${romdir} || err "strip_archive: !cd ${romdir}"
+ sha1sum *.rom >> blobhashes || \
+ err "strip_archive: ${romdir}: !sha1sum *.rom >> blobhashes"
)
for romfile in "${romdir}"/*.rom; do
@@ -147,32 +161,35 @@ strip_rom_image()
if [ "${CONFIG_HAVE_ME_BIN}" = "y" ]; then
${ifdtool} --nuke me "${romfile}" || \
- err "cannot nuke Intel ME region on file, ${romfile}"
- mv "${romfile}" "${romdir}_tmp"/
- mv "${romfile}.new" "${romfile}"
+ err "strip_rom_images: ${romfile}: cannot nuke Intel ME"
+ mv "${romfile}" "${romdir}_tmp" || \
+ err "strip_rom_images: !mv ${romfile} ${romdir}_tmp"
+ mv "${romfile}.new" "${romfile}" || \
+ err "strip_rom_images: !mv ${romfile}.new ${romfile}"
fi
if [ "${CONFIG_HAVE_MRC}" = "y" ]; then
${cbfstool} "${romfile}" remove -n mrc.bin || \
- err "cannot remove mrc.bin from file, ${romfile}"
+ err "strip_rom_images: ${romfile}: cannot nuke mrc.bin"
${cbfstool} "${romfile}" print || :
fi
if [ "${CONFIG_KBC1126_FIRMWARE}" = "y" ]; then
${cbfstool} "${romfile}" remove -n ecfw1.bin || \
- err "cannot remove ecfw1.bin from file, ${romfile}"
+ err "strip_rom_images: ${romfile}: can't nuke ecfw1.bin"
${cbfstool} "${romfile}" remove -n ecfw2.bin || \
- err "cannot remove ecfw2.bin from file, ${romfile}"
+ err "strip_rom_images: ${romfile}: can't nuke ecfw2.bin"
fi
[ "${CONFIG_INCLUDE_SMSC_SCH5545_EC_FW}" != "y" ] || \
${cbfstool} "${romfile}" remove -n sch5545_ecfw.bin || \
- err "cannot remove sch5545_ecfw.bin from file, ${romfile}"
+ err "strip_rom_images: ${romfile}: can't nuke sch5545ec fw"
# TODO: replace this board-specific hack
- [ "${target}" != "e6400nvidia_4mb" ] || \
+ if [ "${target}" = "e6400nvidia_4mb" ]; then
${cbfstool} "${romfile}" remove -n "pci10de,06eb.rom" || \
- err "cannot remove pci10de,06eb.rom from file, ${romfile}"
+ err "strip_rom_images: ${romfile}: can't nuke e6400 vga rom"
+ fi
}
main $@
diff --git a/resources/scripts/build/release/src b/resources/scripts/build/release/src
index 3f9feb9b..498bfabb 100755
--- a/resources/scripts/build/release/src
+++ b/resources/scripts/build/release/src
@@ -65,55 +65,68 @@ create_release_directory()
dirname="${projectname}-${version}_src"
srcdir="${reldir}/${dirname}"
- [ ! -d "release/" ] && mkdir -p release/
- [ ! -d "${reldir}/" ] && mkdir -p "${reldir}/"
- [ -d "${srcdir}/" ] && \
- rm -Rf "${srcdir}/"
- [ -f "${srcdir}.tar.xz" ] && \
- rm -f "${srcdir}.tar.xz/"
-
- mkdir -p "${srcdir}/"
- printf "%s" "${version}" > "${srcdir}"/version
+ [ -d "release/" ] || mkdir -p release/ || \
+ err "create_release_directory: !mkdir -p release/"
+ [ -d "${reldir}/" ] || mkdir -p "${reldir}/" || \
+ err "create_release_directory: !mkdir -p ${reldir}/"
+ [ ! -d "${srcdir}/" ] || rm -Rf "${srcdir}/" || \
+ err "create_release_directory: !rm -Rf ${srcdir}/"
+ [ ! -f "${srcdir}.tar.xz" ] || \
+ rm -f "${srcdir}.tar.xz/" || \
+ err "create_release_directory: !rm -f ${srcdir}.tar.xz/"
+
+ mkdir -p "${srcdir}/" || \
+ err "create_release_directory: !mkdir -p ${srcdir}/"
+ printf "%s" "${version}" > "${srcdir}"/version || \
+ err "create_release_directory: ${srcdir}/version: can't create file"
}
download_modules()
{
for modname in ${trees_fetch_list}; do
- [ ! -d "${modname}" ] && ./fetch_trees ${modname}
+ [ -d "${modname}" ] || ./fetch_trees ${modname} || \
+ err "download_modules: couldn't download ${modname} trees"
done
for modname in ${simple_fetch_list}; do
- [ ! -d "${modname}/" ] && ./fetch ${modname}
+ [ -d "${modname}/" ] || ./fetch ${modname} || \
+ err "download_modules: couldn't download ${modname} repo"
done
}
copy_files()
{
for dir in ${simple_fetch_list} ${dirlist}; do
- cp -R "${dir}/" "${srcdir}/"
+ cp -R "${dir}/" "${srcdir}/" || \
+ err "copy_files: !cp -R ${dir}/ ${srcdir}/"
done
copy_blobs
for i in ${filelist}; do
if [ ! -f "${i}" ]; then
- rm -Rf "${srcdir}"
- err "file '${1}' does not exist"
+ rm -Rf "${srcdir}" || \
+ err "copy_files: !rm -Rf ${srcdir}"
+ err "copy_files: file '${1}' does not exist"
fi
- cp ${i} "${srcdir}/"
+ cp "${i}" "${srcdir}/" || \
+ err "copy_files: !cp ${i} ${srcdir}/"
done
}
copy_blobs()
{
- mkdir -p "${srcdir}"/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; do
for j in ifd gbe 4_ifd 8_ifd 12_ifd 16_ifd; do
[ -f "blobs/${i}/${j}.bin" ] || continue
[ -e "${srcdir}/blobs/${i}" ] || \
- mkdir -p "${srcdir}/blobs/${i}"
- cp blobs/${i}/${j}.bin "${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
}
@@ -121,45 +134,64 @@ copy_blobs()
purge_files()
{
(
- cd "${srcdir}/coreboot/" || err "cd1"
+ cd "${srcdir}/coreboot/" || err "purge_files 1: !cd ${srcdir}/coreboot/"
for i in *; do
- [ ! -d "${i}" ] && continue
+ [ -d "${i}" ] || continue
(
- cd "${i}/" || err "cd2"
- make distclean || err "make-distclean1"
+ cd "${i}/" || \
+ err "purge_files 2: !cd ${i}/"
+ make distclean || err "purge_files 1: ${i}: !make distclean"
)
- make clean -BC default/util/kbc1126/ || err "make-clean1"
+ make clean -BC default/util/kbc1126/ || \
+ err "purge_files 1: default/util/kbc1126: ! make clean"
done
)
(
- cd "${srcdir}/" || err "cd3"
- ./build clean all || err "build-clean1"
+ cd "${srcdir}/" || \
+ err "purge_files 3: !cd ${srcdir}/"
+ ./build clean all || \
+ err "purge_files 1: ! ./build clean all"
for p in bios_extract flashrom grub ich9utils memtest86plus uefitool; do
- ./build src for -c "${p}"
+ ./build src for -c "${p}" || \
+ err "purge_files: !./build src for -c ${p}"
done
- make clean -BC util/nvmutil || err "make-clean2"
- make clean -BC util/ich9utils || err "make-clean3"
- make clean -BC util/spkmodem_recv || err "make-clean4"
- make clean -BC util/e6400-flash-unlock || err "make-clean5"
-
- rm -Rf coreboot/coreboot/ || err "rm-rf1"
+ make clean -BC util/nvmutil || \
+ err "purge_files 2: !make clean -BC util/nvmutil"
+ make clean -BC util/ich9utils || \
+ err "purge_files 3: !make clean -BC util/ich9utils"
+ make clean -BC util/spkmodem_recv || \
+ err "purge_files 4: !make clean -BC util/spkmodem_recv"
+ make clean -BC util/e6400-flash-unlock || \
+ err "purge_files 5: !make clean -BC util/e6400-flash-unlock"
+
+ rm -Rf coreboot/coreboot/ || \
+ err "purge_files 1: !rm -Rf coreboot/coreboot/"
rm -Rf .git .gitignore */.git* coreboot/*/.git* \
- coreboot/*/3rdparty/*/.git* || err "rm-rf2"
- rm -Rf coreboot/*/util/nvidia/cbootimage/.git* || err "rm-rf3"
- rm -Rf u-boot/u-boot/ u-boot/*/.git* || err "rm-rf4"
+ coreboot/*/3rdparty/*/.git* || \
+ err "purge_files rm-rf2: can't purge .git files/directories"
+ rm -Rf coreboot/*/util/nvidia/cbootimage/.git* || \
+ err "purge_files 3: !rm -Rf coreboot/*/util/nvidia/cbootimage/.git*"
+ rm -Rf u-boot/u-boot/ u-boot/*/.git* || \
+ err "purge_files 4: ¬rm -Rf u-boot/u-boot/ u-boot/*/.git*"
)
}
create_release_archive()
{
(
- cd "${reldir}/" || err "cd4"
- printf "%s\n" "${version}" > "${dirname}/version"
- printf "%s\n" "${versiondate}" > "${dirname}/versiondate"
- printf "%s\n" "${projectname}" > "${dirname}/projectname"
- tar -c "${dirname}/" | xz -9e >"${dirname}.tar.xz" || err "tar"
- rm -Rf "${dirname}/" || err "rm-rf5"
+ cd "${reldir}/" || \
+ err "create_release_archive 4: !cd ${reldir}/"
+ printf "%s\n" "${version}" > "${dirname}/version" || \
+ err "create_release_archive: can't create ${dirname}/version"
+ printf "%s\n" "${versiondate}" > "${dirname}/versiondate" || \
+ err "create_release_archive: can't create ${dirname}/versiondate"
+ printf "%s\n" "${projectname}" > "${dirname}/projectname" || \
+ err "create_release_archive: can't create ${dirname}/projectname"
+ tar -c "${dirname}/" | xz -9e >"${dirname}.tar.xz" || \
+ err "create_release_archive: can't create ${dirname}.tar.xz"
+ rm -Rf "${dirname}/" || \
+ err "create_release_archive 5: !rm -Rf ${dirname}/"
)
}
diff --git a/resources/scripts/build/src/for b/resources/scripts/build/src/for
index 6945b9f9..fd7f84f3 100755
--- a/resources/scripts/build/src/for
+++ b/resources/scripts/build/src/for
@@ -53,24 +53,28 @@ main()
handle_dependencies()
{
[ -d "${project}" ] || ./fetch "${project%/*}" || \
- err "Cannot download project, ${project%/*}"
- [ -d "${project}" ] || err "Project, ${project%/*}, not downloaded"
+ err "handle_dependencies: can't fetch ${project%/*}"
+ [ -d "${project}" ] || \
+ err "handle_dependencies: ${project%/*} not downloaded"
if [ "${project}" = "uefitool" ]; then
(
- cd uefitool || err "cannot cd to uefitool/"
- cmake UEFIExtract/ || err "cannot cmake UEFIExtract"
+ cd uefitool || err "handle_dependencies: !cd uefitool"
+ cmake UEFIExtract/ || \
+ err "handle_dependencies: !cmake UEFIExtract/"
)
fi
}
run_make_command()
{
- [ ! -z "${mode}" ] || \
- make -C "${project}" || err "'make' failed (${project})"
- [ -z "${mode}" ] || \
+ if [ -z "${mode}" ]; then
+ make -C "${project}" || \
+ err "run_make_command: !make -C ${project}"
+ else
make -C "${project}" distclean || make -C "${project}" clean \
- || err "cannot clean project src, ${project}"
+ || err "run_make_command: ${project}: make-clean failed"
+ fi
}
main $@
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-08 04:55:03 +0000