diff options
| author | Felix Singer <felixsinger@posteo.net> | 2022-02-27 05:06:09 +0100 |
|---|---|---|
| committer | Felix Singer <felixsinger@posteo.net> | 2022-02-27 18:29:24 +0000 |
| commit | 2060bff9c0d7665d9642525d0a1594ade731cb34 (patch) | |
| tree | c54a4e7389ad40b15fedf6bd94a3fb7a94237071 | |
| parent | e61e7789c23102df588e79101def663a117c365d (diff) | |
utils/cbfstool: Fix building with `make test-tools`
The variable `RM` is empty and thus set it to `rm`. While
executing the `clean` rule, run each `rm` command with the -f flag
to ignore non-existing files.
Also, disable the objutil feature locally fixing another build issue.
Change-Id: Icb17e2c924ef480f8ac6195f96cf495709a0a023
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/62415
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | util/cbfstool/Makefile | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/util/cbfstool/Makefile b/util/cbfstool/Makefile index e853ae509c..034aca26a6 100644 --- a/util/cbfstool/Makefile +++ b/util/cbfstool/Makefile @@ -1,5 +1,6 @@ top ?= $(abspath ../..) objutil ?= $(top)/util +RM ?= rm CONFIG_FMD_GENPARSER ?= n @@ -8,6 +9,7 @@ PREFIX ?= /usr/local BINDIR ?= $(PREFIX)/bin INSTALL ?= /usr/bin/env install OBJCOPY ?= objcopy +override objutil := .. VBOOT_SOURCE ?= $(top)/3rdparty/vboot VBOOT_HOST_BUILD ?= $(abspath $(objutil)/vboot_lib) @@ -35,17 +37,17 @@ cse_serger: $(objutil)/cbfstool/cse_serger .PHONY: clean cbfstool ifittool fmaptool rmodtool ifwitool cbfs-compression-tool elogtool cse_fpt cse_serger clean: - $(RM) fmd_parser.c fmd_parser.h fmd_scanner.c fmd_scanner.h - $(RM) $(objutil)/cbfstool/cbfstool $(cbfsobj) - $(RM) $(objutil)/cbfstool/fmaptool $(fmapobj) - $(RM) $(objutil)/cbfstool/rmodtool $(rmodobj) - $(RM) $(objutil)/cbfstool/ifwitool $(ifwiobj) - $(RM) $(objutil)/cbfstool/ifittool $(ifitobj) - $(RM) $(objutil)/cbfstool/cbfs-compression-tool $(cbfscompobj) - $(RM) $(objutil)/cbfstool/elogtool $(elogobj) - $(RM) $(objutil)/cbfstool/cse_fpt $(cse_fpt_obj) - $(RM) $(objutil)/cbfstool/cse_serger $(cse_serger_obj) - $(RM) -r $(VBOOT_HOST_BUILD) + $(RM) -f fmd_parser.c fmd_parser.h fmd_scanner.c fmd_scanner.h + $(RM) -f $(objutil)/cbfstool/cbfstool $(cbfsobj) + $(RM) -f $(objutil)/cbfstool/fmaptool $(fmapobj) + $(RM) -f $(objutil)/cbfstool/rmodtool $(rmodobj) + $(RM) -f $(objutil)/cbfstool/ifwitool $(ifwiobj) + $(RM) -f $(objutil)/cbfstool/ifittool $(ifitobj) + $(RM) -f $(objutil)/cbfstool/cbfs-compression-tool $(cbfscompobj) + $(RM) -f $(objutil)/cbfstool/elogtool $(elogobj) + $(RM) -f $(objutil)/cbfstool/cse_fpt $(cse_fpt_obj) + $(RM) -f $(objutil)/cbfstool/cse_serger $(cse_serger_obj) + $(RM) -rf $(VBOOT_HOST_BUILD) linux_trampoline.c: linux_trampoline.S rm -f linux_trampoline.c |