diff options
Diffstat (limited to 'packages/vpp_vcl.mk')
| -rw-r--r-- | packages/vpp_vcl.mk | 55 |
1 files changed, 37 insertions, 18 deletions
diff --git a/packages/vpp_vcl.mk b/packages/vpp_vcl.mk index 2b2dd64..a923d01 100644 --- a/packages/vpp_vcl.mk +++ b/packages/vpp_vcl.mk @@ -27,8 +27,8 @@ endef define vpp_vcl_patch_cmds @echo "--- vpp patching ---" @cd $(vpp_vcl_src_dir); \ - git reset --hard; git clean -f; git checkout master; \ - if [ $(_VPP_VER) != "master" ]; then \ + git reset --hard; git clean -f; git checkout $(MAIN_BRANCH); \ + if [ $(_VPP_VER) != $(MAIN_BRANCH) ]; then \ echo "--- vpp version: $(_VPP_VER) ---"; \ if [ $(_VPP_VER) = "2005" ]; then \ git checkout v20.05; \ @@ -41,14 +41,20 @@ define vpp_vcl_patch_cmds echo Applying patch: $$(basename $$f) ; \ patch -p1 -d $(vpp_vcl_src_dir) < $$f ; \ done - @if [ $(openssl3_enable) = 1 ]; then \ + @if [ $(openssl3_enable) -eq 1 ]; then \ for f in $(CURDIR)/vpp_patches/other/*.patch ; do \ echo Applying patch: $$(basename $$f) ; \ patch -p1 -d $(vpp_vcl_src_dir) < $$f ; \ done; \ - if [ $(_VPP_VER) = "2005" -o $(_VPP_VER) = "master" ]; then \ - echo "--- vpp master ---"; \ - for f in $(CURDIR)/vpp_patches/other/master/*.patch;do\ + if [ $(_VPP_VER) = $(MAIN_BRANCH) ]; then \ + echo "--- vpp $(MAIN_BRANCH) ---"; \ + for f in $(CURDIR)/vpp_patches/other/$(MAIN_BRANCH)/*.patch;do\ + echo Applying patch: $$(basename $$f) ; \ + patch -p1 -d $(vpp_vcl_src_dir) < $$f ; \ + done; \ + elif [ $(_VPP_VER) = "2005" ]; then \ + echo "--- vpp 20.05 ---"; \ + for f in $(CURDIR)/vpp_patches/other/2005/*.patch;do\ echo Applying patch: $$(basename $$f) ; \ patch -p1 -d $(vpp_vcl_src_dir) < $$f ; \ done; \ @@ -60,11 +66,17 @@ define vpp_vcl_patch_cmds done; \ fi; \ fi - @for f in $(CURDIR)/vpp_patches/vcl/*.patch ; do \ - echo Applying patch: $$(basename $$f) ; \ - patch -p1 -d $(vpp_vcl_src_dir) < $$f ; \ - done - + @if [ $(_VPP_VER) = $(MAIN_BRANCH) ]; then \ + for f in $(CURDIR)/vpp_patches/vcl/$(MAIN_BRANCH)/*.patch ; do \ + echo Applying patch: $$(basename $$f) ; \ + patch -p1 -d $(vpp_vcl_src_dir) < $$f ; \ + done; \ + else \ + for f in $(CURDIR)/vpp_patches/vcl/other/*.patch ; do \ + echo Applying patch: $$(basename $$f) ; \ + patch -p1 -d $(vpp_vcl_src_dir) < $$f ; \ + done; \ + fi @true endef @@ -76,16 +88,15 @@ endef define vpp_vcl_build_cmds @cd $(vpp_vcl_src_dir); \ echo "--- build : $(vpp_vcl_src_dir)"; \ - if [ $(openssl3_enable) = 1 ]; then \ + if [ $(openssl3_enable) -eq 1 ]; then \ export OPENSSL_ROOT_DIR=$(openssl_install_dir); \ export LD_LIBRARY_PATH=$(openssl_install_dir)/lib; \ fi; \ $(MAKE) wipe-release; $(MAKE) wipe; \ cd build-root; $(MAKE) distclean; cd ..; \ - if [ $(debug) = 1 ]; then $(MAKE) build;\ + if [ $(debug) -eq 1 ]; then $(MAKE) build;\ else $(MAKE) build-release; \ - fi; \ - $(MAKE) pkg-deb; + fi endef define vpp_vcl_install_cmds @@ -93,15 +104,23 @@ define vpp_vcl_install_cmds endef define vpp_vcl_pkg_deb_cmds - @true + @cd $(vpp_vcl_src_dir); \ + echo "--- build deb : $(vpp_vcl_src_dir)"; \ + if [ $(openssl3_enable) -eq 1 ]; then \ + export OPENSSL_ROOT_DIR=$(openssl_install_dir); \ + export LD_LIBRARY_PATH=$(openssl_install_dir)/lib; \ + fi; \ + $(MAKE) pkg-deb; endef define vpp_vcl_pkg_deb_cp_cmds @echo "--- move deb to $(CURDIR)/dev-vcl ---" @mkdir -p deb-vcl @rm -f deb-vcl/* - @mv $(I)/openssl-deb/*.deb . - @rm $(B)/.openssl.pkg-deb.ok + @if [ $(openssl3_enable) -eq 1 ]; then \ + mv $(I)/openssl-deb/*.deb .; \ + rm $(B)/.openssl.pkg-deb.ok; \ + fi @mv $(vpp_vcl_pkg_deb_dir)/*.deb deb-vcl/. endef |