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
8389448b
Commit
8389448b
authored
7 years ago
by
Pablo Castellano
Committed by
Oliver Smith
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
init: Allow to specify extra packages that will be always installed to rootfs (#304)
parent
d6bf0009
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
+1
-0
1 addition, 0 deletions
pmb/config/__init__.py
pmb/config/init.py
+8
-0
8 additions, 0 deletions
pmb/config/init.py
pmb/install/install.py
+2
-0
2 additions, 0 deletions
pmb/install/install.py
with
11 additions
and
0 deletions
pmb/config/__init__.py
+
1
−
0
View file @
8389448b
...
...
@@ -46,6 +46,7 @@ defaults = {
"
aports
"
:
os
.
path
.
normpath
(
pmb_src
+
"
/aports
"
),
"
config
"
:
os
.
path
.
expanduser
(
"
~
"
)
+
"
/.config/pmbootstrap.cfg
"
,
"
device
"
:
"
samsung-i9100
"
,
"
extra_packages
"
:
"
none
"
,
"
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
+
8
−
0
View file @
8389448b
...
...
@@ -92,6 +92,14 @@ def init(args):
default
=
args
.
timestamp_based_rebuild
)
cfg
[
"
pmbootstrap
"
][
"
timestamp_based_rebuild
"
]
=
str
(
answer
)
# Extra packages to be installed to rootfs
logging
.
info
(
"
Additional packages that will be installed to rootfs.
"
"
Specify them in a comma separated list (e.g.: vim,file)
"
"
or
\"
none
\"
"
)
cfg
[
"
pmbootstrap
"
][
"
extra_packages
"
]
=
pmb
.
helpers
.
cli
.
ask
(
args
,
"
Extra packages
"
,
None
,
args
.
extra_packages
,
validation_regex
=
"
^(|[-\w\s]+(?:,[-\w\s]*)*)$
"
)
# Do not save aports location to config file
del
cfg
[
"
pmbootstrap
"
][
"
aports
"
]
...
...
This diff is collapsed.
Click to expand it.
pmb/install/install.py
+
2
−
0
View file @
8389448b
...
...
@@ -97,6 +97,8 @@ def install(args):
# Explicitly call build on the install packages, to re-build them or any
# dependency, in case the version increased
if
args
.
extra_packages
.
lower
()
!=
"
none
"
:
install_packages
+=
args
.
extra_packages
.
split
(
"
,
"
)
if
args
.
add
:
install_packages
+=
args
.
add
.
split
(
"
,
"
)
for
pkgname
in
install_packages
:
...
...
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