ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: Use $(MAKE) instead of direct call to make

Browse Source 
No functional changes, just make it to respect original make binary
name used to start building

Type: improvement

Change-Id: Ic8568237fbb39c6a0d3b7405a9670e9410aeb752
Signed-off-by: Renato Botelho do Couto <renato@netgate.com>
This commit is contained in:
Renato Botelho do Couto 2024-06-05 18:11:46 +00:00 committed by Damjan Marion
parent fa500e9854
commit 893dacae3f
8 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -495,17 +495,17 @@ test-cov:
.PHONY: test-cov-hs .PHONY: test-cov-hs
test-cov-hs: test-cov-hs:
@make -C extras/hs-test build-cov @$(MAKE) -C extras/hs-test build-cov
@make -C extras/hs-test test-cov @$(MAKE) -C extras/hs-test test-cov
.PHONY: test-cov-both .PHONY: test-cov-both
test-cov-both: test-cov-both:
@echo "Running Python, Golang tests and merging coverage reports." @echo "Running Python, Golang tests and merging coverage reports."
find $(BR) -name '*.gcda' -delete find $(BR) -name '*.gcda' -delete
@make test-cov @$(MAKE) test-cov
find $(BR) -name '*.gcda' -delete find $(BR) -name '*.gcda' -delete
@make test-cov-hs @$(MAKE) test-cov-hs
@make cov-merge @$(MAKE) cov-merge
.PHONY: test-cov-build .PHONY: test-cov-build
test-cov-build: test-cov-build:
@ -580,7 +580,7 @@ test-shell-cov:
.PHONY: test-dep .PHONY: test-dep
test-dep: test-dep:
@make -C test test-dep @$(MAKE) -C test test-dep
.PHONY: test-doc .PHONY: test-doc
test-doc: test-doc:

2
build-root/Makefile
View File

@ -997,7 +997,7 @@ $(PLATFORM_IMAGE_DIR)/ro.img ro-image: $(patsubst %,%-find-source,$(ROOT_PACKAGE
| xargs sign $($(PLATFORM)_public_key) \ | xargs sign $($(PLATFORM)_public_key) \
$($(PLATFORM)_private_key_passphrase) ; \ $($(PLATFORM)_private_key_passphrase) ; \
fi ; \ fi ; \
: make read-only file system ; \ : $(MAKE) read-only file system ; \
mksquashfs \ mksquashfs \
$${tmp_dir} $${ro_image} \ $${tmp_dir} $${ro_image} \
-no-exports -no-progress -no-recovery ; \ -no-exports -no-progress -no-recovery ; \

4
build/external/Makefile vendored
View File

@ -94,7 +94,7 @@ build-deb: $(DEV_DEB)
install-deb: install-deb:
ifneq ($(INSTALLED_VER),$(DEB_VER)-$(PKG_SUFFIX)) ifneq ($(INSTALLED_VER),$(DEB_VER)-$(PKG_SUFFIX))
@make $(DEV_DEB) @$(MAKE) $(DEV_DEB)
@sudo dpkg -i $(DEV_DEB) @sudo dpkg -i $(DEV_DEB)
else else
@echo "==========================================================" @echo "=========================================================="
@ -175,7 +175,7 @@ ifeq ($(INSTALLED_VER)$(INSTALLED_RPM_VER),)
$(MAKE) config $(MAKE) config
else else
ifneq ($(INSTALLED_VER),) ifneq ($(INSTALLED_VER),)
make check-deb $(MAKE) check-deb
endif endif
ifneq ($(INSTALLED_RPM_VER),) ifneq ($(INSTALLED_RPM_VER),)
$(MAKE) check-rpm $(MAKE) check-rpm

2
build/external/packages/ipsec-mb.mk vendored
View File

@ -32,7 +32,7 @@ define ipsec-mb_config_cmds
endef endef
define ipsec-mb_build_cmds define ipsec-mb_build_cmds
@make -C $(ipsec-mb_src_dir)/lib -j \ @$(MAKE) -C $(ipsec-mb_src_dir)/lib -j \
SHARED=n \ SHARED=n \
SAFE_PARAM=n \ SAFE_PARAM=n \
SAFE_LOOKUP=n \ SAFE_LOOKUP=n \

6
build/external/packages/xdp-tools.mk vendored
View File

@ -24,15 +24,15 @@ define xdp-tools_config_cmds
endef endef
define xdp-tools_build_cmds define xdp-tools_build_cmds
@cd ${xdp-tools_src_dir} && make V=1 BUILD_STATIC_ONLY=y > $(xdp-tools_build_log) @cd ${xdp-tools_src_dir} && $(MAKE) V=1 BUILD_STATIC_ONLY=y > $(xdp-tools_build_log)
endef endef
define xdp-tools_install_cmds define xdp-tools_install_cmds
@rm -f $(xdp-tools_install_log) @rm -f $(xdp-tools_install_log)
@cd ${xdp-tools_src_dir} && \ @cd ${xdp-tools_src_dir} && \
make -C lib/libbpf/src install V=1 BUILD_STATIC_ONLY=y PREFIX='' DESTDIR='$(xdp-tools_install_dir)' >> $(xdp-tools_install_log) $(MAKE) -C lib/libbpf/src install V=1 BUILD_STATIC_ONLY=y PREFIX='' DESTDIR='$(xdp-tools_install_dir)' >> $(xdp-tools_install_log)
@cd ${xdp-tools_src_dir} && \ @cd ${xdp-tools_src_dir} && \
make libxdp_install V=1 BUILD_STATIC_ONLY=y PREFIX='' DESTDIR='$(xdp-tools_install_dir)' >> $(xdp-tools_install_log) $(MAKE) libxdp_install V=1 BUILD_STATIC_ONLY=y PREFIX='' DESTDIR='$(xdp-tools_install_dir)' >> $(xdp-tools_install_log)
endef endef
$(eval $(call package,xdp-tools)) $(eval $(call package,xdp-tools))

6
docs/Makefile
View File

@ -70,7 +70,7 @@ venv:
spell: venv spell: venv
@( \ @( \
. ${VENV_DIR}/bin/activate; \ . ${VENV_DIR}/bin/activate; \
make -C ${SCRIPTS_DIR} generate && \ $(MAKE) -C ${SCRIPTS_DIR} generate && \
$(SPHINXBUILD) -b spelling $(SPHINXOPTS) $(BUILDDIR_SRC) $(BUILDDIR_OUT); \ $(SPHINXBUILD) -b spelling $(SPHINXOPTS) $(BUILDDIR_SRC) $(BUILDDIR_OUT); \
) )
@ -81,7 +81,7 @@ rebuild-spell: clean spell
docs: venv docs: venv
@( \ @( \
. ${VENV_DIR}/bin/activate; \ . ${VENV_DIR}/bin/activate; \
make -C ${SCRIPTS_DIR} generate && \ $(MAKE) -C ${SCRIPTS_DIR} generate && \
$(SPHINXBUILD) $(SPHINXOPTS) -b html $(BUILDDIR_SRC) $(BUILDDIR_OUT); \ $(SPHINXBUILD) $(SPHINXOPTS) -b html $(BUILDDIR_SRC) $(BUILDDIR_OUT); \
) )
@ -90,7 +90,7 @@ rebuild: clean docs
.PHONY: clean .PHONY: clean
clean: clean:
@make -C ${SCRIPTS_DIR} clean @$(MAKE) -C ${SCRIPTS_DIR} clean
.PHONY: build .PHONY: build
build: docs build: docs

10
extras/hs-test/Makefile
View File

@ -87,15 +87,15 @@ list-tests:
.PHONY: build-vpp-release .PHONY: build-vpp-release
build-vpp-release: build-vpp-release:
@make -C ../.. build-release @$(MAKE) -C ../.. build-release
.PHONY: build-vpp-debug .PHONY: build-vpp-debug
build-vpp-debug: build-vpp-debug:
@make -C ../.. build @$(MAKE) -C ../.. build
.PHONY: build-vpp-gcov .PHONY: build-vpp-gcov
build-vpp-gcov: build-vpp-gcov:
@make -C ../.. build-vpp-gcov @$(MAKE) -C ../.. build-vpp-gcov
.build.ok: build .build.ok: build
@touch .build.ok @touch .build.ok
@ -129,7 +129,7 @@ test-cov: .deps.ok .build.cov.ok
-bash ./test --persist=$(PERSIST) --verbose=$(VERBOSE) \ -bash ./test --persist=$(PERSIST) --verbose=$(VERBOSE) \
--unconfigure=$(UNCONFIGURE) --debug=$(DEBUG) --test=$(TEST-HS) --cpus=$(CPUS) \ --unconfigure=$(UNCONFIGURE) --debug=$(DEBUG) --test=$(TEST-HS) --cpus=$(CPUS) \
--vppsrc=$(VPPSRC) --vppsrc=$(VPPSRC)
@make -C ../.. test-cov-post HS_TEST=1 @$(MAKE) -C ../.. test-cov-post HS_TEST=1
@bash ./script/compress.sh @bash ./script/compress.sh
.PHONY: build-go .PHONY: build-go
@ -155,7 +155,7 @@ build-debug: .deps.ok build-vpp-debug build-go
@touch .build.ok @touch .build.ok
.deps.ok: .deps.ok:
@sudo make install-deps @sudo $(MAKE) install-deps
.PHONY: install-deps .PHONY: install-deps
install-deps: install-deps:

4
extras/strongswan/vpp_sswan/Makefile
View File

@ -76,8 +76,8 @@ install-swan:
echo "SSWAN not downloaded, please run "make" or "make pull-swan" first." ; \ echo "SSWAN not downloaded, please run "make" or "make pull-swan" first." ; \
exit 1 ; \ exit 1 ; \
fi fi
cd ${SWANDIR} && make -j$(nproc) cd ${SWANDIR} && $(MAKE) -j$(nproc)
cd ${SWANDIR} && sudo make install cd ${SWANDIR} && sudo $(MAKE) install
# check if VPP is installed # check if VPP is installed
ifneq ($(shell test "$(shell ldconfig -p | grep vppinfra.so | awk 'NR==1{print $$1;}')" && echo "yes"), yes) ifneq ($(shell test "$(shell ldconfig -p | grep vppinfra.so | awk 'NR==1{print $$1;}')" && echo "yes"), yes)