Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Thomas Gambier
slapos
Commits
0315c1b2
Commit
0315c1b2
authored
Jul 17, 2020
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "component/defaults: Allow to force gcc from SlapOS"
This reverts commit
1bd4fc32
parent
abfa1183
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
4 deletions
+1
-4
component/defaults.cfg
component/defaults.cfg
+1
-4
No files found.
component/defaults.cfg
View file @
0315c1b2
...
@@ -38,8 +38,6 @@ part = gcc-8.2
...
@@ -38,8 +38,6 @@ part = gcc-8.2
# Minimum version for all components that might be required for
# Minimum version for all components that might be required for
# slapos.rebootstrap (see https://bugs.python.org/issue34112 about Python 3.7+).
# slapos.rebootstrap (see https://bugs.python.org/issue34112 about Python 3.7+).
min_version = 5.4
min_version = 5.4
# A switch for environments which want to force slapos provided gcc
force_slapos_gcc = False
init =
init =
import os, subprocess
import os, subprocess
parse_version = lambda ver: tuple(map(int, ver.strip().split('.')))
parse_version = lambda ver: tuple(map(int, ver.strip().split('.')))
...
@@ -55,9 +53,8 @@ init =
...
@@ -55,9 +53,8 @@ init =
# the conditions have no impact on the dependant parts.
# the conditions have no impact on the dependant parts.
min_version = options.pop('min_version', None)
min_version = options.pop('min_version', None)
max_version = options.pop('max_version', None)
max_version = options.pop('max_version', None)
force_slapos_gcc = options.pop('force_slapos_gcc', 'False').lower() == 'true'
###
###
if (
not force_slapos_gcc) and (
parse_version(min_version or current)
if (parse_version(min_version or current)
<= parse_version(current)
<= parse_version(current)
<= parse_version(max_version or current)):
<= parse_version(max_version or current)):
del options['part']
del options['part']
...
...
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