diff options
Diffstat (limited to 'packages/vpp_ldp.mk')
| -rw-r--r-- | packages/vpp_ldp.mk | 58 |
1 files changed, 26 insertions, 32 deletions
diff --git a/packages/vpp_ldp.mk b/packages/vpp_ldp.mk index 8b1fd7a..05e8398 100644 --- a/packages/vpp_ldp.mk +++ b/packages/vpp_ldp.mk @@ -27,8 +27,8 @@ endef define vpp_ldp_patch_cmds @echo "--- ldp vpp patching ---" @cd $(vpp_ldp_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_ldp_patch_cmds echo Applying patch: $$(basename $$f) ; \ patch -p1 -d $(vpp_ldp_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) = "master" -o $(_VPP_VER) = "2005" ]; then \ - echo "--- vpp master ---"; \ - for f in $(CURDIR)/vpp_patches/other/master/*; do \ + if [ $(_VPP_VER) = $(MAIN_BRANCH) ]; then \ + echo "--- vpp $(MAIN_BRANCH) ---"; \ + for f in $(CURDIR)/vpp_patches/other/$(MAIN_BRANCH)/*; do \ + echo Applying patch: $$(basename $$f) ; \ + patch -p1 -d $(vpp_ldp_src_dir) < $$f ; \ + done; \ + elif [ $(_VPP_VER) = "2005" ]; then \ + echo "--- vpp 20.05 ---"; \ + for f in $(CURDIR)/vpp_patches/other/2005/*; do \ echo Applying patch: $$(basename $$f) ; \ patch -p1 -d $(vpp_ldp_src_dir) < $$f ; \ done; \ @@ -60,25 +66,6 @@ define vpp_ldp_patch_cmds done; \ fi; \ fi - @if [ $(_VPP_VER) = "master" ]; then \ - echo "--- patch master ---"; \ - for f in $(CURDIR)/vpp_patches/ldp/master/*.patch ; do \ - echo Applying patch: $$(basename $$f) ; \ - patch -p1 -d $(vpp_ldp_src_dir) < $$f ; \ - done; \ - elif [ $(_VPP_VER) = "2005" ]; then \ - echo "--- patch v20.05 ---"; \ - for f in $(CURDIR)/vpp_patches/ldp/2005/*.patch ; do \ - echo Applying patch: $$(basename $$f) ; \ - patch -p1 -d $(vpp_ldp_src_dir) < $$f ; \ - done; \ - elif [ $(_VPP_VER) = "2001" ]; then \ - echo "--- patch 2001 ---"; \ - for f in $(CURDIR)/vpp_patches/ldp/2001/*.patch ; do \ - echo Applying patch: $$(basename $$f) ; \ - patch -p1 -d $(vpp_ldp_src_dir) < $$f ; \ - done; \ - fi @true endef @@ -90,16 +77,15 @@ endef define vpp_ldp_build_cmds @cd $(vpp_ldp_src_dir); \ echo "---build : $(vpp_ldp_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_ldp_install_cmds @@ -107,15 +93,23 @@ define vpp_ldp_install_cmds endef define vpp_ldp_pkg_deb_cmds - @true + @cd $(vpp_ldp_src_dir); \ + echo "---build deb: $(vpp_ldp_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_ldp_pkg_deb_cp_cmds @echo "--- move deb to $(CURDIR)/deb-ldp ---" @mkdir -p deb-ldp @ls deb-ldp/ ;rm -f deb-ldp/* - @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_ldp_pkg_deb_dir)/*.deb deb-ldp/. endef |