diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/get.sh | 3 | ||||
| -rw-r--r-- | include/init.sh | 2 | ||||
| -rw-r--r-- | include/rom.sh | 11 | ||||
| -rw-r--r-- | include/tree.sh | 2 |
4 files changed, 7 insertions, 11 deletions
diff --git a/include/get.sh b/include/get.sh index 6f1b5f1d..3d06eb4a 100644 --- a/include/get.sh +++ b/include/get.sh @@ -111,7 +111,8 @@ try_file() eval "[ -$echk \"$cached\" ] || return 1" if [ "$2" = "git" ]; then - [ -d "$5" ] || tmpclone "$cached" "$5" "$6" "$7" || return 1 + [ -d "$5" ] || tmpclone "$cached" "$5" "$6" "$7" || \ + err "Can't clone final repo in command: try_file $*"; : else bad_checksum "$6" "$cached" && x_ rm -f "$cached" && return 1 [ "$cached" != "$5" ] && x_ cp "$cached" "$5" diff --git a/include/init.sh b/include/init.sh index 38eb1c81..9265bf45 100644 --- a/include/init.sh +++ b/include/init.sh @@ -195,7 +195,7 @@ xbmk_git_init() || err "Run this first: $gitcmd \"your ${gitcmd##*.}\"" done - [ -L ".git" ] && return 1 + [ -L ".git" ] && err "'$xbmkpwd/.git' is a symlink" [ -e ".git" ] && return 0 eval "`setvars "$(date -Rud @$versiondate)" cdate _nogit`" diff --git a/include/rom.sh b/include/rom.sh index 4a3503f4..4ac4c5de 100644 --- a/include/rom.sh +++ b/include/rom.sh @@ -43,7 +43,7 @@ mkpayload_grub() "/boot/grub/grub.cfg=$grubdata/memdisk.cfg"; : } -mkvendorfiles() +corebootpremake() { [ -n "$mode" ] || [ ! -f "$srcdir/.config" ] || $dry printf \ "CONFIG_CCACHE=y\n" >> "$srcdir/.config" || err "$srcdir: !cook"; : @@ -253,10 +253,7 @@ cbfs() mkcoreboottar() { - [ "$target" = "$tree" ] && return 0 - [ "$XBMK_RELEASE" = "y" ] || return 0 - [ "$release" != "n" ] || return 0 - - $dry mkrom_tarball "bin/$target" - $dry x_ ./mk inject "bin/${relname}_${target}.tar.xz" nuke; : + [ "$target" != "$tree" ] && [ "$XBMK_RELEASE" = "y" ] && \ + [ "$release" != "n" ] && $dry mkrom_tarball "bin/$target" && \ + $dry x_ ./mk inject "bin/${relname}_${target}.tar.xz" nuke; : } diff --git a/include/tree.sh b/include/tree.sh index 83887864..8aaadd57 100644 --- a/include/tree.sh +++ b/include/tree.sh @@ -279,8 +279,6 @@ handle_makefile() $dry x_ make -C "$srcdir" $cleanargs clean [ -f "$defconfig" ] && x_ cp "$defconfig" "$srcdir/.config" - [ -n "$mode" ] || [ -n "$btype" ] || $dry make -C \ - "$srcdir" silentoldconfig || make -C "$srcdir" oldconfig || : run_make_command || err "handle_makefile $srcdir: no makefile!" |