Fix "make dist" to include version number, docouple it from rpm packaging

Change-Id: If2f9976d668089026c97b897cf449bff09050631
Signed-off-by: Damjan Marion <damarion@cisco.com>

3 files changed, 0 insertions, 343 deletions

diff --git a/build-root/rpm/vpp.service b/build-root/rpm/vpp.service
deleted file mode 100644
index 40bf9d48..00000000
--- a/build-root/rpm/vpp.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-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
-RestartSec=5s
-
-[Install]
-WantedBy=multi-user.target
diff --git a/build-root/rpm/vpp.spec b/build-root/rpm/vpp.spec
deleted file mode 100644
index 2cfe67c5..00000000
--- a/build-root/rpm/vpp.spec
+++ /dev/null
@@ -1,298 +0,0 @@
-%define _mu_build_dir    %{_mu_build_root_dir}
-%define _vpp_install_dir %{_install_dir}
-%define _vpp_build_dir   build-tool-native
-%define _unitdir         /lib/systemd/system
-%define _topdir          %(pwd)
-%define _builddir        %{_topdir}
-%define _version         %(../scripts/version rpm-version)
-%define _release         %(../scripts/version rpm-release)
-
-# Failsafe backport of Python2-macros for RHEL <= 6
-%{!?python_sitelib: %global python_sitelib      %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%{!?python_sitearch:    %global python_sitearch     %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-%{!?python_version: %global python_version      %(%{__python} -c "import sys; sys.stdout.write(sys.version[:3])")}
-%{!?__python2:      %global __python2       %{__python}}
-%{!?python2_sitelib:    %global python2_sitelib     %{python_sitelib}}
-%{!?python2_sitearch:   %global python2_sitearch    %{python_sitearch}}
-%{!?python2_version:    %global python2_version     %{python_version}}
-
-%{!?python2_minor_version: %define python2_minor_version %(%{__python} -c "import sys ; print sys.version[2:3]")}
-
-%{?systemd_requires}
-
-Name: vpp
-Summary: Vector Packet Processing
-License: MIT
-Version: %{_version}
-Release: %{_release}
-Requires: vpp-lib = %{_version}-%{_release}, net-tools, pciutils, python
-BuildRequires: systemd, chrpath
-
-Source: %{name}-%{_version}-%{_release}.tar.gz
-
-%description
-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 lib
-Summary: VPP libraries
-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.
-svm - vm library
-vlib - vector processing library
-vlib-api - binary API library
-vnet -  network stack library
-
-%package devel
-Summary: VPP header files, static libraries
-Group: Development/Libraries
-Requires: vpp-lib
-
-%description devel
-This package contains the header files for VPP.
-Install this package if you want to write a
-program for compilation and linking with vpp lib.
-vlib
-vlibmemory
-vnet - devices, classify, dhcp, ethernet flow, gre, ip, etc.
-vpp-api
-vppinfra
-
-%package plugins
-Summary: Vector Packet Processing--runtime plugins
-Group: System Environment/Libraries
-Requires: vpp = %{_version}-%{_release}
-%description plugins
-This package contains VPP plugins
-
-%package api-lua
-Summary: VPP api lua bindings
-Group: Development/Libraries
-Requires: vpp = %{_version}-%{_release}, vpp-lib = %{_version}-%{_release}
-
-%description api-lua
-This package contains the lua bindings for the vpp api
-
-%package api-java
-Summary: VPP api java bindings
-Group: Development/Libraries
-Requires: vpp = %{_version}-%{_release}, vpp-lib = %{_version}-%{_release}
-
-%description api-java
-This package contains the java bindings for the vpp api
-
-%package api-python
-Summary: VPP api python bindings
-Group: Development/Libraries
-Requires: vpp = %{_version}-%{_release}, vpp-lib = %{_version}-%{_release}, python-setuptools libffi-devel
-
-%description api-python
-This package contains the python bindings for the vpp api
-
-%prep
-%setup -q -n %{name}-%{_version}
-
-%pre
-# Add the vpp group
-groupadd -f -r vpp
-
-%build
-cd %{_mu_build_dir}/../src/vpp-api/python && %py2_build
-
-%install
-#
-# binaries
-#
-mkdir -p -m755 %{buildroot}%{_bindir}
-mkdir -p -m755 %{buildroot}%{_unitdir}
-install -p -m 755 %{_mu_build_dir}/%{_vpp_install_dir}/vpp/bin/* %{buildroot}%{_bindir}
-
-# api
-mkdir -p -m755 %{buildroot}/usr/share/vpp/api
-
-#
-# configs
-#
-mkdir -p -m755 %{buildroot}/etc/vpp
-mkdir -p -m755 %{buildroot}/etc/sysctl.d
-install -p -m 644 %{_mu_build_dir}/rpm/vpp.service %{buildroot}%{_unitdir}
-install -p -m 644 %{_mu_build_dir}/../src/vpp/conf/startup.conf %{buildroot}/etc/vpp/startup.conf
-install -p -m 644 %{_mu_build_dir}/../src/vpp/conf/80-vpp.conf %{buildroot}/etc/sysctl.d
-#
-# libraries
-#
-mkdir -p -m755 %{buildroot}%{_libdir}
-mkdir -p -m755 %{buildroot}/etc/bash_completion.d
-mkdir -p -m755 %{buildroot}/usr/share/vpp
-for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/*/lib* -type f -name '*.so.*.*.*' -print )
-do
-	install -p -m 755 $file %{buildroot}%{_libdir}
-done
-for file in $(cd %{buildroot}%{_libdir} && find . -type f -print | sed -e 's/^\.\///')
-do
-	# make lib symlinks
-	( cd %{buildroot}%{_libdir} && 
-          ln -fs $file $(echo $file | sed -e 's/\(\.so\.[0-9]\+\).*/\1/') )
-	( cd %{buildroot}%{_libdir} && 
-          ln -fs $file $(echo $file | sed -e 's/\(\.so\)\.[0-9]\+.*/\1/') )
-done
-for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/vpp/share/vpp/api  -type f -name '*.api.json' -print )
-do
-	install -p -m 644 $file %{buildroot}/usr/share/vpp/api
-done
-install -p -m 644 %{_mu_build_dir}/../src/scripts/vppctl_completion %{buildroot}/etc/bash_completion.d
-install -p -m 644 %{_mu_build_dir}/../src/scripts/vppctl-cmd-list %{buildroot}/usr/share/vpp
-
-# Lua bindings
-mkdir -p -m755 %{buildroot}/usr/share/doc/vpp/examples/lua/examples/cli
-mkdir -p -m755 %{buildroot}/usr/share/doc/vpp/examples/lua/examples/lute
-for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/../../src/vpp-api/lua && git ls-files .)
-do
-	install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/../../src/vpp-api/lua/$file \
-	   %{buildroot}/usr/share/doc/vpp/examples/lua/$file
-done
-
-# Java bindings
-mkdir -p -m755 %{buildroot}/usr/share/java
-for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/vpp/share/java -type f -name '*.jar' -print )
-do
-	install -p -m 644 $file %{buildroot}/usr/share/java
-done
-
-# Python bindings
-cd %{_mu_build_dir}/../src/vpp-api/python && %py2_install
-
-#
-# devel
-#
-for dir in $(find %{_mu_build_dir}/%{_vpp_install_dir}/*/include/ -maxdepth 0 -type d -print | grep -v dpdk)
-do
-	for subdir in $(cd ${dir} && find . -type d -print)
-	do
-		mkdir -p -m755 %{buildroot}/usr/include/${subdir}
-	done
-	for file in $(cd ${dir} && find . -type f -print)
-	do
-		install -p -m 644 $dir/$file %{buildroot}%{_includedir}/$file
-	done
-done
-
-mkdir -p -m755 %{buildroot}%{python2_sitelib}/jvppgen
-install -p -m755 %{_mu_build_dir}/../src/vpp-api/java/jvpp/gen/jvpp_gen.py %{buildroot}/usr/bin
-for i in $(ls %{_mu_build_dir}/../src/vpp-api/java/jvpp/gen/jvppgen/*.py); do
-   install -p -m666 ${i} %{buildroot}%{python2_sitelib}/jvppgen
-done;
-
-# sample plugin
-mkdir -p -m755 %{buildroot}/usr/share/doc/vpp/examples/sample-plugin/sample
-for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/../../src/examples/sample-plugin && git ls-files .)
-do
-	install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/../../src/examples/sample-plugin/$file \
-	   %{buildroot}/usr/share/doc/vpp/examples/sample-plugin/$file
-done
-
-
-#
-# vpp-plugins
-# 
-mkdir -p -m755 %{buildroot}/usr/lib/vpp_plugins
-mkdir -p -m755 %{buildroot}/usr/lib/vpp_api_test_plugins
-for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib64/vpp_plugins && find -type f -print)
-do
-        install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib64/vpp_plugins/$file \
-           %{buildroot}/usr/lib/vpp_plugins/$file
-done
-
-for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib64/vpp_api_test_plugins && find -type f -print)
-do
-        install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib64/vpp_api_test_plugins/$file \
-           %{buildroot}/usr/lib/vpp_api_test_plugins/$file
-done
-
-for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/plugins -type f -name '*.api.json' -print )
-do
-	install -p -m 644 $file %{buildroot}/usr/share/vpp/api
-done
-
-#
-# remove RPATH from ELF binaries
-#
-%{_mu_build_dir}/scripts/remove-rpath %{buildroot}
-
-%post
-sysctl --system
-%systemd_post vpp.service
-
-%preun
-%systemd_preun vpp.service
-
-%postun
-%systemd_postun
-
-# Unbind user-mode PCI drivers
-removed=
-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
-
-%files
-%defattr(-,bin,bin)
-%{_unitdir}/vpp.service
-/usr/bin/vpp*
-/usr/bin/svm*
-/usr/bin/elftool
-%config /etc/sysctl.d/80-vpp.conf
-%config /etc/vpp/startup.conf
-/usr/share/vpp/api/*
-
-%files lib
-%defattr(-,bin,bin)
-%exclude %{_libdir}/vpp_plugins
-%exclude %{_libdir}/vpp_api_test_plugins
-%{_libdir}/*
-/usr/share/vpp/api/*
-/etc/bash_completion.d/vppctl_completion
-/usr/share/vpp/vppctl-cmd-list
-
-%files api-lua
-%defattr(644,root,root,644)
-/usr/share/doc/vpp/examples/lua
-
-%files api-java
-%defattr(644,root,root)
-/usr/share/java/*
-
-%files api-python
-%defattr(644,root,root)
-%{python2_sitelib}/vpp_papi*
-
-%files devel
-%defattr(-,bin,bin)
-/usr/bin/vppapigen
-/usr/bin/jvpp_gen.py
-%{_includedir}/*
-%{python2_sitelib}/jvppgen/*
-/usr/share/doc/vpp/examples/sample-plugin
-
-%files plugins
-%defattr(-,bin,bin)
-/usr/lib/vpp_plugins/*
-/usr/lib/vpp_api_test_plugins/*
-/usr/share/vpp/api/*
diff --git a/build-root/scripts/verdist b/build-root/scripts/verdist
deleted file mode 100755
index 9d1f1b5a..00000000
--- a/build-root/scripts/verdist
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-#
-# Add version to dist tarball.
-#
-BR=$1
-prefix=$2
-verstring=$3
-BASE=`pwd`
-
-git rev-parse 2> /dev/null
-if [ $? == 0 ]; then
-    git archive --prefix=${prefix}/ HEAD | gzip -9 > ${verstring}.tar.gz
-else
-    cd ..
-    tar -c ${prefix} | gzip -9 > ${verstring}.tar.gz
-    cp ${verstring}.tar.gz $BASE
-    cd $BASE
-fi
-
-mkdir ${BASE}/tmp
-cd ${BASE}/tmp
-tar -xzf ${BASE}/${verstring}.tar.gz
-rm ${BASE}/${verstring}.tar.gz
-
-cp ${BR}/scripts/.version ${BASE}/tmp/${prefix}/build-root/scripts
-tar -c ${prefix} | gzip -9 > ${verstring}.tar.gz
-mv ${verstring}.tar.gz ${BASE}
-
-cd ${BASE}
-rm -rf tmp