From 40c66394280365ed6b1c5b8f569254f668f80cdb Mon Sep 17 00:00:00 2001
From: Ed Warnicke <eaw@cisco.com>
Date: Wed, 8 Jun 2016 14:41:40 -0500
Subject: [PATCH] VPP-124: Fix rpms to work out of the box.

Currently, for vpp we are not building any rpms for dpdk or igb_uio.
This is because uio_pci_generic as shipped with centos works with vpp.
However, our vpp rpms do not install kernel module uio_pci_generic at
start up and the /etc/vpp/startup.conf does not configure vpp to use
uio_pci_generic.

vpp rpms should do both, so that when the vpp rpm is installed and
vpp started, it just works out of the box.

This patch fixes the rpms to do so.

Change-Id: Ib934b51f9271cded466d235aa4044bef75c35960
Signed-off-by: Ed Warnicke <eaw@cisco.com>
---
 build-root/rpm/vpp.service          |  2 ++
 build-root/rpm/vpp.spec             |  2 +-
 vpp/conf/startup.uiopcigeneric.conf | 14 ++++++++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 vpp/conf/startup.uiopcigeneric.conf

diff --git a/build-root/rpm/vpp.service b/build-root/rpm/vpp.service
index fc66b15ccbc..40bf9d48c3b 100644
--- a/build-root/rpm/vpp.service
+++ b/build-root/rpm/vpp.service
@@ -3,6 +3,8 @@ Description=Vector Packet Processing Process
 After=syslog.target network.target auditd.service
 
 [Service]
+ExecStartPre=-/bin/rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api
+ExecStartPre=-/sbin/modprobe uio_pci_generic
 ExecStart=/usr/bin/vpp -c /etc/vpp/startup.conf
 Type=simple
 Restart=on-failure
diff --git a/build-root/rpm/vpp.spec b/build-root/rpm/vpp.spec
index 85b1286c76e..2513041bae9 100644
--- a/build-root/rpm/vpp.spec
+++ b/build-root/rpm/vpp.spec
@@ -63,7 +63,7 @@ install -p -m 755 %{_vpp_build_dir}/vppapigen/vppapigen %{buildroot}%{_bindir}
 mkdir -p -m755 %{buildroot}/etc/vpp
 mkdir -p -m755 %{buildroot}/etc/sysctl.d
 install -p -m 644 vpp.service %{buildroot}%{_unitdir}
-install -p -m 644 ../../vpp/conf/startup.conf %{buildroot}/etc/vpp
+install -p -m 644 ../../vpp/conf/startup.uiopcigeneric.conf %{buildroot}/etc/vpp/startup.conf
 install -p -m 644 ../../vpp/conf/80-vpp.conf %{buildroot}/etc/sysctl.d
 #
 # libraries
diff --git a/vpp/conf/startup.uiopcigeneric.conf b/vpp/conf/startup.uiopcigeneric.conf
new file mode 100644
index 00000000000..69bdb716218
--- /dev/null
+++ b/vpp/conf/startup.uiopcigeneric.conf
@@ -0,0 +1,14 @@
+
+unix {
+  nodaemon
+  log /tmp/vpp.log
+  full-coredump
+}
+
+dpdk {
+    uio-driver uio_pci_generic
+}
+
+api-trace {
+  on
+}
-- 
2.16.6