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 | 9 | ||||
-rwxr-xr-x | include/vendor.sh | 18 | ||||
-rwxr-xr-x | script/roms | 2 | ||||
-rwxr-xr-x | script/trees | 9 |
9 files changed, 26 insertions, 44 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 70ec087c..b0acd7dc 100755 --- a/include/git.sh +++ b/include/git.sh @@ -110,11 +110,10 @@ tmpclone() git_am_patches() { - for _patch in "$2/"*; do - [ -L "$_patch" ] || [ ! -f "$_patch" ] || git -C "$1" am \ - "$_patch" || $err "$1 $2: !git am $_patch" - [ -L "$_patch" ] || [ ! -d "$_patch" ] || \ - git_am_patches "$1" "$_patch"; continue + 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 } 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 2b7dfaf0..4ab0d406 100755 --- a/script/trees +++ b/script/trees @@ -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" @@ -141,6 +145,7 @@ 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 |