From 196579c65bc378929fe2d9413f71f939a2f38d99 Mon Sep 17 00:00:00 2001 From: "xiaolongx.jiang" Date: Tue, 19 May 2020 10:16:49 +0000 Subject: Keep one deb file Signed-off-by: xiaolongx.jiang Change-Id: Ib66af0b6f1bffd0b7f5de889d96bd1310aa5a033 --- README.md | 16 ++++++++++++++-- packages/nginx_ldp.mk | 4 ++-- packages/nginx_vcl.mk | 4 ++-- packages/vpp_ldp.mk | 18 +++++++----------- packages/vpp_vcl.mk | 17 +++++++---------- 5 files changed, 32 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index e8cf839..79e0e29 100644 --- a/README.md +++ b/README.md @@ -39,15 +39,27 @@ $ make dep Build vcl DEB package and store the DEB files in folder '/path/to/this/repo/deb-vcl' $ make deb-vcl -Build vcl vpp and vcl nginx and store the vcl files in folder '/path/to/this/repo/_install/local' +Build vcl vpp and vcl nginx +Nginx and Openssl are in folder '/path/to/this/repo/_install/local' +Vpp is in '/path/to/this/repo/vpp' $ make build-vcl Build ldp DEB package and store the DEB files in folder '/path/to/this/repo/deb-ldp' $ make deb-ldp -Build ldp vpp and ldp nginx and store the vcl files in folder '/path/to/this/repo/_install/local' +Build ldp vpp and ldp nginx +Nginx and Openssl are in folder '/path/to/this/repo/_install/local' +Vpp is in '/path/to/this/repo/vpp' $ make build-ldp +In addition,VPP can select master and 2001 branches. +For example: +$ make deb-vcl vpp=2001 + +If you don't take the parameter, the default is master. +For example: +$ make deb-vcl + Clean up build vcl environment, remove _build/.*vcl*. for example: rm _build/.vpp_vcl.build.ok and so on $ make clean-vcl diff --git a/packages/nginx_ldp.mk b/packages/nginx_ldp.mk index cde52a2..96f2953 100644 --- a/packages/nginx_ldp.mk +++ b/packages/nginx_ldp.mk @@ -62,8 +62,8 @@ define nginx_ldp_pkg_deb_cmds endef define nginx_ldp_pkg_deb_cp_cmds - @echo "--- copy deb to $(CURDIR)/deb-ldp ---" - @cp $(nginx_ldp_pkg_deb_dir)/*.deb deb-ldp/. + @echo "--- move deb to $(CURDIR)/deb-ldp ---" + @mv $(nginx_ldp_pkg_deb_dir)/*.deb deb-ldp/. endef $(eval $(call package,nginx_ldp)) diff --git a/packages/nginx_vcl.mk b/packages/nginx_vcl.mk index 031ada9..1ad163b 100644 --- a/packages/nginx_vcl.mk +++ b/packages/nginx_vcl.mk @@ -67,8 +67,8 @@ define nginx_vcl_pkg_deb_cmds endef define nginx_vcl_pkg_deb_cp_cmds - @echo "--- copy deb to $(CURDIR)/deb-vcl ---" - @cp $(nginx_vcl_pkg_deb_dir)/*.deb deb-vcl/. + @echo "--- move deb to $(CURDIR)/deb-vcl ---" + @mv $(nginx_vcl_pkg_deb_dir)/*.deb deb-vcl/. endef $(eval $(call package,nginx_vcl)) diff --git a/packages/vpp_ldp.mk b/packages/vpp_ldp.mk index cdf6307..2f4eae1 100644 --- a/packages/vpp_ldp.mk +++ b/packages/vpp_ldp.mk @@ -27,7 +27,7 @@ define vpp_ldp_patch_cmds @echo "--- ldp vpp patching ---" @cd $(vpp_ldp_src_dir); \ git reset --hard; git clean -f; git checkout master; \ - if [ ! -z $(_VPP_VER) ] ; then \ + if [ ! -z $(_VPP_VER) -a $(_VPP_VER) != "master" ] ; then \ echo "--- vpp version: $(_VPP_VER) ---"; \ git checkout remotes/origin/stable/$(_VPP_VER); \ git reset --hard; git clean -f; \ @@ -36,7 +36,7 @@ define vpp_ldp_patch_cmds echo Applying patch: $$(basename $$f) ; \ patch -p1 -d $(vpp_ldp_src_dir) < $$f ; \ done - @if [ -z $(_VPP_VER) ]; then \ + @if [ -z $(_VPP_VER) -o $(_VPP_VER) = "master" ]; then \ echo "--- vpp master ---"; \ for f in $(CURDIR)/vpp_patches/common/master/*.patch ; do \ echo Applying patch: $$(basename $$f) ; \ @@ -78,12 +78,7 @@ define vpp_ldp_build_cmds $(MAKE) wipe-release; \ rm -f $(vpp_ldp_pkg_deb_dir)/*.deb; \ $(MAKE) build-release; \ - $(MAKE) pkg-deb; \ - echo "--- Please wait for the final completion ..."; \ - cd ..; rm -rf $(vcl_vpp_install_dir)/vpp; \ - cp -rf vpp $(vcl_vpp_install_dir); \ - echo "--- Completed! ---" - + $(MAKE) pkg-deb; endef define vpp_ldp_install_cmds @@ -95,11 +90,12 @@ define vpp_ldp_pkg_deb_cmds endef define vpp_ldp_pkg_deb_cp_cmds - @echo "--- copy deb to $(CURDIR)/deb-ldp ---" + @echo "--- move deb to $(CURDIR)/deb-ldp ---" @mkdir -p deb-ldp @ls deb-ldp/ ;rm -f deb-ldp/* - @cp $(I)/openssl-deb/*.deb deb-ldp/. - @cp $(vpp_ldp_pkg_deb_dir)/*.deb deb-ldp/. + @mv $(I)/openssl-deb/*.deb deb-ldp/. + @rm $(B)/.openssl.pkg-deb.ok + @mv $(vpp_ldp_pkg_deb_dir)/*.deb deb-ldp/. endef $(eval $(call package,vpp_ldp)) diff --git a/packages/vpp_vcl.mk b/packages/vpp_vcl.mk index 9b83678..d8c9600 100644 --- a/packages/vpp_vcl.mk +++ b/packages/vpp_vcl.mk @@ -27,7 +27,7 @@ define vpp_vcl_patch_cmds @echo "--- vpp patching ---" @cd $(vpp_vcl_src_dir); \ git reset --hard; git clean -f; git checkout master; \ - if [ ! -z $(_VPP_VER) ]; then \ + if [ ! -z $(_VPP_VER) -a $(_VPP_VER) != "master" ]; then \ echo "--- vpp version: $(_VPP_VER) ---"; \ git checkout origin/stable/$(_VPP_VER); \ git reset --hard; git clean -f; \ @@ -36,7 +36,7 @@ define vpp_vcl_patch_cmds echo Applying patch: $$(basename $$f) ; \ patch -p1 -d $(vpp_vcl_src_dir) < $$f ; \ done - @if [ -z $(_VPP_VER) ]; then \ + @if [ -z $(_VPP_VER) -o $(_VPP_VER) = "master" ]; then \ echo "--- vpp master ---"; \ for f in $(CURDIR)/vpp_patches/common/master/*.patch ; do \ echo Applying patch: $$(basename $$f) ; \ @@ -70,11 +70,7 @@ define vpp_vcl_build_cmds $(MAKE) wipe-release; \ rm -f $(vpp_vcl_pkg_deb_dir)/*.deb; \ $(MAKE) build-release; \ - $(MAKE) pkg-deb; \ - echo "--- Please wait for the final completion ..."; \ - cd ..; rm -rf $(vpp_vcl_install_dir)/vpp; \ - cp -rf vpp $(vpp_vcl_install_dir); \ - echo "--- Completed! ---" + $(MAKE) pkg-deb; endef define vpp_vcl_install_cmds @@ -86,11 +82,12 @@ define vpp_vcl_pkg_deb_cmds endef define vpp_vcl_pkg_deb_cp_cmds - @echo "--- copy deb to $(CURDIR)/dev-vcl ---" + @echo "--- move deb to $(CURDIR)/dev-vcl ---" @mkdir -p deb-vcl @rm -f deb-vcl/* - @cp $(I)/openssl-deb/*.deb deb-vcl/. - @cp $(vpp_vcl_pkg_deb_dir)/*.deb deb-vcl/. + @mv $(I)/openssl-deb/*.deb deb-vcl/. + @rm $(B)/.openssl.pkg-deb.ok + @mv $(vpp_vcl_pkg_deb_dir)/*.deb deb-vcl/. endef $(eval $(call package,vpp_vcl)) -- cgit 1.2.3-korg