diff options
Diffstat (limited to 'packages/vpp_ldp.mk')
| -rw-r--r-- | packages/vpp_ldp.mk | 54 |
1 files changed, 37 insertions, 17 deletions
diff --git a/packages/vpp_ldp.mk b/packages/vpp_ldp.mk index 37a72bb..8b1fd7a 100644 --- a/packages/vpp_ldp.mk +++ b/packages/vpp_ldp.mk @@ -30,25 +30,35 @@ define vpp_ldp_patch_cmds git reset --hard; git clean -f; git checkout master; \ if [ $(_VPP_VER) != "master" ] ; then \ echo "--- vpp version: $(_VPP_VER) ---"; \ - git checkout stable/$(_VPP_VER); \ + if [ $(_VPP_VER) = "2005" ]; then \ + git checkout v20.05; \ + elif [ $(_VPP_VER) = "2001" ]; then \ + git checkout v20.01; \ + fi; \ git reset --hard; git clean -f; \ fi @for f in $(CURDIR)/vpp_patches/common/*.patch ; do \ echo Applying patch: $$(basename $$f) ; \ patch -p1 -d $(vpp_ldp_src_dir) < $$f ; \ done - @if [ $(_VPP_VER) = "master" -o $(_VPP_VER) = "2005" ]; then \ - echo "--- vpp master ---"; \ - for f in $(CURDIR)/vpp_patches/common/master/*.patch ; do \ + @if [ $(openssl3_enable) = 1 ]; then \ + for f in $(CURDIR)/vpp_patches/other/*.patch ; do \ echo Applying patch: $$(basename $$f) ; \ - patch -p1 -d $(vpp_ldp_src_dir) < $$f ; \ - done; \ - elif [ $(_VPP_VER) = "2001" ]; then \ - echo "--- vpp 20.01 ---"; \ - for f in $(CURDIR)/vpp_patches/common/2001/*.patch ; do \ - echo Applying patch: $$(basename $$f) ; \ - patch -p1 -d $(vpp_ldp_src_dir) < $$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 \ + echo Applying patch: $$(basename $$f) ; \ + patch -p1 -d $(vpp_ldp_src_dir) < $$f ; \ + done; \ + elif [ $(_VPP_VER) = "2001" ]; then \ + echo "--- vpp 20.01 ---"; \ + for f in $(CURDIR)/vpp_patches/other/2001/*.patch ;do \ + echo Applying patch: $$(basename $$f) ; \ + patch -p1 -d $(vpp_ldp_src_dir) < $$f ; \ + done; \ + fi; \ fi @if [ $(_VPP_VER) = "master" ]; then \ echo "--- patch master ---"; \ @@ -56,6 +66,12 @@ define vpp_ldp_patch_cmds 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 \ @@ -74,11 +90,15 @@ endef define vpp_ldp_build_cmds @cd $(vpp_ldp_src_dir); \ echo "---build : $(vpp_ldp_src_dir)"; \ - export OPENSSL_ROOT_DIR=$(openssl_install_dir); \ - export LD_LIBRARY_PATH=$(openssl_install_dir)/lib; \ - $(MAKE) wipe-release; \ - rm -f $(vpp_ldp_pkg_deb_dir)/*.deb; \ - $(MAKE) build-release; \ + if [ $(openssl3_enable) = 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; \ + else $(MAKE) build-release; \ + fi; \ $(MAKE) pkg-deb; endef @@ -94,7 +114,7 @@ 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 deb-ldp/. + @mv $(I)/openssl-deb/*.deb . @rm $(B)/.openssl.pkg-deb.ok @mv $(vpp_ldp_pkg_deb_dir)/*.deb deb-ldp/. endef |