diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/get.sh | 2 | ||||
| -rw-r--r-- | include/rom.sh | 32 | ||||
| -rw-r--r-- | include/tree.sh | 36 |
3 files changed, 37 insertions, 33 deletions
diff --git a/include/get.sh b/include/get.sh index 0d430abe..4731c694 100644 --- a/include/get.sh +++ b/include/get.sh @@ -288,7 +288,7 @@ try_git() x_ mv "$tmpgitcache" "$gitdest" fi - if git -C "$gitdest" whatchanged "$7" 1>/dev/null 2>/dev/null && \ + if git -C "$gitdest" show "$7" 1>/dev/null 2>/dev/null && \ [ "$forcepull" != "y" ]; then # don't try to pull the latest changes if the given target # revision already exists locally. this saves a lot of time diff --git a/include/rom.sh b/include/rom.sh index 67723559..8cb0f318 100644 --- a/include/rom.sh +++ b/include/rom.sh @@ -233,26 +233,25 @@ mkcorebootbin_real() payload_grubsea="n" fi + $if_dry_build \ + return 0 + if [ -f "$cbfscfg" ]; then - $if_not_dry_build \ - dx_ add_cbfs_option "$cbfscfg" + dx_ add_cbfs_option "$cbfscfg" fi - if $if_not_dry_build grep "CONFIG_PAYLOAD_NONE=y" "$defconfig"; then + if grep "CONFIG_PAYLOAD_NONE=y" "$defconfig"; then if [ "$payload_seabios" = "y" ]; then pname="seabios" - $if_not_dry_build \ - add_seabios + add_seabios fi if [ "$payload_uboot" = "arm64" ]; then pname="uboot" - $if_not_dry_build \ - add_uboot + add_uboot fi else pname="custom" - $if_not_dry_build \ - cprom + cprom fi; : } @@ -502,13 +501,14 @@ cbfs() mkcoreboottar() { - if [ "$target" != "$tree" ] && [ "$XBMK_RELEASE" = "y" ] && \ - [ "$release" != "n" ]; then - - $if_not_dry_build \ - mkrom_tarball "bin/$target" + $if_dry_build \ + return 0 - $if_not_dry_build \ - x_ ./mk inject "bin/${relname}_${target}.tar.xz" nuke + if [ "$target" = "$tree" ] || [ "$XBMK_RELEASE" != "y" ] || \ + [ "$release" = "n" ]; then + return 0 fi + + mkrom_tarball "bin/$target" + x_ ./mk inject "bin/${relname}_${target}.tar.xz" nuke } diff --git a/include/tree.sh b/include/tree.sh index 7b5d57b5..2020c450 100644 --- a/include/tree.sh +++ b/include/tree.sh @@ -52,7 +52,7 @@ forcepull="" trees() { - flags="f:b:m:u:c:x:s:l:n:d:" + flags="f:F:b:m:u:c:x:s:l:n:d:" while getopts $flags option do @@ -240,9 +240,10 @@ handle_defconfig() if [ -z "$mode" ]; then for _xarch in $xarch; do + $if_dry_build \ + break if [ -n "$_xarch" ]; then - $if_not_dry_build \ - check_cross_compiler "$_xarch" + check_cross_compiler "$_xarch" fi done; : fi @@ -629,7 +630,9 @@ check_defconfig() # skip build if a previous one exists: - if ! $if_not_dry_build elfcheck; then + $if_dry_build \ + return 0 + if ! elfcheck; then return 1 fi } @@ -701,25 +704,26 @@ run_make_command() fi if [ "$mode" = "clean" ]; then - $if_not_dry_build \ - make -C "$srcdir" $cleanargs distclean || \ - $if_not_dry_build \ - x_ make -C "$srcdir" $cleanargs clean; : + $if_dry_build \ + return 0 + if ! make -C "$srcdir" $cleanargs distclean; then + x_ make -C "$srcdir" $cleanargs clean + fi fi } check_cmake() { - if [ -n "$cmakedir" ]; then - if ! $if_not_dry_build check_makefile "$1"; then - if ! cmake -B "$1" "$1/$cmakedir"; then - $if_not_dry_build \ - x_ check_makefile "$1" - fi + $if_dry_build \ + return 0 + if [ ! -n "$cmakedir" ]; then + return 0 + elif ! check_makefile "$1"; then + if ! cmake -B "$1" "$1/$cmakedir"; then + x_ check_makefile "$1" fi - $if_not_dry_build \ - x_ check_makefile "$1"; : fi + x_ check_makefile "$1"; : } check_autoconf() |