diff options
Diffstat (limited to 'script')
-rwxr-xr-x | script/roms | 8 | ||||
-rwxr-xr-x | script/trees | 127 |
2 files changed, 66 insertions, 69 deletions
diff --git a/script/roms b/script/roms index 359d5725..14822339 100755 --- a/script/roms +++ b/script/roms @@ -107,7 +107,7 @@ configure_target() [ -n "$uboot_config" ] || uboot_config="default" [ "$payload_uboot" = "y" ] || payload_seabios="y" [ "$payload_grub" = "y" ] && payload_seabios="y" - [ "$payload_seabios" = "y" ] && [ -n "$payload_uboot" = "y" ] && \ + [ "$payload_seabios" = "y" ] && [ "$payload_uboot" = "y" ] && \ $err "$board: U-Boot and SeaBIOS/GRUB are both enabled." [ -z "$grub_scan_disk" ] && grub_scan_disk="nvme ahci ata" @@ -140,8 +140,6 @@ add_payloads() [ "$payload_seabios" = "y" ] && add_seabios_payload [ "$payload_uboot" = "y" ] || return 0 - # add u-boot payload - x_ ./update trees -b u-boot $board ubdir="elf/u-boot/$board/$uboot_config"; ubootelf="$ubdir/u-boot.elf" \ && [ ! -f "$ubootelf" ] && ubootelf="$ubdir/u-boot" [ -f "$ubootelf" ] || $err "$board: Can't find u-boot" @@ -153,7 +151,6 @@ add_payloads() add_seabios_payload() { _seabioself="elf/seabios/default/$initmode/bios.bin.elf" - x_ ./update trees -b seabios pstr="seabios" && [ "$payload_grub" = "y" ] && pstr="seabios_withgrub" newrom="$romdir/${pstr}_${board}_$initmode.rom" @@ -169,14 +166,13 @@ add_seabios_payload() vgaroms/seavgabios.bin raw if [ "$payload_grub" = "y" ]; then - x_ ./update trees -b grub $grubtree cbfs "$tmprom" "$grubelf" "img/grub2" printf "set grub_scan_disk=\"%s\"\n" "$grub_scan_disk" \ > "$TMPDIR/tmpcfg" || $err "$board: !insert scandisk" cbfs "$tmprom" "$TMPDIR/tmpcfg" scan.cfg raw fi - [ "$payload_memtest" = "y" ] && x_ ./update trees -b memtest86plus && \ + [ "$payload_memtest" = "y" ] && \ cbfs "$tmprom" "elf/memtest86plus/memtest.bin" img/memtest cprom "$newrom" && [ "$payload_grub" = "y" ] && \ diff --git a/script/trees b/script/trees index 6865a018..ab321869 100755 --- a/script/trees +++ b/script/trees @@ -9,10 +9,9 @@ set -u -e . "include/lib.sh" . "include/git.sh" -cbmakeargs="UPDATED_SUBMODULES=1 CPUS=$XBMK_THREADS" -eval `setvars "" xarch cdir config cmakedir xlang mode makeargs elfdir xtree \ - project target target_dir targets tree _f target1 bootstrapargs mkhelper \ - autoconfargs config_name listfile autogenargs btype` +eval `setvars "" xarch cdir defconfig cmakedir xlang mode makeargs elfdir cmd \ + project target target_dir targets xtree _f target1 bootstrapargs mkhelper \ + autoconfargs listfile autogenargs btype tree rev tree_depend build_depend` main() { @@ -31,11 +30,15 @@ main() -n) mode="nconfig" ;; *) $err "invalid option '-$option'" ;; esac - [ -n "${OPTARG+x}" ] || $err "OPTARG not set" + [ -z "${OPTARG+x}" ] && shift 1 && break project="${OPTARG#src/}"; shift 2 done [ -z "$_f" ] && $err "missing flag (-m/-u/-b/-c/-x/-f/-s/-l/-n)" - [ -z "$project" ] && $err "project name not specified" + [ -z "$project" ] && for p in $(ls -1 config/git); do + ./update trees $_f "$p" || $err "!./update trees $_f $p" + [ "$XBMK_RELEASE" != "y" ] || singletree "$p" || \ + x_ rm -Rf "src/$p/$p"; continue + done && return 0 [ -f "config/git/$project/pkg.cfg" ] || $err "'$project' not defined" @@ -46,8 +49,8 @@ main() remkdir "${tmpgit%/*}" - _cmd="build_targets" && singletree "$project" && _cmd="build_project" - $_cmd $@ + cmd="build_targets" && singletree "$project" && cmd="build_project" + $cmd $@ [ "$target1" = "utils" ] && [ "$project" = "coreboot" ] && return 0 @@ -57,12 +60,7 @@ main() build_project() { - if [ "$mode" = "fetch" ]; then - [ -f "CHANGELOG" ] && return 0 - fetch_project_repo; return 0 - fi - - load_project_config "$cfgsdir" 0 || return 0 + configure_project "$cfgsdir" || return 0 [ -f "$listfile" ] || listfile="" # optional on single-tree dest_dir="$elfdir" @@ -113,55 +111,66 @@ handle_defconfig() for y in "$target_dir/config"/*; do [ -f "$y" ] || continue - config="$y" - config_name="${config#"$target_dir/config/"}" + defconfig="$y" - [ -n "$mode" ] || check_config || continue + [ -n "$mode" ] || check_defconfig || continue handle_makefile [ -n "$mode" ] || copy_elf - done + done; return 0 } handle_src_tree() { target_dir="$cfgsdir/$target" - if [ "$mode" = "fetch" ]; then - [ -f "CHANGELOG" ] && return 1 - fetch_project_trees; return 1 - fi - load_project_config "$target_dir" || return 1 + [ -f "CHANGELOG" ] || fetch_project "$project" + configure_project "$target_dir" || return 1 x_ mkdir -p "$elfdir/$target" chkvars tree cdir="src/$project/$tree" - if [ ! -d "$cdir" ]; then - if [ "$mode" = "distclean" ] || \ - [ "$mode" = "crossgcc-clean" ]; then - printf "Directory %s missing; skip\n" "$cdir" 1>&2 - return 1 - fi - x_ ./update trees -f "$project" "$target" + if [ "$mode" = "distclean" ] || [ "$mode" = "crossgcc-clean" ]; then + [ -d "$cdir" ] || return 1 fi + x_ ./update trees -f "$project" "$target" [ "$target1" = "utils" ] && [ "$project" = "coreboot" ] && return 0 [ -z "$mode" ] && check_cross_compiler; return 0 } -load_project_config() +configure_project() { - eval `setvars "" xarch xlang tree bootstrapargs autoconfargs xtree \ - tree_depend makeargs btype mkhelper` + eval `setvars "" xarch xlang bootstrapargs autoconfargs xtree \ + tree_depend makeargs btype mkhelper build_depend` [ -f "$1/target.cfg" ] || btype="auto" + [ -f "$datadir/mkhelper.cfg" ] && eval `setcfg "$datadir/mkhelper.cfg"` + + _tcfg="$1/target.cfg" + while [ -f "$_tcfg" ] || [ "$cmd" = "build_targets" ]; do + eval `setvars "" rev tree` + + printf "Loading %s config: %s\n" "$project" "$_tcfg" + eval `setcfg "$_tcfg"` + [ "$cmd" = "build_project" ] && break + [ "$mode" = "fetch" ] || break - # target.cfg optional on single-tree so return if missing. - # target.cfg mandatory on multi-tree so err if missing. - _setcfgarg="" && [ $# -gt 1 ] && _setcfgarg="$2" - eval `setcfg "$1/target.cfg" $_setcfgarg` + [ "${_tcfg%/*/target.cfg}" = "${_tcfg%"/$tree/target.cfg"}" ] \ + && break; _tcfg="${_tcfg%/*/target.cfg}/$tree/target.cfg" + done + + [ -z "$btype" ] || [ "${mode%config}" = "$mode" ] || return 1 + + [ -z "$mode" ] && for bd in $build_depend; do + bd_project="${bd%%/*}"; bd_tree="${bd##*/}" + [ -z "$bd_project" ] && $err "$project/$tree: bad bd: '$bd'" + [ "${bd##*/}" = "$bd" ] && bd_tree="" + [ -z "$bd_project" ] || ./update trees -b $bd_project \ + $bd_tree || $err "$project/$tree: !bd $bd"; continue + done - [ -z "$btype" ] || [ "${mode%config}" = "$mode" ] || \ - return 1; return 0 + [ "$mode" = "fetch" ] || return 0 + [ -f "CHANGELOG" ] && return 1; fetch_${cmd#build_}; return 1 } check_cross_compiler() @@ -178,9 +187,9 @@ check_cross_compiler() [ -n "$xlang" ] && export BUILD_LANGUAGES="$xlang" # sometimes buildgcc fails for like no reason. try twice. - make -C "$cbdir" crossgcc-${_xarch%-*} $cbmakeargs || \ - make -C "$cbdir" crossgcc-${_xarch%-*} $cbmakeargs || \ - $err "!mkxgcc $project/$xtree '${_xarch%-*}' '$cbmakeargs'" + make -C "$cbdir" crossgcc-${_xarch%-*} $makeargs || \ + make -C "$cbdir" crossgcc-${_xarch%-*} $makeargs || \ + $err "!mkxgcc $project/$xtree '${_xarch%-*}' '$makeargs'" done; return 0 } @@ -190,21 +199,20 @@ check_coreboot_utils() utilelfdir="elf/$util/$1" utilsrcdir="src/coreboot/$1/util/$util" - utilmode="" - [ -z "$mode" ] || utilmode="clean" - x_ make -C "$utilsrcdir" $utilmode -j$XBMK_THREADS $cbmakeargs + utilmode="" && [ -n "$mode" ] && utilmode="clean" + x_ make -C "$utilsrcdir" $utilmode -j$XBMK_THREADS $makeargs [ -z "$mode" ] && [ ! -f "$utilelfdir/$util" ] && \ x_ mkdir -p "$utilelfdir" && \ x_ cp "$utilsrcdir/$util" "elf/$util/$1" [ -z "$mode" ] || x_ rm -Rf "$utilelfdir" - done + done; return 0 } -check_config() +check_defconfig() { - [ -f "$config" ] || $err "check_config $project/$target: no config" + [ -f "$defconfig" ] || $err "$project/$target: missing defconfig" - dest_dir="$elfdir/$target/$config_name" + dest_dir="$elfdir/$target/${defconfig#"$target_dir/config/"}" elfcheck || return 1 # skip build if a previous one exists x_ mkdir -p "$dest_dir" @@ -221,15 +229,14 @@ elfcheck() handle_makefile() { check_makefile "$cdir" && x_ make clean -C "$cdir" - x_ cp "$config" "$cdir/.config" + x_ cp "$defconfig" "$cdir/.config" [ -n "$mode" ] || [ -n "$btype" ] || make -C "$cdir" \ silentoldconfig || make -C "$cdir" oldconfig || : run_make_command || $err "handle_makefile $cdir: no makefile!" - _copy=".config" - [ "$mode" = "savedefconfig" ] && _copy="defconfig" - [ "${mode%config}" = "$mode" ] || x_ cp "$cdir/$_copy" "$config" + _copy=".config" && [ "$mode" = "savedefconfig" ] && _copy="defconfig" + [ "${mode%config}" = "$mode" ] || x_ cp "$cdir/$_copy" "$defconfig" [ -e "$cdir/.git" ] && [ "$project" = "u-boot" ] && \ [ "$mode" = "distclean" ] && x_ git -C "$cdir" clean -fdx; return 0 @@ -241,16 +248,12 @@ run_make_command() check_makefile "$cdir" || return 1 [ "$project" = "coreboot" ] && [ -z "$mode" ] && x_ \ - printf "%s\n" "${version%%-*}" > "$cdir/.coreboot-version" \ - && makeargs="$makeargs $cbmakeargs" + printf "%s\n" "${version%%-*}" > "$cdir/.coreboot-version" make -C "$cdir" $mode -j$XBMK_THREADS $makeargs || $err "$cdir mk$mode" + [ -z "$mkhelper" ] || [ -n "$mode" ] || $mkhelper || $err "!$mkhelper" - [ -z "$mkhelper" ] || [ -n "$mode" ] || $mkhelper || \ - $err "$cdir: helper command failed: $mkhelper" # eg mkpayload_grub - - [ "$mode" != "clean" ] && return 0 - make -C "$cdir" distclean 2>/dev/null || : + [ "$mode" = "clean" ] && make -C "$cdir" distclean || :; return 0 } check_cmake() @@ -281,7 +284,6 @@ mkpayload_grub() { eval `setvars "" grub_modules grub_install_modules` eval `setcfg "$grubdata/module/$tree"` - chkvars "grub_install_modules" "grub_modules" x_ rm -f "$cdir/grub.elf" @@ -299,8 +301,7 @@ copy_elf() { [ -f "$listfile" ] && x_ mkdir -p "$dest_dir" && while read -r f; do [ -f "$cdir/$f" ] && x_ cp "$cdir/$f" "$dest_dir" - done < "$listfile" - x_ make clean -C "$cdir" + done < "$listfile"; x_ make clean -C "$cdir" } main $@ |