Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-SMF
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
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-SMF
Commits
b7c5d36a
Commit
b7c5d36a
authored
Jun 08, 2022
by
Tien-Thinh Nguyen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix ubuntu20 04 installation
parent
7c0fa583
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
7 deletions
+21
-7
build/scripts/build_helper.fb_folly
build/scripts/build_helper.fb_folly
+1
-1
build/scripts/build_helper.smf
build/scripts/build_helper.smf
+18
-5
docker/Dockerfile.smf.rhel8
docker/Dockerfile.smf.rhel8
+2
-1
No files found.
build/scripts/build_helper.fb_folly
View file @
b7c5d36a
...
@@ -67,9 +67,9 @@ install_fb_folly_from_source(){
...
@@ -67,9 +67,9 @@ install_fb_folly_from_source(){
ret=$?;[[ $ret -ne 0 ]] && return $ret
ret=$?;[[ $ret -ne 0 ]] && return $ret
elif [[ $OS_DISTRO == "ubuntu" ]]; then
elif [[ $OS_DISTRO == "ubuntu" ]]; then
$SUDO $INSTALLER install $OPTION \
$SUDO $INSTALLER install $OPTION \
$CMAKE \
g++ \
g++ \
libevent-dev \
libevent-dev \
libboost1.67-dev \
libdouble-conversion-dev \
libdouble-conversion-dev \
libgoogle-glog-dev \
libgoogle-glog-dev \
libgflags-dev \
libgflags-dev \
...
...
build/scripts/build_helper.smf
View file @
b7c5d36a
...
@@ -373,20 +373,22 @@ check_install_smf_deps() {
...
@@ -373,20 +373,22 @@ check_install_smf_deps() {
# PPA has 1.67
# PPA has 1.67
$SUDO add-apt-repository ppa:mhier/libboost-latest --yes
$SUDO add-apt-repository ppa:mhier/libboost-latest --yes
$SUDO $INSTALLER update
$SUDO $INSTALLER update
specific_packages="libconfig++-dev"
specific_packages="libconfig++-dev libboost-all-dev"
;;
"ubuntu20.04")
specific_packages="libconfig++-dev libasio-dev libboost-all-dev"
;;
;;
*)
*)
specific_packages="libconfig++-dev libasio-dev libboost-all-dev"
specific_packages="libconfig++-dev libasio-dev libboost-all-dev"
;;
;;
esac
esac
# removed libspdlog-dev
# removed libspdlog-dev
PACKAGE_LIST="\
PACKAGE_LIST="\
$specific_packages \
$specific_packages \
libboost1.67-dev \
guile-2.0-dev \
guile-2.0-dev \
libcurl4-gnutls-dev \
libcurl4-gnutls-dev \
libevent-dev \
libevent-dev \
libgcrypt
11
-dev \
libgcrypt
?
-dev \
libgmp-dev \
libgmp-dev \
libhogweed? \
libhogweed? \
libidn2-0-dev \
libidn2-0-dev \
...
@@ -403,7 +405,7 @@ check_install_smf_deps() {
...
@@ -403,7 +405,7 @@ check_install_smf_deps() {
net-tools \
net-tools \
pkg-config \
pkg-config \
wget \
wget \
libasan
2
"
libasan
?
"
elif [[ "$OS_BASEDISTRO" == "fedora" ]]; then
elif [[ "$OS_BASEDISTRO" == "fedora" ]]; then
PACKAGE_LIST="\
PACKAGE_LIST="\
guile-devel \
guile-devel \
...
@@ -430,6 +432,17 @@ check_install_smf_deps() {
...
@@ -430,6 +432,17 @@ check_install_smf_deps() {
fi
fi
echo "Install distro libs"
echo "Install distro libs"
$SUDO $INSTALLER install $OPTION $PACKAGE_LIST
$SUDO $INSTALLER install $OPTION $PACKAGE_LIST
# fix issue with libboost in U18 for a bare metal deployment
if [[ $OS_DISTRO == "ubuntu" ]]; then
case "$(get_distribution_release)" in
"ubuntu18.04")
$SUDO $INSTALLER remove $OPTION libboost1.65-dev || true
$SUDO $INSTALLER install $OPTION libboost1.67-dev
;;
esac
fi
ret=$?;[[ $ret -ne 0 ]] && return $ret
ret=$?;[[ $ret -ne 0 ]] && return $ret
echo "distro libs installation complete"
echo "distro libs installation complete"
...
...
docker/Dockerfile.smf.rhel8
View file @
b7c5d36a
...
@@ -47,7 +47,8 @@ RUN rm -f /etc/rhsm-host && \
...
@@ -47,7 +47,8 @@ RUN rm -f /etc/rhsm-host && \
psmisc \
psmisc \
git \
git \
diffutils \
diffutils \
file && \
file \
boost-devel &&\
rm -rf /var/lib/apt/lists/*
rm -rf /var/lib/apt/lists/*
# Some GIT configuration command quite useful
# Some GIT configuration command quite useful
...
...
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