diff options
| -rw-r--r-- | config/data/coreboot/mkhelper.cfg | 1 | ||||
| -rw-r--r-- | config/data/seabios/mkhelper.cfg | 1 | ||||
| -rw-r--r-- | config/data/u-boot/mkhelper.cfg | 1 | ||||
| -rwxr-xr-x | script/trees | 10 |
4 files changed, 10 insertions, 3 deletions
diff --git a/config/data/coreboot/mkhelper.cfg b/config/data/coreboot/mkhelper.cfg index a218e0e7..8d892fc4 100644 --- a/config/data/coreboot/mkhelper.cfg +++ b/config/data/coreboot/mkhelper.cfg @@ -2,6 +2,7 @@ makeargs="UPDATED_SUBMODULES=1 CPUS=$XBMK_THREADS" build_depend="seabios/default grub/default memtest86plus u-boot/amd64coreboot" +cleancmd="distclean" seavgabiosrom="elf/seabios/default/libgfxinit/vgabios.bin" diff --git a/config/data/seabios/mkhelper.cfg b/config/data/seabios/mkhelper.cfg index e69de29b..86c74456 100644 --- a/config/data/seabios/mkhelper.cfg +++ b/config/data/seabios/mkhelper.cfg @@ -0,0 +1 @@ +cleancmd="distclean" diff --git a/config/data/u-boot/mkhelper.cfg b/config/data/u-boot/mkhelper.cfg new file mode 100644 index 00000000..86c74456 --- /dev/null +++ b/config/data/u-boot/mkhelper.cfg @@ -0,0 +1 @@ +cleancmd="distclean" diff --git a/script/trees b/script/trees index 698d2b34..b40c00db 100755 --- a/script/trees +++ b/script/trees @@ -14,7 +14,8 @@ XBMKPATH="$PATH" eval `setvars "" xarch srcdir premake cmakedir xlang mode makeargs elfdir cmd \ project target target_dir targets xtree _f release bootstrapargs mkhelper \ autoconfargs listfile autogenargs btype tree rev tree_depend build_depend \ - defconfig postmake mkhelpercfg dry dest_dir mdir cleanargs`; badhash="n" + defconfig postmake mkhelpercfg dry dest_dir mdir cleanargs cleancmd` +badhash="n" main() { @@ -116,7 +117,7 @@ configure_project() { eval `setvars "" xarch xlang build_depend autoconfargs xtree postmake \ tree_depend makeargs btype mkhelper bootstrapargs premake release \ - cleanargs` + cleanargs cleancmd` _tcfg="$1/target.cfg"; badhash="n"; [ -f "$_tcfg" ] || btype="auto" [ -f "$datadir/mkhelper.cfg" ] && eval `setcfg "$datadir/mkhelper.cfg"` @@ -231,7 +232,10 @@ elfcheck() handle_makefile() { - $dry check_makefile "$srcdir" && x_ make -C "$srcdir" $cleanargs clean + _cleancmd="clean" + [ -n "$cleancmd" ] && _cleancmd="$cleancmd" + $dry check_makefile "$srcdir" && \ + x_ make -C "$srcdir" $cleanargs $_cleancmd [ -f "$defconfig" ] && x_ cp "$defconfig" "$srcdir/.config" [ -n "$mode" ] || [ -n "$btype" ] || $dry make -C \ "$srcdir" silentoldconfig || make -C "$srcdir" oldconfig || : |