From 3e6678f9c692553e8902da4d6fb1fe6c087db1f4 Mon Sep 17 00:00:00 2001
From: Marcel Enguehard <mengueha+fdio@cisco.com>
Date: Wed, 19 Jul 2017 11:26:26 +0200
Subject: * GUI resource * MemIf interface for VPP * Better netmodel
 integration * Draft documentation * New tutorials * Improved monitoring and
 error handling * Refactored IP addresses and prefixes representation *
 Improved image mgmt for LXD * Various bugfixes and code refactoring

Change-Id: I90da6cf7b5716bc7deb6bf4e24d3f9f01b5a9b0f
Signed-off-by: Marcel Enguehard <mengueha+fdio@cisco.com>
---
 emu-radio/scripts/build-package.sh | 36 ++++++++++--------------------------
 1 file changed, 10 insertions(+), 26 deletions(-)

(limited to 'emu-radio/scripts/build-package.sh')

diff --git a/emu-radio/scripts/build-package.sh b/emu-radio/scripts/build-package.sh
index 1aa828d0..487f538a 100644
--- a/emu-radio/scripts/build-package.sh
+++ b/emu-radio/scripts/build-package.sh
@@ -3,7 +3,6 @@
 set -euxo pipefail
 IFS=$'\n\t'
 
-SCRIPT_PATH=$( cd "$(dirname "${BASH_SOURCE}")" ; pwd -P )
 APT_PATH=`which apt-get` || true
 apt_get=${APT_PATH:-"/usr/local/bin/apt-get"}
 
@@ -154,22 +153,6 @@ build() {
     make
 }
 
-change_version() {
-    OLD_PACKAGE=$1
-    NEW_PACKAGE=$2
-    B_NUMBER=$3
-
-    mkdir tmp
-    pushd tmp
-    ar p ../${OLD_PACKAGE} control.tar.gz | tar -xz
-    sed -i s/3.24.1-8/3.24.1-${B_NUMBER}/g control
-    mv ../${OLD_PACKAGE} ../${NEW_PACKAGE}
-    tar czf control.tar.gz *[!z]
-    ar r ../${NEW_PACKAGE} control.tar.gz
-    popd
-    rm -rf tmp
-}
-
 ARCHITECTURE=`uname -m`
 
 # Figure out what system we are running on
@@ -217,30 +200,31 @@ fi
 
 BLD_NUMBER=${BUILD_NUMBER:-"1"}
 
+mkdir -p ../ns3-packages
+
 # Install libns3
-pushd ${SCRIPT_PATH}/../ns3-packages
+pushd ../ns3-packages
 sudo dpkg -i *.deb || true
 sudo apt-get -f install -y --allow-unauthenticated || true
 popd
 
 # Build wifi-emualtor
-pushd ${SCRIPT_PATH}/..
+pushd ..
 build "-DWIFI=ON -DLTE=OFF"
 make package
 find . -not -name '*.deb' -not -name '*.rpm' -print0 | xargs -0 rm -rf -- || true
 popd
 
 # Build lte-emualtor
-pushd ${SCRIPT_PATH}/..
+pushd ..
 build "-DLTE=ON -DWIFI=OFF"
 make package
 find . -not -name '*.deb' -not -name '*.rpm' -print0 | xargs -0 rm -rf -- || true
 popd
 
 # Change build number to ns3 packages
-pushd ${SCRIPT_PATH}/../ns3-packages
-
-change_version libns3sx-3v5_3.24.1-8~xenial_amd64.deb libns3sx-3v5_3.24.1-$BLD_NUMBER~xenial_amd64.deb ${BLD_NUMBER} || true
-change_version libns3sx-dev_3.24.1-8~xenial_amd64.deb libns3sx-dev_3.24.1-$BLD_NUMBER~xenial_amd64.deb ${BLD_NUMBER} || true
-change_version ns3sx_3.24.1-8~xenial_amd64.deb ns3sx_3.24.1-$BLD_NUMBER~xenial_amd64.deb ${BLD_NUMBER} || true
-popd
+pushd ../ns3-packages
+mv libns3sx-3v5_3.24.1-6~xenial_amd64.deb libns3sx-3v5_3.24.1-$BLD_NUMBER~xenial_amd64.deb || true
+mv libns3sx-dev_3.24.1-6~xenial_amd64.deb libns3sx-dev_3.24.1-$BLD_NUMBER~xenial_amd64.deb || true
+mv ns3sx_3.24.1-6~xenial_amd64.deb ns3sx_3.24.1-$BLD_NUMBER~xenial_amd64.deb || true
+popd
\ No newline at end of file
-- 
cgit 1.2.3-korg