Accepting request 448772 from home:ndas:branches:network

- Add pre_checkin.sh to generate the dpdk-thunderx.spec file
- Add pre_checkin.sh to generate the dpdk-thunderx.spec file

OBS-URL: https://build.opensuse.org/request/show/448772
OBS-URL: https://build.opensuse.org/package/show/network/dpdk?expand=0&rev=23

0001-rte-vars-fix-for-thunderx.patch

@@ -1,11 +0,0 @@
---- mk/machine/thunderx/rte.vars.mk	2016-12-07 13:49:18.397009133 +0100
-+++ mk/machine/thunderx/rte.vars.mk	2016-12-07 13:49:37.537806161 +0100
-@@ -47,7 +47,7 @@
- #
- 
- # ARCH =
--CROSS ?= aarch64-thunderx-linux-gnu-
-+# CROSS ?= aarch64-thunderx-linux-gnu-
- # MACHINE_CFLAGS =
- # MACHINE_LDFLAGS =
- # MACHINE_ASFLAGS =

dpdk-thunderx.changes

@@ -1,8 +1,7 @@
 -------------------------------------------------------------------
-Tue Dec 13 13:29:03 UTC 2016 - marco.varlese@suse.com
+Wed Jan  4 18:11:17 CET 2017 -  ndas@suse.de
-
-- Added dependency on gcc6 to build for aarch64 (armv8a) successfully
 
+- Add pre_checkin.sh to generate the dpdk-thunderx.spec file
 -------------------------------------------------------------------
 Mon Dec 12 11:35:44 UTC 2016 - marco.varlese@suse.com
 

dpdk-thunderx.spec

@@ -40,11 +40,12 @@
 %bcond_without examples
 # Add option to build without tools
 %bcond_without tools
-
+# Do NOT edit this auto generated file! Edit dpdk.spec instead
+# and run 'pre_checkin.sh' before committing
 Name:           dpdk-thunderx
 Version:        16.07.2
 Release:        0
-Summary:        Set of libraries and drivers for fast packet processing
+Summary:        Set of libraries and drivers for fast packet processing (thunderx)
 License:        BSD-3-Clause and GPL-2.0 and LGPL-2.1
 Group:          System/Libraries
 Url:            http://dpdk.org
@@ -56,14 +57,8 @@ Source:         http://fast.dpdk.org/rel/dpdk-%{version}.tar.xz
 # However, the problem still exists and the fix has to find its way to the
 # upstream code.
 Patch1:         0001-enic-fix-Type-punning-and-strict-aliasing-warning.patch
-# PATCH-FIX-OPENSUSE 0001-rte-vars-fix-for-thunderx.patch
-# This patch comments the CROSS compilation (broken) in the mk file for ThunderX
-# Upstreaming of this patch will have to be pursued.
-Patch2:         0001-rte-vars-fix-for-thunderx.patch
 BuildRequires:  doxygen
 BuildRequires:  fdupes
-# Required to build on aarch64 (gcc option armv8-a+crc)
-BuildRequires:  gcc6
 BuildRequires:  libnuma-devel
 BuildRequires:  libpcap-devel
 BuildRequires:  zlib-devel
@@ -75,7 +70,7 @@ The Data Plane Development Kit is a set of libraries and drivers for
 fast packet processing in the user space.
 
 %package devel
-Summary:        Data Plane Development Kit development files
+Summary:        Data Plane Development Kit development files (thunderx)
 Group:          Development/Libraries/C and C++
 Requires:       %{name} = %{version}
 
@@ -84,7 +79,7 @@ This package contains the headers and other files needed for developing
 applications with the Data Plane Development Kit.
 
 %package doc
-Summary:        Data Plane Development Kit API documentation
+Summary:        Data Plane Development Kit API documentation (thunderx)
 Group:          System/Libraries
 BuildArch:      noarch
 
@@ -93,7 +88,7 @@ API programming documentation for the Data Plane Development Kit.
 
 %if %{with tools}
 %package tools
-Summary:        Tools for setting up Data Plane Development Kit environment
+Summary:        Tools for setting up Data Plane Development Kit environment (thunderx)
 Group:          System/Libraries
 Requires:       %{name} = %{version}
 Requires:       findutils
@@ -107,7 +102,7 @@ This package contains tools for setting up Data Plane Development Kit environmen
 
 %if %{with examples}
 %package examples
-Summary:        Data Plane Development Kit example applications
+Summary:        Data Plane Development Kit example applications (thunderx)
 Group:          System/Libraries
 BuildRequires:  libvirt-devel
 
@@ -124,7 +119,8 @@ as L2 and L3 forwarding.
 %prep
 %setup -q -n dpdk-stable-%{version}
 %patch1 -p1 -z .enic
-%patch2 -p0 -z .rte
+# This fixes CROSS compilation (broken) in the mk file for ThunderX
+sed -i '/^CROSS /s/^/#/'  mk/machine/thunderx/rte.vars.mk
 
 %build
 # set up a method for modifying the resulting .config file

dpdk.changes

@@ -1,4 +1,8 @@
 -------------------------------------------------------------------
+Wed Jan  4 18:11:17 CET 2017 -  ndas@suse.de
+
+- Add pre_checkin.sh to generate the dpdk-thunderx.spec file
+-------------------------------------------------------------------
 Mon Dec 12 11:35:44 UTC 2016 - marco.varlese@suse.com
 
 - Fixed paths using %{name} to have the dpdk.spec aligned with dpdk-thunderx.spec

dpdk.spec

@@ -47,7 +47,7 @@ Summary:        Set of libraries and drivers for fast packet processing
 License:        BSD-3-Clause and GPL-2.0 and LGPL-2.1
 Group:          System/Libraries
 Url:            http://dpdk.org
-Source:         http://fast.dpdk.org/rel/%{name}-%{version}.tar.xz
+Source:         http://fast.dpdk.org/rel/dpdk-%{version}.tar.xz
 # PATCH-FIX-OPENSUSE 0001-enic-fix-Type-punning-and-strict-aliasing-warning.patch
 # This patch was originally taken from the fedora package but they have
 # removed it since then because of
@@ -116,6 +116,8 @@ as L2 and L3 forwarding.
 %prep
 %setup -q -n dpdk-stable-%{version}
 %patch1 -p1 -z .enic
+# This fixes CROSS compilation (broken) in the mk file for ThunderX
+sed -i '/^CROSS /s/^/#/'  mk/machine/thunderx/rte.vars.mk
 
 %build
 # set up a method for modifying the resulting .config file

pre_checkin.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# Start fresh
+for f in spec changes; do
+    cp dpdk.$f dpdk-thunderx.$f || exit 1
+done
+
+#
+#- Add comment about generated file
+#- Fix {,sub-}package name, description, summary
+#- Enable the dpdk conditional build
+sed -i -e "/^Name:.*dpdk$/i \
+# Do NOT edit this auto generated file! Edit dpdk.spec instead\n\
+# and run 'pre_checkin.sh' before committing" \
+-e "/^#\s*spec file/s/dpdk$/&-thunderx/" \
+-e "/^Name:/s/dpdk/&-thunderx/g" \
+-e "/^Summary:/s/^.*$/&\ \(thunderx\)/g" \
+-e "/^%define machine2 armv8a/s/armv8a/thunderx/g" \
+-e "/^ExclusiveArch/a Conflicts:      dpdk" \
+dpdk-thunderx.spec || exit 1