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
1063ae43
Commit
1063ae43
authored
3 years ago
by
Aleksandr Vodianov
Browse files
Options
Downloads
Patches
Plain Diff
fixed add in repo, add LD_LIBRARY_PATH for arm build and fixed add profile.d script
parent
ce90f22c
Loading
Loading
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
linux/debian/essentials/postinst
+1
-1
1 addition, 1 deletion
linux/debian/essentials/postinst
linux/debian/scripts/compile_and_pack.sh
+4
-0
4 additions, 0 deletions
linux/debian/scripts/compile_and_pack.sh
linux/debian/scripts/deploy.sh
+6
-6
6 additions, 6 deletions
linux/debian/scripts/deploy.sh
with
11 additions
and
7 deletions
linux/debian/essentials/postinst
+
1
−
1
View file @
1063ae43
...
@@ -14,7 +14,7 @@ DAP_CFG="$DAP_PREFIX/etc/$DAP_APP_NAME.cfg"
...
@@ -14,7 +14,7 @@ DAP_CFG="$DAP_PREFIX/etc/$DAP_APP_NAME.cfg"
# Check profile.d symlink
# Check profile.d symlink
[
-e
"/etc/profile.d/
$DAP_APP_NAME
.sh"
]
&&
ln
-sf
$DAP_PREFIX
/share/profile.d/
$DAP_APP_NAME
.sh /etc/profile.d/
$DAP_APP_NAME
.sh
[
-e
"/etc/profile.d/
$DAP_APP_NAME
.sh"
]
||
ln
-sf
$DAP_PREFIX
/share/profile.d/
$DAP_APP_NAME
.sh /etc/profile.d/
$DAP_APP_NAME
.sh
# Init node config
# Init node config
if
[
-e
"
$DAP_CFG
"
]
;
then
if
[
-e
"
$DAP_CFG
"
]
;
then
...
...
This diff is collapsed.
Click to expand it.
linux/debian/scripts/compile_and_pack.sh
+
4
−
0
View file @
1063ae43
...
@@ -47,13 +47,17 @@ substitute_pkgname_postfix && mkdir -p build && cd build && cmake ../ && make -j
...
@@ -47,13 +47,17 @@ substitute_pkgname_postfix && mkdir -p build && cd build && cmake ../ && make -j
&&
cmake
-DCMAKE_BUILD_TYPE
=
Debug ../
&&
make
-j
$(
nproc
)
&&
cpack
&&
repack
*
.deb
&&
mv
-v
*
.deb ../packages/
&&
rm
-r
*
||
error
=
$?
&&
cmake
-DCMAKE_BUILD_TYPE
=
Debug ../
&&
make
-j
$(
nproc
)
&&
cpack
&&
repack
*
.deb
&&
mv
-v
*
.deb ../packages/
&&
rm
-r
*
||
error
=
$?
if
[[
$(
echo
$ARCH_VERSIONS
|
grep
arm64
)
!=
""
&&
$error
==
0
]]
;
then
if
[[
$(
echo
$ARCH_VERSIONS
|
grep
arm64
)
!=
""
&&
$error
==
0
]]
;
then
export
LD_LIBRARY_PATH
=
$LD_LIBRARY_PATH_ARM64
cmake
-DCMAKE_C_COMPILER
=
$ARM64_C_COMPILER
-DCMAKE_CXX_COMPLIER
=
$ARM64_CXX_COMPILER
-DCMAKE_TARGET_ARCH
=
"arm64"
..
&&
make
-j
$(
nproc
)
&&
\
cmake
-DCMAKE_C_COMPILER
=
$ARM64_C_COMPILER
-DCMAKE_CXX_COMPLIER
=
$ARM64_CXX_COMPILER
-DCMAKE_TARGET_ARCH
=
"arm64"
..
&&
make
-j
$(
nproc
)
&&
\
cpack
&&
repack
*
.deb
&&
mv
-v
*
.deb ../packages/
&&
rm
-r
*
||
error
=
$?
cpack
&&
repack
*
.deb
&&
mv
-v
*
.deb ../packages/
&&
rm
-r
*
||
error
=
$?
unset
LD_LIBRARY_PATH
done
done
if
[[
$(
echo
$ARCH_VERSIONS
|
grep
armhf
)
!=
""
&&
$error
==
0
]]
;
then
if
[[
$(
echo
$ARCH_VERSIONS
|
grep
armhf
)
!=
""
&&
$error
==
0
]]
;
then
export
LD_LIBRARY_PATH
=
$LD_LIBRARY_PATH_ARMHF
cmake
-DCMAKE_C_COMPILER
=
$ARMHF_C_COMPILER
-DCMAKE_CXX_COMPLIER
=
$ARMHF_CXX_COMPILER
-DCMAKE_TARGET_ARCH
=
"armhf"
..
&&
make
-j
$(
nproc
)
&&
\
cmake
-DCMAKE_C_COMPILER
=
$ARMHF_C_COMPILER
-DCMAKE_CXX_COMPLIER
=
$ARMHF_CXX_COMPILER
-DCMAKE_TARGET_ARCH
=
"armhf"
..
&&
make
-j
$(
nproc
)
&&
\
cpack
&&
repack
*
.deb
&&
mv
-v
*
.deb ../packages/
&&
rm
-r
*
||
error
=
$?
cpack
&&
repack
*
.deb
&&
mv
-v
*
.deb ../packages/
&&
rm
-r
*
||
error
=
$?
unset
LD_LIBRARY_PATH
done
done
if
[[
$(
echo
$BUILD_TYPE
|
grep
PGSQL
)
!=
""
&&
$error
==
0
]]
;
then
if
[[
$(
echo
$BUILD_TYPE
|
grep
PGSQL
)
!=
""
&&
$error
==
0
]]
;
then
...
...
This diff is collapsed.
Click to expand it.
linux/debian/scripts/deploy.sh
+
6
−
6
View file @
1063ae43
...
@@ -35,12 +35,12 @@ for pkgfile in $PKGFILES; do
...
@@ -35,12 +35,12 @@ for pkgfile in $PKGFILES; do
scp
-i
$CELLFRAME_REPO_KEY
$wd
/
$PACKAGE_PATH
/
$pkgname$MOD
.deb
"
$CELLFRAME_FILESERVER_CREDS
:
$CELLFRAME_FILESERVER_PATH
/
$SUBDIR
/
$pkgname_public$MOD
.deb"
scp
-i
$CELLFRAME_REPO_KEY
$wd
/
$PACKAGE_PATH
/
$pkgname$MOD
.deb
"
$CELLFRAME_FILESERVER_CREDS
:
$CELLFRAME_FILESERVER_PATH
/
$SUBDIR
/
$pkgname_public$MOD
.deb"
if
[[
$(
echo
$pkgname
|
grep
"pgsql
\|
dbg"
)
==
""
]]
;
then
if
[[
$(
echo
$pkgname
|
grep
"pgsql
\|
dbg"
)
==
""
]]
;
then
scp
-r
-i
$CELLFRAME_REPO_KEY
../prod_build/general/essentials/
$pkgname_weblink
"
$CELLFRAME_FILESERVER_CREDS
:
$CELLFRAME_FILESERVER_PATH
/
$SUBDIR
/"
scp
-r
-i
$CELLFRAME_REPO_KEY
../prod_build/general/essentials/
$pkgname_weblink
"
$CELLFRAME_FILESERVER_CREDS
:
$CELLFRAME_FILESERVER_PATH
/
$SUBDIR
/"
fi
if
[[
$CI_COMMIT_REF_NAME
==
"master"
]]
;
then
if
[[
$CI_COMMIT_REF_NAME
==
"master"
]]
;
then
set
-x
set
-x
scp
-P
$REPO_PORT
-i
$CELLFRAME_REPO_KEY
$wd
/
$PACKAGE_PATH
/
$pkgname$MOD
.deb
"
$CELLFRAME_REPO_CREDS
:~/aptly/repo_update/
$pkgname_public$MOD
.deb"
scp
-
P
$REPO_PORT
-i
$CELLFRAME_REPO_KEY
$wd
/
$PACKAGE_PATH
/
$pkgname$MOD
.deb
"
$CELLFRAME_REPO_CREDS
:
~/aptly/repo_update
/
$pkgname_public$MOD
.deb
"
ssh
-
p
$REPO_PORT
-i
$CELLFRAME_REPO_KEY
"
$CELLFRAME_REPO_CREDS
"
--
"
~/aptly/repo_update
.sh
"
ssh
-p
$REPO_PORT
-i
$CELLFRAME_REPO_KEY
"
$CELLFRAME_REPO_CREDS
"
--
"~/aptly/repo_update.sh"
set
+x
set
+x
fi
fi
fi
# ssh -i $CELLFRAME_REPO_KEY "$CELLFRAME_FILESERVER_CREDS" "ln -sf $CELLFRAME_FILESERVER_PATH/$pkgname$MOD.deb $CELLFRAME_FILESERVER_PATH/$pkgname$MOD-latest.deb"
# ssh -i $CELLFRAME_REPO_KEY "$CELLFRAME_FILESERVER_CREDS" "ln -sf $CELLFRAME_FILESERVER_PATH/$pkgname$MOD.deb $CELLFRAME_FILESERVER_PATH/$pkgname$MOD-latest.deb"
...
...
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