diff --git a/debian/changelog b/debian/changelog index 1acc846..a7cdced 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,26 @@ +dpdk (2.2.0-0ubuntu3~dev4) xenial; urgency=medium + + * d/control: + - removed xen build dependencies for ppc64el + * d/rules: + - disabled dpdk xen support on ppc64el + * bump version after minor fix + + -- Christian Ehrhardt Tue, 18 Jan 2016 11:50:15 +0100 + +dpdk (2.2.0-0ubuntu3~dev1) xenial; urgency=medium + + * d/p/ppc64-dpdk.patch + - Fixed ppc64 CFLAGS + * d/control: + - added ppc64el to Architectures (LP: #1538664) + * d/rules: + - renamed defconfig_ppc_64-power8-linuxapp-gcc to + defconfig_ppc64le-native-linuxapp-gcc since that is the file searched + during build + + -- Christian Ehrhardt Tue, 18 Jan 2016 10:50:15 +0100 + dpdk (2.2.0-0ubuntu2~dev2) xenial; urgency=low * Merge from Upstream to DPDK 2.2 diff --git a/debian/control b/debian/control index 0abaa2c..7e88d81 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,8 @@ Priority: optional Maintainer: Ubuntu Developers Build-Depends: debhelper (>= 9), libcap-dev, doxygen, python-sphinx, graphviz, inkscape, texlive-latex-extra, texlive-fonts-recommended, - python, dh-python, dh-systemd (>= 1.5), libpcap-dev, libxen-dev, - libxenstore3.0 + python, dh-python, dh-systemd (>= 1.5), libpcap-dev, + libxen-dev [i386 amd64 armhf arm64], libxenstore3.0 [i386 amd64 armhf arm64] Standards-Version: 3.9.6 Section: libs Homepage: http://www.dpdk.org @@ -13,7 +13,7 @@ Vcs-Browser: http://www.dpdk.org/browse/dpdk/refs/ Package: dpdk Section: devel -Architecture: amd64 i386 +Architecture: amd64 i386 ppc64el Depends: ${shlibs:Depends}, libdpdk0 (= ${binary:Version}), ${misc:Depends}, ${python:Depends}, lsb-base (>= 3.2-14) Description: Data Plane Development Kit (runtime) @@ -23,7 +23,7 @@ Description: Data Plane Development Kit (runtime) Package: dpdk-dev Section: devel -Architecture: amd64 i386 +Architecture: amd64 i386 ppc64el Depends: libdpdk0 (= ${binary:Version}), ${misc:Depends} Description: Data Plane Development Kit (development files) DPDK is a set of libraries for fast packet processing. Applications run @@ -41,7 +41,7 @@ Description: Data Plane Development Kit (documentation) This package contains the complete set of documentation and guides. Package: libdpdk0 -Architecture: amd64 i386 +Architecture: amd64 i386 ppc64el Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} @@ -53,7 +53,7 @@ Description: Data Plane Development Kit (runtime libraries) Package: libdpdk-dev Section: libdevel -Architecture: amd64 i386 +Architecture: amd64 i386 ppc64el Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, libdpdk0 (= ${binary:Version}) diff --git a/debian/patches/ppc64-dpdk.patch b/debian/patches/ppc64-dpdk.patch new file mode 100644 index 0000000..e76ea75 --- /dev/null +++ b/debian/patches/ppc64-dpdk.patch @@ -0,0 +1,19 @@ +Description: build: set CFLAGS for ppc64el build + The current build wouldn't work on ppc, so add a proper ifeq statement + to set the mcpu as needed. +Forwarded: Not yet. Author should do that +Author: Fernando Seiti Furusato +Last-Update: 2016-01-28 + +--- a/mk/machine/default/rte.vars.mk ++++ b/mk/machine/default/rte.vars.mk +@@ -55,4 +55,8 @@ + # CPU_LDFLAGS = + # CPU_ASFLAGS = + +-MACHINE_CFLAGS += -march=core2 ++ifeq (ppc64le,$(shell uname -m)) ++ MACHINE_CFLAGS += -mcpu=power8 ++else ++ MACHINE_CFLAGS += -march=core2 ++endif diff --git a/debian/patches/series b/debian/patches/series index 88389e2..428a74e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ ubuntu-fix-doc-installpath.patch ubuntu-combined-shared-lib-abiversion.patch +ppc64-dpdk.patch diff --git a/debian/rules b/debian/rules index d533f50..f62ad79 100755 --- a/debian/rules +++ b/debian/rules @@ -27,6 +27,9 @@ clean: build-config: dh_testdir + # build searches for this filename + mv config/defconfig_ppc_64-power8-linuxapp-gcc \ + config/defconfig_ppc64le-native-linuxapp-gcc make O=$(DPDK_STATIC_DIR) T=$(DPDK_CONFIG) config sed -ri -e 's,(RTE_MACHINE=).*,\1"default",' \ -e 's,(RTE_NEXT_ABI=).*,\1n,' \ @@ -37,6 +40,11 @@ build-config: -e 's,(LIBRTE_PMD_PCAP=).*,\1y,' \ -e 's,(LIBRTE_PMD_XENVIRT=).*,\1y,' \ $(DPDK_STATIC_DIR)/.config +ifeq ($(DEB_HOST_ARCH),ppc64el) + # ppc64el has no xen support + sed -ri -e 's,(LIBRTE_PMD_XENVIRT=).*,\1n,' \ + $(DPDK_STATIC_DIR)/.config +endif build-indep: dh_testdir