Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
pmbootstrap
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
postmarketOS
pmbootstrap
Commits
b41e75e6
Commit
b41e75e6
authored
7 years ago
by
Pablo Castellano
Committed by
Oliver Smith
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Minor fixes (#316)
* Fixed typo and specify list order * Simplify code for jobs default value
parent
5eb9b92e
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
pmb/config/__init__.py
+2
-0
2 additions, 0 deletions
pmb/config/__init__.py
pmb/config/init.py
+1
-5
1 addition, 5 deletions
pmb/config/init.py
pmb/helpers/ui.py
+1
-1
1 addition, 1 deletion
pmb/helpers/ui.py
with
4 additions
and
6 deletions
pmb/config/__init__.py
+
2
−
0
View file @
b41e75e6
...
...
@@ -16,6 +16,7 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with pmbootstrap. If not, see <http://www.gnu.org/licenses/>.
"""
import
multiprocessing
import
os
#
...
...
@@ -47,6 +48,7 @@ defaults = {
"
config
"
:
os
.
path
.
expanduser
(
"
~
"
)
+
"
/.config/pmbootstrap.cfg
"
,
"
device
"
:
"
samsung-i9100
"
,
"
extra_packages
"
:
"
none
"
,
"
jobs
"
:
str
(
multiprocessing
.
cpu_count
()
+
1
),
"
timestamp_based_rebuild
"
:
True
,
"
log
"
:
"
$WORK/log.txt
"
,
"
mirror_alpine
"
:
"
https://nl.alpinelinux.org/alpine/
"
,
...
...
This diff is collapsed.
Click to expand it.
pmb/config/init.py
+
1
−
5
View file @
b41e75e6
...
...
@@ -18,7 +18,6 @@ along with pmbootstrap. If not, see <http://www.gnu.org/licenses/>.
"""
import
logging
import
os
import
multiprocessing
import
pmb.config
import
pmb.helpers.cli
...
...
@@ -76,13 +75,10 @@ def init(args):
cfg
[
"
pmbootstrap
"
][
"
work
"
]
=
ask_for_work_path
(
args
)
# Parallel job count
default
=
args
.
jobs
if
not
default
:
default
=
multiprocessing
.
cpu_count
()
+
1
logging
.
info
(
"
How many jobs should run parallel on this machine, when
"
"
compiling?
"
)
cfg
[
"
pmbootstrap
"
][
"
jobs
"
]
=
pmb
.
helpers
.
cli
.
ask
(
args
,
"
Jobs
"
,
None
,
default
,
validation_regex
=
"
[1-9][0-9]*
"
)
None
,
args
.
jobs
,
validation_regex
=
"
[1-9][0-9]*
"
)
# Timestamp based rebuilds
logging
.
info
(
"
Rebuild packages, when the last modified timestamp changed,
"
...
...
This diff is collapsed.
Click to expand it.
pmb/helpers/ui.py
+
1
−
1
View file @
b41e75e6
...
...
@@ -23,7 +23,7 @@ import glob
def
list
(
args
):
"""
Get all UIs, for which aports are available
:returns: [
"
none
"
,
"
postmarketos-ui-one
"
,
"
p
s
otmarketos-ui-two
"
, ...]
:returns: [
"
postmarketos-ui-one
"
,
"
po
s
tmarketos-ui-two
"
, ...
,
"
none
"
]
"""
ret
=
[]
for
path
in
glob
.
glob
(
args
.
aports
+
"
/main/postmarketos-ui-*
"
):
...
...
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