Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-UPF
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenXG
OpenXG-UPF
Commits
16ec1402
Commit
16ec1402
authored
Jan 17, 2022
by
kharade
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixing some warning and errors
parent
f29b0018
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
16 deletions
+21
-16
build/scripts/build_helper
build/scripts/build_helper
+1
-1
build/scripts/build_helper.upf
build/scripts/build_helper.upf
+20
-14
build/scripts/build_vpp_upf
build/scripts/build_vpp_upf
+0
-1
No files found.
build/scripts/build_helper
View file @
16ec1402
...
@@ -166,7 +166,7 @@ compilations() {
...
@@ -166,7 +166,7 @@ compilations() {
echo_info "Compilation log for $1 is here: $dlog/$2.txt"
echo_info "Compilation log for $1 is here: $dlog/$2.txt"
cd $OPENAIRCN_DIR/$1/
cd $OPENAIRCN_DIR/$1/
{
{
make build
make build
-release | tee $dlog/$2.txt
if grep -q "@@ Installing vpp @@" "$dlog/$2.txt" ; then
if grep -q "@@ Installing vpp @@" "$dlog/$2.txt" ; then
echo_success "##### VPP Compiled Successfully #####"
echo_success "##### VPP Compiled Successfully #####"
else
else
...
...
build/scripts/build_helper.upf
View file @
16ec1402
...
@@ -51,15 +51,11 @@ check_install_vpp_upf_deps() {
...
@@ -51,15 +51,11 @@ check_install_vpp_upf_deps() {
check_supported_distribution
check_supported_distribution
[[ $? -ne 0 ]] && return $?
[[ $? -ne 0 ]] && return $?
# prevent lock on /var/lib/dpkg/lock
if [[ $OS_RELEASE == "20.04" ]]; then
if [[ $OS_DISTRO == "ubuntu" ]]; then
TZ=Europe/Paris
#$SUDO systemctl mask apt-daily.service
ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
#$SUDO systemctl mask apt-daily.timer
#$SUDO systemctl mask apt-daily-upgrade.service
#$SUDO systemctl mask apt-daily-upgrade.timer
$SUDO sed -i 's/1/0/g' /etc/apt/apt.conf.d/10periodic
fi
fi
# Compilers, generators, ...
# Compilers, generators, ...
if [[ $OS_DISTRO == "ubuntu" ]]; then
if [[ $OS_DISTRO == "ubuntu" ]]; then
PACKAGE_LIST="\
PACKAGE_LIST="\
...
@@ -83,7 +79,7 @@ check_install_vpp_upf_deps() {
...
@@ -83,7 +79,7 @@ check_install_vpp_upf_deps() {
echo_fatal "$OS_DISTRO is not a supported distribution."
echo_fatal "$OS_DISTRO is not a supported distribution."
fi
fi
echo "Install build tools"
echo "Install build tools"
$SUDO $INSTALLER install $OPTION $PACKAGE_LIST
$SUDO $INSTALLER
update && $SUDO $INSTALLER
install $OPTION $PACKAGE_LIST
ret=$?;[[ $ret -ne 0 ]] && return $ret
ret=$?;[[ $ret -ne 0 ]] && return $ret
check_install_vpp_upf_source_deps
check_install_vpp_upf_source_deps
...
@@ -92,7 +88,7 @@ check_install_vpp_upf_deps() {
...
@@ -92,7 +88,7 @@ check_install_vpp_upf_deps() {
}
}
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
check_install_vpp_upf_deps() {
check_install_vpp_upf_
source_
deps() {
echo_info "Cloning fdio VPP $OPENAIRCN_DIR/"
echo_info "Cloning fdio VPP $OPENAIRCN_DIR/"
if [ -d "$OPENAIRCN_DIR/vpp" ]; then
if [ -d "$OPENAIRCN_DIR/vpp" ]; then
echo_error "clone failed : - vpp source is already present at $OPENAIRCN_DIR/... use option -w to wipe out vpp source"
echo_error "clone failed : - vpp source is already present at $OPENAIRCN_DIR/... use option -w to wipe out vpp source"
...
@@ -106,9 +102,9 @@ install_dep(){
...
@@ -106,9 +102,9 @@ install_dep(){
GIT_BRANCH=stable/2101
GIT_BRANCH=stable/2101
pushd $OPENAIRCN_DIR/
pushd $OPENAIRCN_DIR/
git clone -b $GIT_BRANCH $GIT_URL
git clone -b $GIT_BRANCH $GIT_URL
#
echo "APT::Get::Assume-Yes "true";" >> /etc/apt/apt.conf.d/90forceyes
echo "APT::Get::Assume-Yes "true";" >> /etc/apt/apt.conf.d/90forceyes
#
echo "APT::Get::force-yes "true";" >> /etc/apt/apt.conf.d/90forceyes
echo "APT::Get::force-yes "true";" >> /etc/apt/apt.conf.d/90forceyes
cd vpp && make install-de
p
make install-dep -C vp
p
return 0
return 0
}
}
...
@@ -146,5 +142,15 @@ vpp_upf_init(){
...
@@ -146,5 +142,15 @@ vpp_upf_init(){
cp $OPENAIRCN_DIR/scripts/upf_conf/* $OPENAIRCN_DIR/vpp
cp $OPENAIRCN_DIR/scripts/upf_conf/* $OPENAIRCN_DIR/vpp
cp $OPENAIRCN_DIR/scripts/run.sh $OPENAIRCN_DIR/vpp
cp $OPENAIRCN_DIR/scripts/run.sh $OPENAIRCN_DIR/vpp
echo_info "Installing VPP"
echo_info "Installing VPP"
sudo cp -rf $OPENAIRCN_DIR/vpp/build-root/install-vpp_debug-native/vpp/lib/ /usr/lib/x86_64-linux-gnu/vpp_plugins/
# Copying binaries
sudo cp -rf $OPENAIRCN_DIR/vpp/build-root/install-vpp-native/vpp/bin/vpp /bin/
sudo cp -rf $OPENAIRCN_DIR/vpp/build-root/install-vpp-native/vpp/bin/vppctl /bin/
# Copying necessary libraries
sudo cp -rf $OPENAIRCN_DIR/vpp/build-root/install-vpp-native/vpp/lib/vpp_plugins /usr/lib/x86_64-linux-gnu/vpp_plugins/
sudo cp -rf $OPENAIRCN_DIR/vpp/build-root/install-vpp-native/vpp/lib/libvppinfra.so.21.01.1 /usr/lib/x86_64-linux-gnu/
sudo cp -rf $OPENAIRCN_DIR/vpp/build-root/install-vpp-native/vpp/lib/libvnet.so.21.01.1 /usr/lib/x86_64-linux-gnu/
sudo cp -rf $OPENAIRCN_DIR/vpp/build-root/install-vpp-native/vpp/lib/libvlibmemory.so.21.01.1 /usr/lib/x86_64-linux-gnu/
sudo cp -rf $OPENAIRCN_DIR/vpp/build-root/install-vpp-native/vpp/lib/libvlib.so.21.01.1 /usr/lib/x86_64-linux-gnu/
sudo cp -rf $OPENAIRCN_DIR/vpp/build-root/install-vpp-native/vpp/lib/libsvm.so.21.01.1 /usr/lib/x86_64-linux-gnu/
sudo cp -rf $OPENAIRCN_DIR/vpp/build-root/install-vpp-native/vpp/lib/libnat.so.21.01.1 /usr/lib/x86_64-linux-gnu/
}
}
build/scripts/build_vpp_upf
View file @
16ec1402
...
@@ -142,7 +142,6 @@ function main()
...
@@ -142,7 +142,6 @@ function main()
mkdir
-m
777
-p
$dext
mkdir
-m
777
-p
$dext
if
[
$var_check_install_deps
-gt
0
]
;
then
if
[
$var_check_install_deps
-gt
0
]
;
then
disable_ipv6
check_install_vpp_upf_deps
$force
$debug
check_install_vpp_upf_deps
$force
$debug
if
[[
$?
-ne
0
]]
;
then
if
[[
$?
-ne
0
]]
;
then
echo_error
"Error: VPP UPF deps installation failed"
echo_error
"Error: VPP UPF deps installation failed"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment