From 2ce7f9834ab55728520bff0dd15f8d82c10b95a0 Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Mon, 9 Jan 2017 20:24:50 +0100 Subject: Add dpdk development packaging Change-Id: I6aa2a6709241d99ce734c29e47487eb456907351 Signed-off-by: Damjan Marion --- build-root/Makefile | 1 - build-root/deb/debian/.gitignore | 3 --- build-root/deb/debian/control | 17 +---------------- build-root/deb/debian/rules | 5 +---- build-root/rpm/vpp.spec | 1 - build-root/scripts/find-dpdk-contents | 29 ----------------------------- 6 files changed, 2 insertions(+), 54 deletions(-) delete mode 100755 build-root/scripts/find-dpdk-contents (limited to 'build-root') diff --git a/build-root/Makefile b/build-root/Makefile index 6e26e90e..8b83990e 100644 --- a/build-root/Makefile +++ b/build-root/Makefile @@ -1167,5 +1167,4 @@ distclean: rm -rf $(MU_BUILD_ROOT_DIR)/python if [ -e /usr/bin/dh ];then (cd $(MU_BUILD_ROOT_DIR)/deb/;debian/rules clean); fi rm -f $(MU_BUILD_ROOT_DIR)/deb/debian/*.install - rm -f $(MU_BUILD_ROOT_DIR)/deb/debian/*.dkms rm -f $(MU_BUILD_ROOT_DIR)/deb/debian/changelog diff --git a/build-root/deb/debian/.gitignore b/build-root/deb/debian/.gitignore index c5e915a8..7b1028d6 100644 --- a/build-root/deb/debian/.gitignore +++ b/build-root/deb/debian/.gitignore @@ -3,12 +3,9 @@ files *debhelper* *.substvars *.install -vpp-dpdk-dkms* vpp/ vpp-dev/ vpp-lib/ -vpp-dpdk-dev/ -vpp-dpdk-dkms/ vpp-dbg/ vppctl/ vpp-api-lua/ diff --git a/build-root/deb/debian/control b/build-root/deb/debian/control index 6d26266a..e90cfca8 100644 --- a/build-root/deb/debian/control +++ b/build-root/deb/debian/control @@ -2,7 +2,7 @@ Source: vpp Section: net Priority: extra Maintainer: Cisco OpenVPP Packaging Team -Build-Depends: debhelper (>= 9), dkms, dh-systemd, dh-python, chrpath +Build-Depends: debhelper (>= 9), dh-systemd, dh-python, chrpath Standards-Version: 3.9.4 Package: vpp @@ -26,14 +26,6 @@ Description: Vector Packet Processing--development support This package contains development support files for the VPP libraries . -Package: vpp-dpdk-dev -Architecture: any -Depends: ${misc:Depends} -Description: Vector Packet Processing--development support - This package contains dpdk header files which match the dpdk version - compiled into the vpp executable - . - Package: vpp-lib Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -41,7 +33,6 @@ 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. - dpdk - DPDK library svm - vm library vlib - vector processing library vlib-api - binary API library @@ -54,12 +45,6 @@ Description: Vector Packet Processing--runtime plugins This package contains VPP plugins . -Package: vpp-dpdk-dkms -Architecture: any -Depends: ${misc:Depends} -Description: DPDK 2.1 igb_uio_driver - This package contains Linux kernel modules distributed with DPDK. - Package: vpp-api-lua Architecture: any Depends: ${misc:Depends}, vpp (= ${source:Version}) diff --git a/build-root/deb/debian/rules b/build-root/deb/debian/rules index 4c84fc32..7046105c 100755 --- a/build-root/deb/debian/rules +++ b/build-root/deb/debian/rules @@ -18,7 +18,7 @@ include /usr/share/dpkg/default.mk # main packaging script based on dh7 syntax %: - dh $@ --with dkms --with systemd,python2 + dh $@ --with systemd,python2 override_dh_install: dh_install --exclude .git @@ -31,6 +31,3 @@ override_dh_shlibdeps: override_dh_strip: dh_strip --dbg-package=vpp-dbg - -override_dh_dkms: - dh_dkms -pvpp-dpdk-dkms diff --git a/build-root/rpm/vpp.spec b/build-root/rpm/vpp.spec index b3a337b1..9e3ad11b 100644 --- a/build-root/rpm/vpp.spec +++ b/build-root/rpm/vpp.spec @@ -43,7 +43,6 @@ Group: System Environment/Libraries %description lib This package contains the VPP shared libraries, including: vppinfra - foundation library supporting vectors, hashes, bitmaps, pools, and string formatting. -dpdk - DPDK library svm - vm library vlib - vector processing library vlib-api - binary API library diff --git a/build-root/scripts/find-dpdk-contents b/build-root/scripts/find-dpdk-contents deleted file mode 100755 index c7065139..00000000 --- a/build-root/scripts/find-dpdk-contents +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -# includes -rm -rf dpdk-includes -mkdir dpdk-includes -(cd $1/dpdk/include; tar cfh - . | (cd ../../../dpdk-includes; tar xf -)) - -# If CDPATH is set, the "Change Directory" builtin (cd) will output the -# destination directory when a relative path is passed as an argument. -# In this case, this has the negative side effect of polluting the "paths" -# variable with the destination directory, breaking the package generation. -# -# Patient: Doctor! Doctor! It hurts when I do this... -# Doctor: Don't do that! -# -unset CDPATH -paths=`cd dpdk-includes; find . -type f -print` -rm -f $2 - -for path in $paths -do - dir=`dirname $path` - if [ $dir = "." ] ; then - echo ../dpdk-includes/$path /usr/include/vpp-dpdk >> $2 - else - echo ../dpdk-includes/$path /usr/include/vpp-dpdk/$dir >> $2 - fi -done - -- cgit 1.2.3-korg