diff options
| -rwxr-xr-x | include/option.sh | 5 | ||||
| -rwxr-xr-x | script/build/boot/roms_helper | 6 | ||||
| -rwxr-xr-x | script/handle/make/config | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/include/option.sh b/include/option.sh index 07ef83c8..73a727e4 100755 --- a/include/option.sh +++ b/include/option.sh @@ -24,10 +24,9 @@ scan_config() awkstr=" /\{.*${1}.*}{/ {flag=1;next} /\}/{flag=0} flag { print }" confdir="${2}" _fail="${3}" - revfile="$(mktemp -t sources.XXXXXXXXXX)" || \ - "${_fail}" "scan_config: Cannot initialise tmpfile" + revfile="$(mktemp -t sources.XXXXXXXXXX)" cat "${confdir}/"* > "${revfile}" || \ - "${_fail}" "scan_config: Cannot concatenate files" + "${_fail}" "scan_config ${confdir}: Cannot concatenate files" while read -r line ; do set ${line} 1>/dev/null 2>/dev/null || : if [ "${1%:}" = "depend" ]; then diff --git a/script/build/boot/roms_helper b/script/build/boot/roms_helper index 2d185b7d..5685ef72 100755 --- a/script/build/boot/roms_helper +++ b/script/build/boot/roms_helper @@ -263,8 +263,7 @@ build_grub_roms() -n background.png -t raw fi - tmpcfg=$(mktemp -t coreboot_rom.XXXXXXXXXX) || - err "build_grub_roms: cannot create temporary scan.cfg" + tmpcfg=$(mktemp -t coreboot_rom.XXXXXXXXXX) x_ printf "set grub_scan_disk=\"%s\"\n" "${grub_scan_disk}" >"${tmpcfg}" [ "${grub_scan_disk}" = "both" ] || \ x_ "${cbfstool}" "${tmprom}" add -f "${tmpcfg}" -n scan.cfg -t raw @@ -302,8 +301,7 @@ mkGrubRom() { keymapcfg="elf/grub/keymap_${_keymap}.cfg" - tmprom=$(mktemp -t coreboot_rom.XXXXXXXXXX) || \ - err "mkGrubRom: cannot create tmprom" + tmprom=$(mktemp -t coreboot_rom.XXXXXXXXXX) x_ cp "${_cbrom}" "${tmprom}" x_ "${cbfstool}" "${tmprom}" add -f "${keymapcfg}" -n keymap.cfg -t raw diff --git a/script/handle/make/config b/script/handle/make/config index d7d11bf1..8795c3ba 100755 --- a/script/handle/make/config +++ b/script/handle/make/config @@ -18,7 +18,7 @@ export LOCALVERSION="-${projectname}-${our_version}" eval "$(setvars "" arch cfgsdir codedir config config_name crossgcc_ada mode \ elfdir listfile project romtype target target_dir targets tree cbfstool)" -tmpclean="$(mktemp -d -t makeclean.XXXXXXXXXX)" || fail "!mkdir tmpclean" +tmpclean="$(mktemp -d -t makeclean.XXXXXXXXXX)" main() { |