Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
prod_build_cellframe-node
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cellframe
prod_build_cellframe-node
Commits
5b2c9ed3
Commit
5b2c9ed3
authored
3 years ago
by
Aleksandr Vodianov
Browse files
Options
Downloads
Patches
Plain Diff
fixed deploy and compilation
parent
d3a2a854
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
linux/debian/scripts/compile_and_pack.sh
+3
-3
3 additions, 3 deletions
linux/debian/scripts/compile_and_pack.sh
linux/debian/scripts/deploy.sh
+1
-1
1 addition, 1 deletion
linux/debian/scripts/deploy.sh
with
4 additions
and
4 deletions
linux/debian/scripts/compile_and_pack.sh
+
3
−
3
View file @
5b2c9ed3
...
@@ -51,18 +51,18 @@ if [[ $ARCH_VERSION == "arm" ]]; then
...
@@ -51,18 +51,18 @@ if [[ $ARCH_VERSION == "arm" ]]; then
export
LD_LIBRARY_PATH
=
$LD_LIBRARY_PATH_ARM64
export
LD_LIBRARY_PATH
=
$LD_LIBRARY_PATH_ARM64
${
CMAKE_PATH
}
cmake
-DCMAKE_C_COMPILER
=
$ARM64_C_COMPILER
-DCMAKE_CXX_COMPLIER
=
$ARM64_CXX_COMPILER
-DCMAKE_TARGET_ARCH
=
"arm64"
..
&&
make
-j
$(
nproc
)
&&
\
${
CMAKE_PATH
}
cmake
-DCMAKE_C_COMPILER
=
$ARM64_C_COMPILER
-DCMAKE_CXX_COMPLIER
=
$ARM64_CXX_COMPILER
-DCMAKE_TARGET_ARCH
=
"arm64"
..
&&
make
-j
$(
nproc
)
&&
\
${
CMAKE_PATH
}
cpack
&&
repack
*
.deb
&&
mv
-v
*
.deb ../packages/
&&
rm
-r
*
&&
\
${
CMAKE_PATH
}
cpack
&&
repack
*
.deb
&&
mv
-v
*
.deb ../packages/
&&
rm
-r
*
&&
\
${
CMAKE_PATH
}
cmake
-DCMAKE_BUILD_TYPE
=
Debug ../
&&
make
-j
$(
nproc
)
&&
${
CMAKE_PATH
}
cpack
&&
repack
*
.deb
&&
mv
-v
*
.deb ../packages/
&&
rm
-r
*
||
error
=
$?
${
CMAKE_PATH
}
cmake
-DCMAKE_C_COMPILER
=
$ARM64_C_COMPILER
-DCMAKE_CXX_COMPLIER
=
$ARM64_CXX_COMPILER
-DCMAKE_TARGET_ARCH
=
"arm64"
-DCMAKE_BUILD_TYPE
=
Debug ../
&&
make
-j
$(
nproc
)
&&
${
CMAKE_PATH
}
cpack
&&
repack
*
.deb
&&
mv
-v
*
.deb ../packages/
&&
rm
-r
*
||
error
=
$?
unset
LD_LIBRARY_PATH
unset
LD_LIBRARY_PATH
export
LD_LIBRARY_PATH
=
$LD_LIBRARY_PATH_ARMHF
export
LD_LIBRARY_PATH
=
$LD_LIBRARY_PATH_ARMHF
${
CMAKE_PATH
}
cmake
-DCMAKE_C_COMPILER
=
$ARMHF_C_COMPILER
-DCMAKE_CXX_COMPLIER
=
$ARMHF_CXX_COMPILER
-DCMAKE_TARGET_ARCH
=
"armhf"
..
&&
make
-j
$(
nproc
)
&&
\
${
CMAKE_PATH
}
cmake
-DCMAKE_C_COMPILER
=
$ARMHF_C_COMPILER
-DCMAKE_CXX_COMPLIER
=
$ARMHF_CXX_COMPILER
-DCMAKE_TARGET_ARCH
=
"armhf"
..
&&
make
-j
$(
nproc
)
&&
\
${
CMAKE_PATH
}
cpack
&&
repack
*
.deb
&&
mv
-v
*
.deb ../packages/
&&
rm
-r
*
&&
\
${
CMAKE_PATH
}
cpack
&&
repack
*
.deb
&&
mv
-v
*
.deb ../packages/
&&
rm
-r
*
&&
\
${
CMAKE_PATH
}
cmake
-DCMAKE_BUILD_TYPE
=
Debug ../
&&
make
-j
$(
nproc
)
&&
${
CMAKE_PATH
}
cpack
&&
repack
*
.deb
&&
mv
-v
*
.deb ../packages/
&&
rm
-r
*
||
error
=
$?
${
CMAKE_PATH
}
cmake
-DCMAKE_C_COMPILER
=
$ARMHF_C_COMPILER
-DCMAKE_CXX_COMPLIER
=
$ARMHF_CXX_COMPILER
-DCMAKE_TARGET_ARCH
=
"armhf"
-DCMAKE_BUILD_TYPE
=
Debug ../
&&
make
-j
$(
nproc
)
&&
${
CMAKE_PATH
}
cpack
&&
repack
*
.deb
&&
mv
-v
*
.deb ../packages/
&&
rm
-r
*
||
error
=
$?
unset
LD_LIBRARY_PATH
unset
LD_LIBRARY_PATH
fi
fi
if
[[
$ARCH_VERSION
==
"amd64"
]]
;
then
if
[[
$ARCH_VERSION
==
"amd64"
]]
;
then
sed
-i
's/target_link_libraries(${NODE_TARGET} ${NODE_LIBRARIES} pthread )/target_link_libraries(${NODE_TARGET} ${NODE_LIBRARIES} pthread z util expat )/'
../CMakeLists.txt
||
error
=
$?
sed
-i
's/target_link_libraries(${NODE_TARGET} ${NODE_LIBRARIES} pthread )/target_link_libraries(${NODE_TARGET} ${NODE_LIBRARIES} pthread z util expat )/'
../CMakeLists.txt
||
error
=
$?
cd
${
CMAKE_PATH
}
cmake ../
&&
make
-j
$(
nproc
)
&&
${
CMAKE_PATH
}
cpack
&&
repack
*
.deb
&&
mv
-v
*
.deb ../packages/
&&
rm
-r
*
\
${
CMAKE_PATH
}
cmake ../
&&
make
-j
$(
nproc
)
&&
${
CMAKE_PATH
}
cpack
&&
repack
*
.deb
&&
mv
-v
*
.deb ../packages/
&&
rm
-r
*
\
&&
${
CMAKE_PATH
}
cmake
-DCMAKE_BUILD_TYPE
=
Debug ../
&&
make
-j
$(
nproc
)
&&
${
CMAKE_PATH
}
cpack
&&
repack
*
.deb
&&
mv
-v
*
.deb ../packages/
&&
rm
-r
*
||
error
=
$?
&&
${
CMAKE_PATH
}
cmake
-DCMAKE_BUILD_TYPE
=
Debug ../
&&
make
-j
$(
nproc
)
&&
${
CMAKE_PATH
}
cpack
&&
repack
*
.deb
&&
mv
-v
*
.deb ../packages/
&&
rm
-r
*
||
error
=
$?
...
...
This diff is collapsed.
Click to expand it.
linux/debian/scripts/deploy.sh
+
1
−
1
View file @
5b2c9ed3
...
@@ -29,7 +29,7 @@ for pkgfile in $PKGFILES; do
...
@@ -29,7 +29,7 @@ for pkgfile in $PKGFILES; do
CELLFRAME_FILESERVER_PATH
=
$CELLFRAME_PVT_PATH
CELLFRAME_FILESERVER_PATH
=
$CELLFRAME_PVT_PATH
fi
fi
pkgname
=
$(
echo
$pkgfile
|
sed
's/.deb$//'
)
pkgname
=
$(
echo
$pkgfile
|
sed
's/.deb$//'
)
pkgname_public
=
$(
echo
$pkgname
|
cut
-d
'-'
-f1-4
,7-
)
#cutting away Debian-9.12
pkgname_public
=
$(
echo
$pkgname
|
cut
-d
'-'
-f1-4
,7
,9
-
)
#cutting away Debian-9.12
pkgname_weblink
=
"
$(
echo
$pkgname
|
cut
-d
'-'
-f2
,8
)
-latest"
#leaving only necessary entries
pkgname_weblink
=
"
$(
echo
$pkgname
|
cut
-d
'-'
-f2
,8
)
-latest"
#leaving only necessary entries
echo
"Package name for public is
$pkgname_public
"
echo
"Package name for public is
$pkgname_public
"
mv
$pkgfile
$wd
/
$PACKAGE_PATH
/
$pkgname
.deb
||
{
echo
"[ERR] Something went wrong in publishing the package. Now aborting."
;
exit
-4
;
}
mv
$pkgfile
$wd
/
$PACKAGE_PATH
/
$pkgname
.deb
||
{
echo
"[ERR] Something went wrong in publishing the package. Now aborting."
;
exit
-4
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment