From c1be149705b704ee58851a52146214c192809e4b Mon Sep 17 00:00:00 2001 From: Mauro Sardara Date: Sat, 3 Jun 2017 12:38:46 +0200 Subject: - Adding support for GRE tunnels to LTE emulation - Fix version of NS3 emulator Change-Id: I8dbf54d2234053b3417531daaef228f9b7d201d9 Signed-off-by: Mauro Sardara --- .gitignore | 1 - .../libns3sx-3v5_3.24.1-6~xenial_amd64.deb | Bin 5033932 -> 0 bytes .../libns3sx-3v5_3.24.1-8~xenial_amd64.deb | Bin 0 -> 5036764 bytes .../libns3sx-dev_3.24.1-6~xenial_amd64.deb | Bin 768922 -> 0 bytes .../libns3sx-dev_3.24.1-8~xenial_amd64.deb | Bin 0 -> 769062 bytes .../ns3-packages/ns3sx_3.24.1-6~xenial_amd64.deb | Bin 152794 -> 0 bytes .../ns3-packages/ns3sx_3.24.1-8~xenial_amd64.deb | Bin 0 -> 152730 bytes emu-radio/scripts/build-package.sh | 34 ++++++++++++++++----- 8 files changed, 26 insertions(+), 9 deletions(-) delete mode 100644 emu-radio/ns3-packages/libns3sx-3v5_3.24.1-6~xenial_amd64.deb create mode 100644 emu-radio/ns3-packages/libns3sx-3v5_3.24.1-8~xenial_amd64.deb delete mode 100644 emu-radio/ns3-packages/libns3sx-dev_3.24.1-6~xenial_amd64.deb create mode 100644 emu-radio/ns3-packages/libns3sx-dev_3.24.1-8~xenial_amd64.deb delete mode 100644 emu-radio/ns3-packages/ns3sx_3.24.1-6~xenial_amd64.deb create mode 100644 emu-radio/ns3-packages/ns3sx_3.24.1-8~xenial_amd64.deb diff --git a/.gitignore b/.gitignore index fb2d4e25..b354d71a 100644 --- a/.gitignore +++ b/.gitignore @@ -29,4 +29,3 @@ libtool *~ *.pyc .idea -*.deb diff --git a/emu-radio/ns3-packages/libns3sx-3v5_3.24.1-6~xenial_amd64.deb b/emu-radio/ns3-packages/libns3sx-3v5_3.24.1-6~xenial_amd64.deb deleted file mode 100644 index f84d2a9a..00000000 Binary files a/emu-radio/ns3-packages/libns3sx-3v5_3.24.1-6~xenial_amd64.deb and /dev/null differ diff --git a/emu-radio/ns3-packages/libns3sx-3v5_3.24.1-8~xenial_amd64.deb b/emu-radio/ns3-packages/libns3sx-3v5_3.24.1-8~xenial_amd64.deb new file mode 100644 index 00000000..894da7f6 Binary files /dev/null and b/emu-radio/ns3-packages/libns3sx-3v5_3.24.1-8~xenial_amd64.deb differ diff --git a/emu-radio/ns3-packages/libns3sx-dev_3.24.1-6~xenial_amd64.deb b/emu-radio/ns3-packages/libns3sx-dev_3.24.1-6~xenial_amd64.deb deleted file mode 100644 index 275f1107..00000000 Binary files a/emu-radio/ns3-packages/libns3sx-dev_3.24.1-6~xenial_amd64.deb and /dev/null differ diff --git a/emu-radio/ns3-packages/libns3sx-dev_3.24.1-8~xenial_amd64.deb b/emu-radio/ns3-packages/libns3sx-dev_3.24.1-8~xenial_amd64.deb new file mode 100644 index 00000000..c67a7d3c Binary files /dev/null and b/emu-radio/ns3-packages/libns3sx-dev_3.24.1-8~xenial_amd64.deb differ diff --git a/emu-radio/ns3-packages/ns3sx_3.24.1-6~xenial_amd64.deb b/emu-radio/ns3-packages/ns3sx_3.24.1-6~xenial_amd64.deb deleted file mode 100644 index 6f2bd41f..00000000 Binary files a/emu-radio/ns3-packages/ns3sx_3.24.1-6~xenial_amd64.deb and /dev/null differ diff --git a/emu-radio/ns3-packages/ns3sx_3.24.1-8~xenial_amd64.deb b/emu-radio/ns3-packages/ns3sx_3.24.1-8~xenial_amd64.deb new file mode 100644 index 00000000..d889b04f Binary files /dev/null and b/emu-radio/ns3-packages/ns3sx_3.24.1-8~xenial_amd64.deb differ diff --git a/emu-radio/scripts/build-package.sh b/emu-radio/scripts/build-package.sh index 127d785a..1aa828d0 100644 --- a/emu-radio/scripts/build-package.sh +++ b/emu-radio/scripts/build-package.sh @@ -3,6 +3,7 @@ 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"} @@ -153,6 +154,22 @@ 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 @@ -201,28 +218,29 @@ fi BLD_NUMBER=${BUILD_NUMBER:-"1"} # Install libns3 -pushd ../ns3-packages +pushd ${SCRIPT_PATH}/../ns3-packages sudo dpkg -i *.deb || true sudo apt-get -f install -y --allow-unauthenticated || true popd # Build wifi-emualtor -pushd .. +pushd ${SCRIPT_PATH}/.. 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 .. +pushd ${SCRIPT_PATH}/.. 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 ../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 +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 -- cgit 1.2.3-korg