diff options
| -rwxr-xr-x | build | 12 | ||||
| -rw-r--r-- | config/data/grub/mkhelper.cfg | 5 | ||||
| -rw-r--r-- | config/grub/default/target.cfg | 5 | ||||
| -rw-r--r-- | config/grub/nvme/target.cfg | 5 | ||||
| -rw-r--r-- | config/grub/xhci/target.cfg | 5 | ||||
| -rwxr-xr-x | include/git.sh | 33 | ||||
| -rwxr-xr-x | include/vendor.sh | 18 | ||||
| -rwxr-xr-x | script/roms | 2 | ||||
| -rwxr-xr-x | script/trees | 64 |
9 files changed, 55 insertions, 94 deletions
@@ -92,7 +92,8 @@ build_release() { ( cd "$srcdir" || $err "$vdir: !cd \"$srcdir\"" - fetch_trees + ./update trees -f + rmgit . x_ mv src/docs docs ) || $err "can't create release files" @@ -119,15 +120,6 @@ build_release() rm -Rf "$srcdir" || $err "!rm -Rf $srcdir" } -fetch_trees() -{ - for x in $(ls -1 config/git); do - ./update trees -f "$x" || $err "$vdir: fetch $x" - singletree "$x" || x_ rm -Rf "src/$x/$x" - done - rmgit . -} - fail() { tmp_cleanup || printf "WARNING: can't rm tmpfiles: %s\n" "$TMPDIR" 1>&2 diff --git a/config/data/grub/mkhelper.cfg b/config/data/grub/mkhelper.cfg new file mode 100644 index 00000000..ff93a27c --- /dev/null +++ b/config/data/grub/mkhelper.cfg @@ -0,0 +1,5 @@ +bootstrapargs="--gnulib-srcdir=gnulib/ --no-git" +autoconfargs="--with-platform=coreboot --disable-werror" +makeargs="FS_PAYLOAD_MODULES=\"\"" +btype="autohell" +mkhelper="mkpayload_grub" diff --git a/config/grub/default/target.cfg b/config/grub/default/target.cfg index a5936693..e6ed598b 100644 --- a/config/grub/default/target.cfg +++ b/config/grub/default/target.cfg @@ -1,7 +1,2 @@ tree="default" rev="8719cc2040368d43ab2de0b6e1b850b2c9cfc5b7" -bootstrapargs="--gnulib-srcdir=gnulib/ --no-git" -autoconfargs="--with-platform=coreboot --disable-werror" -makeargs="FS_PAYLOAD_MODULES=\"\"" -btype="autohell" -mkhelper="mkpayload_grub" diff --git a/config/grub/nvme/target.cfg b/config/grub/nvme/target.cfg index f5e95daf..97a0deb5 100644 --- a/config/grub/nvme/target.cfg +++ b/config/grub/nvme/target.cfg @@ -1,7 +1,2 @@ tree="nvme" rev="8719cc2040368d43ab2de0b6e1b850b2c9cfc5b7" -bootstrapargs="--gnulib-srcdir=gnulib/ --no-git" -autoconfargs="--with-platform=coreboot --disable-werror" -makeargs="FS_PAYLOAD_MODULES=\"\"" -btype="autohell" -mkhelper="mkpayload_grub" diff --git a/config/grub/xhci/target.cfg b/config/grub/xhci/target.cfg index 3cdcb5d8..61ee9757 100644 --- a/config/grub/xhci/target.cfg +++ b/config/grub/xhci/target.cfg @@ -1,7 +1,2 @@ tree="xhci" rev="8719cc2040368d43ab2de0b6e1b850b2c9cfc5b7" -bootstrapargs="--gnulib-srcdir=gnulib/ --no-git" -autoconfargs="--with-platform=coreboot --disable-werror" -makeargs="FS_PAYLOAD_MODULES=\"\"" -btype="autohell" -mkhelper="mkpayload_grub" diff --git a/include/git.sh b/include/git.sh index e73f1ad7..b0acd7dc 100755 --- a/include/git.sh +++ b/include/git.sh @@ -2,25 +2,18 @@ # Copyright (c) 2020-2021,2023-2024 Leah Rowe <leah@libreboot.org> # Copyright (c) 2022 Caleb La Grange <thonkpeasant@protonmail.com> -eval `setvars "" rev loc url bkup_url depend tree_depend xtree mdir subhash \ - subrepo subrepo_bkup subfile subfile_bkup` +eval `setvars "" loc url bkup_url subfile mdir subhash subrepo subrepo_bkup \ + depend subfile_bkup` fetch_targets() { - [ ! -d "src/$project/$project" ] && x_ mkdir -p "src/$project" \ - && fetch_project "$project" [ -n "$tree_depend" ] && [ "$tree_depend" != "$tree" ] && \ x_ ./update trees -f "$project" "$tree_depend" - e "src/$project/$tree" d || prepare_new_tree; return 0 -} + e "src/$project/$tree" d && return 0 -prepare_new_tree() -{ printf "Creating %s tree %s\n" "$project" "$tree" - - git_prep "src/$project/$project" "src/$project/$project" \ - "$PWD/$cfgsdir/$tree/patches" "src/$project/$tree" "update" - nuke "$project/$tree" "$project/$tree" + git_prep "$loc" "$loc" "$PWD/$cfgsdir/$tree/patches" \ + "${loc%/*}/$tree" u; nuke "$project/$tree" "$project/$tree" } fetch_project() @@ -44,8 +37,7 @@ fetch_project() clone_project() { - loc="src/$project" - singletree "$project" || loc="src/$project/$project" + loc="src/$project/$project" && singletree "$project" && loc="${loc%/*}" printf "Downloading project '%s' to '%s'\n" "$project" "$loc" e "$loc" d && return 0 @@ -118,14 +110,11 @@ tmpclone() git_am_patches() { - for _patch in "$2/"*; do - [ -L "$_patch" ] || [ ! -f "$_patch" ] || git -C "$1" am \ - "$_patch" || $err "$1 $2: !git am $_patch"; continue - done - for _patches in "$2/"*; do - [ ! -L "$_patches" ] && [ -d "$_patches" ] && \ - git_am_patches "$1" "$_patches"; continue - done + for p in "$2/"*; do + [ -L "$p" ] && continue; [ -e "$p" ] || continue + [ -d "$p" ] && git_am_patches "$1" "$p" && continue + [ ! -f "$p" ] || git -C "$1" am "$p" || $err "$1 $2: !am $p" + done; return 0 } link_crossgcc() diff --git a/include/vendor.sh b/include/vendor.sh index 2c5f7c74..e282eedd 100755 --- a/include/vendor.sh +++ b/include/vendor.sh @@ -83,23 +83,19 @@ fetch() download "$dl" "$dl_bkup" "$_dl" "$dlsum" x_ rm -Rf "${_dl}_extracted" - mkdirs "$_dest" "extract_$dl_type" || return 0 + e "$_dest" f && return 0 + + mkdir -p "${_dest%/*}" || $err "mkdirs: !mkdir -p ${_dest%/*}" + remkdir "$appdir" + extract_archive "$_dl" "$appdir" || [ "$dl_type" = "e6400vga" ] || \ + $err "mkdirs $_dest $dl_type: !extract" + eval "extract_$dl_type" set -u -e e "$_dest" f missing && $err "!extract_$dl_type"; return 0 } -mkdirs() -{ - e "$1" f && return 1 - - mkdir -p "${1%/*}" || $err "mkdirs: !mkdir -p ${1%/*}" - remkdir "$appdir" - extract_archive "$_dl" "$appdir" || [ "$2" = "extract_e6400vga" ] || \ - $err "mkdirs $1 $2: !extract"; return 0 -} - extract_intel_me() { e "$mecleaner" f not && $err "$cbdir: me_cleaner missing" diff --git a/script/roms b/script/roms index 359d5725..8a2cc796 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" diff --git a/script/trees b/script/trees index b5cf13f0..4ab0d406 100755 --- a/script/trees +++ b/script/trees @@ -10,9 +10,9 @@ set -u -e . "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 cmd` +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` main() { @@ -31,11 +31,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" @@ -57,7 +61,7 @@ main() build_project() { - load_project_config "$cfgsdir" || return 0 + load_target_config "$cfgsdir" || return 0 [ -f "$listfile" ] || listfile="" # optional on single-tree dest_dir="$elfdir" @@ -108,48 +112,43 @@ 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" - load_project_config "$target_dir" || return 1 + [ -f "CHANGELOG" ] || fetch_project "$project" + load_target_config "$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 "Dir '%s' missing; skip clean\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() +load_target_config() { eval `setvars "" xarch xlang bootstrapargs autoconfargs xtree \ tree_depend makeargs btype mkhelper` [ -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 - # target.cfg optional on single-tree so return if missing. - # target.cfg mandatory on multi-tree so err if missing. eval `setvars "" rev tree` printf "Loading %s config: %s\n" "$project" "$_tcfg" @@ -202,11 +201,11 @@ check_coreboot_utils() 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" @@ -223,15 +222,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 @@ -247,12 +245,9 @@ run_make_command() && makeargs="$makeargs $cbmakeargs" 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() @@ -300,8 +295,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 $@ |