From 4d2f86a1ebcfc952080386603354c4767d2c8825 Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Fri, 18 Jan 2019 13:28:22 +0100 Subject: Rework of debian packaging Change-Id: Ifede85d3af36f3ee6c6f8f92dcf5db0ed8f1bfeb Signed-off-by: Damjan Marion Signed-off-by: Dave Barach --- build-root/deb/debian/.gitignore | 14 ------ build-root/deb/debian/README.vpp | 56 ------------------------ build-root/deb/debian/compat | 1 - build-root/deb/debian/control | 67 ----------------------------- build-root/deb/debian/copyright | 9 ---- build-root/deb/debian/rules | 38 ---------------- build-root/deb/debian/source/format | 1 - build-root/deb/debian/vpp-bin.README.Debian | 53 ----------------------- build-root/deb/debian/vpp.postinst | 8 ---- build-root/deb/debian/vpp.postrm | 21 --------- build-root/deb/debian/vpp.preinst | 4 -- build-root/deb/debian/vpp.service | 13 ------ build-root/deb/debian/vpp.upstart | 20 --------- 13 files changed, 305 deletions(-) delete mode 100644 build-root/deb/debian/.gitignore delete mode 100755 build-root/deb/debian/README.vpp delete mode 100755 build-root/deb/debian/compat delete mode 100644 build-root/deb/debian/control delete mode 100644 build-root/deb/debian/copyright delete mode 100755 build-root/deb/debian/rules delete mode 100755 build-root/deb/debian/source/format delete mode 100644 build-root/deb/debian/vpp-bin.README.Debian delete mode 100644 build-root/deb/debian/vpp.postinst delete mode 100644 build-root/deb/debian/vpp.postrm delete mode 100644 build-root/deb/debian/vpp.preinst delete mode 100644 build-root/deb/debian/vpp.service delete mode 100644 build-root/deb/debian/vpp.upstart (limited to 'build-root/deb/debian') diff --git a/build-root/deb/debian/.gitignore b/build-root/deb/debian/.gitignore deleted file mode 100644 index 489f8eb2c33..00000000000 --- a/build-root/deb/debian/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -changelog -files -*debhelper* -*.substvars -*.install -*.dirs -vpp/ -vpp-dev/ -vpp-lib/ -vpp-dbg/ -vppctl/ -vpp-api-lua/ -vpp-api-java/ -vpp-api-python/ diff --git a/build-root/deb/debian/README.vpp b/build-root/deb/debian/README.vpp deleted file mode 100755 index b343c786823..00000000000 --- a/build-root/deb/debian/README.vpp +++ /dev/null @@ -1,56 +0,0 @@ -Building DEB packages -===================== - -REQUIREMENTS: - You will need a working Internet connection to execute the build, because - the build procedure for the included "dpdk" project attempts to contact the - Internet host "dpdk.org". - -There are three main parts to the process: - a) Stage the source tree so that dpkg-source will recognize its organization - and create a valid DSC source package for you; - b) Ensure that the tools required for building DEB packages are installed; - and - c) Launch the build. - -1) Create, or have on hand, a local clone of the git repository, with no -untracked files or local modifications pending, up-to-date with the branch or -commit reference from which you wish to construct the source release. - -The branch and repository origins will differ based on local conditions. - -Example: -$ git clone -b master ssh://git@example.com:7999/~username/open-vpp - -("-b master" can be omitted since master is the default branch) - -2) Rename the checkout with a version number embedded in its name as is -conventional for code releases. Again, your version number may vary. - -Example: -$ mv open-vpp open-vpp-0.0.0 - -3) Ensure that the dpkg-buildpackage program is installed. - -E.g., - -# apt-get install dpkg-dev - -4) From the PARENT directory of the debian/ directory, run: - -$ cd open-vpp-0.0.0 -$ dpkg-buildpackage -I .git -us -uc - -(The -us and -uc flags omit GPG signatures from the .dsc and .changes files, -respectively. You can add them later, or if you are preparing a signed release -and have the signing key on hand, leave off the flags.) - -5) Get rid of the source directory; you now either have a source package with -which you can re-create it at any time, or there were problems with the build, -and you should go back to your git checkout to fix them. - -$ rm -r open-vpp-0.0.0 - -END - -vim:set ai et sw=4 ts=4 tw=80: diff --git a/build-root/deb/debian/compat b/build-root/deb/debian/compat deleted file mode 100755 index ec635144f60..00000000000 --- a/build-root/deb/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/build-root/deb/debian/control b/build-root/deb/debian/control deleted file mode 100644 index 4ed42b36e7d..00000000000 --- a/build-root/deb/debian/control +++ /dev/null @@ -1,67 +0,0 @@ -Source: vpp -Section: net -Priority: extra -Maintainer: Cisco OpenVPP Packaging Team -Build-Depends: debhelper (>= 9), dh-systemd, dh-python, chrpath, python-all -Standards-Version: 3.9.4 - -Package: vpp -Architecture: any -Depends: vpp-lib (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} -Description: Vector Packet Processing--executables - This package provides VPP executables: vpp, vpp_api_test, vpp_json_test - vpp - the vector packet engine - vpp_api_test - vector packet engine API test tool - vpp_json_test - vector packet engine JSON test tool - -Package: vpp-dbg -Architecture: any -Depends: ${misc:Depends} -Description: Vector Packet Processing--debug symbols - -Package: vpp-dev -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} -Description: Vector Packet Processing--development support - This package contains development support files for the VPP libraries - . - -Package: vpp-lib -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Vector Packet Processing--runtime libraries - This package contains the VPP shared libraries, including: - . - vppinfra - foundation library supporting vectors, hashes, bitmaps, pools, and string formatting. - svm - vm library - vlib - vector processing library - vlib-api - binary API library - vnet - network stack library - -Package: vpp-plugins -Architecture: any -Depends: vpp (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} -Description: Vector Packet Processing--runtime plugins - This package contains VPP plugins - . - -Package: vpp-api-lua -Architecture: any -Depends: ${misc:Depends}, vpp (= ${source:Version}) -Description: VPP LUA API bindings - This package contains VPP lua api bindings - . - -Package: vpp-api-java -Architecture: any -Depends: ${misc:Depends}, vpp (= ${source:Version}) -Description: VPP Java API bindings - This package contains VPP java api bindings - . - -Package: vpp-api-python -Architecture: any -Depends: ${python:Depends}, ${misc:Depends}, vpp (= ${source:Version}) -Description: VPP Python API bindings - This package contains VPP python api bindings - . diff --git a/build-root/deb/debian/copyright b/build-root/deb/debian/copyright deleted file mode 100644 index f9775c158f9..00000000000 --- a/build-root/deb/debian/copyright +++ /dev/null @@ -1,9 +0,0 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: optional. -Upstream-Contact: optional. -Source: optional. -Disclaimer: optional. -Comment: optional. -License: Apache-2.0 -Copyright: 2015 Cisco and/or its affiliates and others. - diff --git a/build-root/deb/debian/rules b/build-root/deb/debian/rules deleted file mode 100755 index 39be1b57e04..00000000000 --- a/build-root/deb/debian/rules +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/make -f -# See debhelper(7) (uncomment to enable) -# output every command that modifies files on the build system. -DH_VERBOSE = 1 - -# see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/* -DPKG_EXPORT_BUILDFLAGS = 1 -include /usr/share/dpkg/default.mk - -# see FEATURE AREAS in dpkg-buildflags(1) -#export DEB_BUILD_MAINT_OPTIONS = hardening=+all - -# see ENVIRONMENT in dpkg-buildflags(1) -# package maintainers to append CFLAGS -#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic -# package maintainers to append LDFLAGS -#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed - -export PYBUILD_NAME = vpp-api-python -export PYBUILD_DIR = ../../src/vpp-api/python -export PYBUILD_DESTDIR_python2=debian/vpp-api-python/ -export PYBUILD_DISABLE_python2=test -export PYBUILD_SYSTEM=distutils - -# main packaging script based on dh7 syntax -%: - dh $@ --with systemd,python2 --buildsystem=pybuild - -override_dh_install: - dh_install --exclude .git - ../scripts/remove-rpath . - -override_dh_shlibdeps: - @dh_shlibdeps 2>&1 \ - | { grep -v -e "probably a plugin" -e "similar warnings have been skipped" || true; } - -override_dh_strip: - dh_strip --dbg-package=vpp-dbg diff --git a/build-root/deb/debian/source/format b/build-root/deb/debian/source/format deleted file mode 100755 index 89ae9db8f88..00000000000 --- a/build-root/deb/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (native) diff --git a/build-root/deb/debian/vpp-bin.README.Debian b/build-root/deb/debian/vpp-bin.README.Debian deleted file mode 100644 index 192289696ef..00000000000 --- a/build-root/deb/debian/vpp-bin.README.Debian +++ /dev/null @@ -1,53 +0,0 @@ -To run vpp with the debug shell: - -sudo vpp unix interactive - -which will result in a prompt that looks like: - -DBGvpd# - -To give it a spin, we can create a tap interface and try a simple ping -(with trace). - -To create the tap: - -DBGvpd# tap connect foobar -Created tap-0 for Linux tap 'foobar' -DBGvpd# show int - -To assign it an ip address (and 'up' the interface): - -DBGvpd# set int ip address tap-0 192.168.1.1/24 -DBGvpd# set int state tap-0 up - -To turn on packet tracing for the tap interface: -DBGvpd# trace add tapcli-rx 10 - -Now, to set up and try the other end from the unix prompt: -vagrant@vagrant-ubuntu-trusty-64:~$ sudo ip addr add 192.168.1.2/24 dev foobar -vagrant@vagrant-ubuntu-trusty-64:~$ ping -c 3 192.168.1.1 - -To look at the trace, back in the vpp CLI: -DBGvpd# show trace - -And to stop tracing: - -DBGvpd# clear trace - -Other fun things to look at: - -The vlib packet processing graph: -DBGvpd# show vlib graph - -which will produce output like: - - Name Next Previous -ip4-icmp-input error-punt [0] ip4-local - ip4-icmp-echo-request [1] - vpe-icmp4-oam [2] - -To read this, the first column (Name) is the name of the node. -The second column (Next) is the name of the children of that node. -The third column (Previous) is the name of the parents of this node. - -END diff --git a/build-root/deb/debian/vpp.postinst b/build-root/deb/debian/vpp.postinst deleted file mode 100644 index 78fcac226a8..00000000000 --- a/build-root/deb/debian/vpp.postinst +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -e - -# try to set the required values now. This may or may not work. -sysctl --system - -#DEBHELPER# - -exit 0 diff --git a/build-root/deb/debian/vpp.postrm b/build-root/deb/debian/vpp.postrm deleted file mode 100644 index 24b4842fd0a..00000000000 --- a/build-root/deb/debian/vpp.postrm +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -e - -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/build-root/deb/debian/vpp.preinst b/build-root/deb/debian/vpp.preinst deleted file mode 100644 index d33cacfc3fa..00000000000 --- a/build-root/deb/debian/vpp.preinst +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -e - -# Add the vpp group -groupadd -f -r vpp diff --git a/build-root/deb/debian/vpp.service b/build-root/deb/debian/vpp.service deleted file mode 100644 index 2e86941de8b..00000000000 --- a/build-root/deb/debian/vpp.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=vector packet processing engine -After=network.target - -[Service] -Type=simple -ExecStartPre=-/sbin/modprobe uio_pci_generic -ExecStart=/usr/bin/vpp -c /etc/vpp/startup.conf -ExecStopPost=/bin/rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/build-root/deb/debian/vpp.upstart b/build-root/deb/debian/vpp.upstart deleted file mode 100644 index 4a451dd45d0..00000000000 --- a/build-root/deb/debian/vpp.upstart +++ /dev/null @@ -1,20 +0,0 @@ -description "vector packet processing engine" -author "Cisco Systems, Inc " - -manual - -respawn - -pre-start script - # should be there via dkms, but if not, start anyway - modprobe uio_pci_generic || true -end script - - -script - exec vpp -c /etc/vpp/startup.conf -end script - -post-stop script - rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api || true -end script -- cgit 1.2.3-korg