Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.package
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
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
Rafael Monnerat
slapos.package
Commits
429f9d3c
Commit
429f9d3c
authored
Aug 04, 2020
by
Thomas Gambier
🚴🏼
Committed by
Rafael Monnerat
Sep 10, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Force to build with gcc on the build VM but don't force in OBS
parent
00bb0698
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
1 deletion
+16
-1
obs/slapos/prepare_download_cache.sh
obs/slapos/prepare_download_cache.sh
+5
-1
obs/slapos/slapos-node/slapos/buildout_with_gcc.cfg.in
obs/slapos/slapos-node/slapos/buildout_with_gcc.cfg.in
+11
-0
obs/slapos/slapos-node/slapos/buildout_without_gcc.cfg.in
obs/slapos/slapos-node/slapos/buildout_without_gcc.cfg.in
+0
-0
No files found.
obs/slapos/prepare_download_cache.sh
View file @
429f9d3c
...
@@ -32,7 +32,8 @@ wget https://bootstrap.pypa.io/bootstrap-buildout.py -O bootstrap.py
...
@@ -32,7 +32,8 @@ wget https://bootstrap.pypa.io/bootstrap-buildout.py -O bootstrap.py
-f
http://www.nexedi.org/static/packages/source/slapos.buildout/
&&
\
-f
http://www.nexedi.org/static/packages/source/slapos.buildout/
&&
\
./bin/buildout
-v
)
./bin/buildout
-v
)
sed
"s/
\%
RECIPE_VERSION
\%
/
$RECIPE_VERSION
/g;s|
\%
PATCHES_DIRECTORY
\%
|
$PATCHES_DIRECTORY
|g;s|
\%
TARGET_DIRECTORY
\%
|
$TARGET_DIRECTORY
|g;s|
\%
BUILD_ROOT_DIRECTORY
\%
|
$BUILD_ROOT_DIRECTORY
|g;s|
\%
BUILD_DIRECTORY
\%
|
$BUILD_DIRECTORY
|g"
$BUILD_ROOT_DIRECTORY
/../buildout.cfg.in
>
$BUILD_DIRECTORY
/buildout.cfg
# build locally everything with gcc
sed
"s/
\%
RECIPE_VERSION
\%
/
$RECIPE_VERSION
/g;s|
\%
PATCHES_DIRECTORY
\%
|
$PATCHES_DIRECTORY
|g;s|
\%
TARGET_DIRECTORY
\%
|
$TARGET_DIRECTORY
|g;s|
\%
BUILD_ROOT_DIRECTORY
\%
|
$BUILD_ROOT_DIRECTORY
|g;s|
\%
BUILD_DIRECTORY
\%
|
$BUILD_DIRECTORY
|g"
$BUILD_ROOT_DIRECTORY
/../buildout_with_gcc.cfg.in
>
$BUILD_DIRECTORY
/buildout.cfg
# Build first time to get download-cache and extends-cache ready
# Build first time to get download-cache and extends-cache ready
cd
$BUILD_DIRECTORY
cd
$BUILD_DIRECTORY
...
@@ -71,3 +72,6 @@ cp -R $BUILD_ROOT_DIRECTORY/../slapos.rebootstrap* eggs
...
@@ -71,3 +72,6 @@ cp -R $BUILD_ROOT_DIRECTORY/../slapos.rebootstrap* eggs
# package installation) and static libraries
# package installation) and static libraries
find
.
-regextype
posix-extended
-type
f
\
find
.
-regextype
posix-extended
-type
f
\
-iregex
'.*/*\.(py[co]|[l]?a|exe|bat)$$'
-exec
rm
-fv
'{}'
';'
-iregex
'.*/*\.(py[co]|[l]?a|exe|bat)$$'
-exec
rm
-fv
'{}'
';'
# in OBS build, don't force gcc build
sed
"s/
\%
RECIPE_VERSION
\%
/
$RECIPE_VERSION
/g;s|
\%
PATCHES_DIRECTORY
\%
|
$PATCHES_DIRECTORY
|g;s|
\%
TARGET_DIRECTORY
\%
|
$TARGET_DIRECTORY
|g;s|
\%
BUILD_ROOT_DIRECTORY
\%
|
$BUILD_ROOT_DIRECTORY
|g;s|
\%
BUILD_DIRECTORY
\%
|
$BUILD_DIRECTORY
|g"
$BUILD_ROOT_DIRECTORY
/../buildout_without_gcc.cfg.in
>
$BUILD_DIRECTORY
/buildout.cfg
obs/slapos/slapos-node/slapos/buildout_with_gcc.cfg.in
0 → 100644
View file @
429f9d3c
[buildout]
rootdir = %TARGET_DIRECTORY%
destdir = %BUILD_ROOT_DIRECTORY%
builddir = %BUILD_DIRECTORY%
extends =
%BUILD_ROOT_DIRECTORY%/../slapos_repository/component/slapos/obs.cfg
[gcc]
# force usage of gcc from slapos to have it in the cache
max_version = 0
obs/slapos/slapos-node/slapos/buildout.cfg.in
→
obs/slapos/slapos-node/slapos/buildout
_without_gcc
.cfg.in
View file @
429f9d3c
File moved
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