diff options
Diffstat (limited to 'packages')
-rw-r--r-- | packages/nginx_ldp.mk | 30 | ||||
-rw-r--r-- | packages/nginx_vcl.mk | 30 | ||||
-rw-r--r-- | packages/openssl-dl.mk | 4 | ||||
-rw-r--r-- | packages/openssl.mk | 2 | ||||
-rw-r--r-- | packages/post-install | 3 | ||||
-rw-r--r-- | packages/pre-remove | 25 | ||||
-rw-r--r-- | packages/vpp_ldp.mk | 54 | ||||
-rw-r--r-- | packages/vpp_vcl.mk | 46 |
8 files changed, 158 insertions, 36 deletions
diff --git a/packages/nginx_ldp.mk b/packages/nginx_ldp.mk index 5dbe375..f7756de 100644 --- a/packages/nginx_ldp.mk +++ b/packages/nginx_ldp.mk @@ -21,6 +21,12 @@ nginx_ldp_tarball := nginx-$(nginx_ldp_version).tar.gz nginx_ldp_tarball_strip_dirs := 1 nginx_ldp_desc := "ldp nginx" +vsap_ldp_pkg_deb_name := vsap-ldp +vsap_ldp_version := 1.0 +vsap_ldp_install_dir := $(CURDIR)/root +vsap_ldp_pkg_deb_dir := $(CURDIR)/ +vsap_ldp_deb_inst_dir := / +vsap_ldp_desc := "vsap ldp" define nginx_ldp_patch_cmds @true @@ -64,6 +70,30 @@ endef define nginx_ldp_pkg_deb_cp_cmds @echo "--- move deb to $(CURDIR)/deb-ldp ---" @mv $(nginx_ldp_pkg_deb_dir)/*.deb deb-ldp/. + @for f in deb-ldp/*.deb ; do \ + echo $$f: $$(basename $$f) ; \ + dpkg -x $$f root ; \ + done + @fpm -f -s dir \ + -t deb \ + -n $(vsap_ldp_pkg_deb_name) \ + -v $(vsap_ldp_version) \ + -C $(vsap_ldp_install_dir) \ + -p $(vsap_ldp_pkg_deb_dir) \ + --prefix $(vsap_ldp_deb_inst_dir) \ + --license $(LICENSE) \ + --iteration $(LINUX_ITER) \ + --vendor Intel \ + --description $(vsap_ldp_desc) \ + --pre-install packages/pre-install \ + --post-install packages/post-install \ + --before-remove packages/pre-remove \ + --deb-no-default-config-files + + @for f in *.deb ; do \ + echo "Move package {:path=>$(CURDIR)/deb-ldp/$$f }" ; \ + done + @rm -rf root; rm deb-ldp/*.deb; mv *.deb deb-ldp/ endef $(eval $(call package,nginx_ldp)) diff --git a/packages/nginx_vcl.mk b/packages/nginx_vcl.mk index 8c53733..2b3425f 100644 --- a/packages/nginx_vcl.mk +++ b/packages/nginx_vcl.mk @@ -23,6 +23,12 @@ nginx_vcl_tarball := nginx-$(nginx_vcl_version).tar.gz nginx_vcl_tarball_strip_dirs := 1 nginx_vcl_desc := "vcl nginx" +vsap_vcl_pkg_deb_name := vsap-vcl +vsap_vcl_version := 1.0 +vsap_vcl_install_dir := $(CURDIR)/root +vsap_vcl_pkg_deb_dir := $(CURDIR)/ +vsap_vcl_deb_inst_dir := / +vsap_vcl_desc := "vsap vcl" define nginx_vcl_patch_cmds @for f in $(nginx_vcl_patch_dir)/*.patch ; do \ @@ -69,6 +75,30 @@ endef define nginx_vcl_pkg_deb_cp_cmds @echo "--- move deb to $(CURDIR)/deb-vcl ---" @mv $(nginx_vcl_pkg_deb_dir)/*.deb deb-vcl/. + @for f in deb-vcl/*.deb ; do \ + echo $$f: $$(basename $$f) ; \ + dpkg -x $$f root ; \ + done + @fpm -f -s dir \ + -t deb \ + -n $(vsap_vcl_pkg_deb_name) \ + -v $(vsap_vcl_version) \ + -C $(vsap_vcl_install_dir) \ + -p $(vsap_vcl_pkg_deb_dir) \ + --prefix $(vsap_vcl_deb_inst_dir) \ + --license $(LICENSE) \ + --iteration $(LINUX_ITER) \ + --vendor Intel \ + --description $(vsap_vcl_desc) \ + --pre-install packages/pre-install \ + --post-install packages/post-install \ + --before-remove packages/pre-remove \ + --deb-no-default-config-files + + @for f in *.deb ; do \ + echo "Move package {:path=>$(CURDIR)/deb-vcl/$$f }" ; \ + done + @rm -rf root; rm deb-vcl/*.deb; mv *.deb deb-vcl/ endef $(eval $(call package,nginx_vcl)) diff --git a/packages/openssl-dl.mk b/packages/openssl-dl.mk index c46271c..635ad27 100644 --- a/packages/openssl-dl.mk +++ b/packages/openssl-dl.mk @@ -11,9 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -openssl_version := 3.0.0-alpha3 +openssl_version := 3.0.0-alpha4 openssl_tarball := openssl-$(openssl_version).tar.gz -openssl_tarball_md5sum := f43ee43c09ce92e4995921b33032db16 +openssl_tarball_md5sum := 77b49cc5de23ef79a75a6d3aaa555b46 openssl_url := https://www.openssl.org/source/$(openssl_tarball) $(eval $(call download,openssl)) diff --git a/packages/openssl.mk b/packages/openssl.mk index f395efa..b31257a 100644 --- a/packages/openssl.mk +++ b/packages/openssl.mk @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -openssl_version := 3.0.0-alpha2 +openssl_version := 3.0.0-alpha4 openssl_install_dir := /usr/local/ssl openssl_deb_inst_dir := /usr/local/ssl openssl_pkg_deb_name := openssl3 diff --git a/packages/post-install b/packages/post-install new file mode 100644 index 0000000..892b7ce --- /dev/null +++ b/packages/post-install @@ -0,0 +1,3 @@ +#!/bin/bash +groupadd -f -r vpp +service vpp restart diff --git a/packages/pre-remove b/packages/pre-remove new file mode 100644 index 0000000..c565148 --- /dev/null +++ b/packages/pre-remove @@ -0,0 +1,25 @@ +#!/bin/sh -e + +killall -v -s 9 nginx | true +service vpp stop + +removed= + +# Unbind user-mode PCI drivers +pci_dirs=`find /sys/bus/pci/drivers -type d -name igb_uio -o -name uio_pci_generic -o -name vfio-pci` +for d in $pci_dirs; do + for f in ${d}/*; do + [ -e "${f}/config" ] || continue + echo ${f##*/} > ${d}/unbind + basename `dirname ${f}` | xargs echo -n "Removing driver"; echo " for PCI ID" `basename ${f}` + removed=y + done +done +if [ -n "${removed}" ]; then + echo "There are changes in PCI drivers, rescaning" + echo 1 > /sys/bus/pci/rescan +else + echo "There weren't PCI devices binded" +fi + + 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 diff --git a/packages/vpp_vcl.mk b/packages/vpp_vcl.mk index 1a7ffce..2b2dd64 100644 --- a/packages/vpp_vcl.mk +++ b/packages/vpp_vcl.mk @@ -30,25 +30,35 @@ define vpp_vcl_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_vcl_src_dir) < $$f ; \ done - @if [ $(_VPP_VER) = "2005" -o $(_VPP_VER) = "master" ]; then \ - echo "--- vpp master ---"; \ - for f in $(CURDIR)/vpp_patches/common/master/*.patch ; do \ - echo Applying patch: $$(basename $$f) ; \ - patch -p1 -d $(vpp_vcl_src_dir) < $$f ; \ - done; \ - elif [ $(_VPP_VER) = "2001" ]; then \ - echo "--- vpp 20.01 ---"; \ - for f in $(CURDIR)/vpp_patches/common/2001/*.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_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\ + echo Applying patch: $$(basename $$f) ; \ + patch -p1 -d $(vpp_vcl_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_vcl_src_dir) < $$f ; \ + done; \ + fi; \ fi @for f in $(CURDIR)/vpp_patches/vcl/*.patch ; do \ echo Applying patch: $$(basename $$f) ; \ @@ -66,11 +76,15 @@ endef define vpp_vcl_build_cmds @cd $(vpp_vcl_src_dir); \ echo "--- build : $(vpp_vcl_src_dir)"; \ - export OPENSSL_ROOT_DIR=$(openssl_install_dir); \ - export LD_LIBRARY_PATH=$(openssl_install_dir)/lib; \ - $(MAKE) wipe-release; \ - rm -f $(vpp_vcl_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 @@ -86,7 +100,7 @@ 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 deb-vcl/. + @mv $(I)/openssl-deb/*.deb . @rm $(B)/.openssl.pkg-deb.ok @mv $(vpp_vcl_pkg_deb_dir)/*.deb deb-vcl/. endef |