Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
M
manjaro-tools
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
29
Issues
29
List
Boards
Labels
Service Desk
Milestones
Merge Requests
2
Merge Requests
2
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
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
Tools
development-tools
manjaro-tools
Commits
70f036cb
Commit
70f036cb
authored
Jun 24, 2018
by
Frede Hundewadt
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'upstream/stable-0.15.x' into stable-0.15.x
parents
05bee87e
72f46f8a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
4 deletions
+16
-4
bin/buildiso.in
bin/buildiso.in
+6
-2
data/manjaro-tools.conf
data/manjaro-tools.conf
+4
-0
lib/util-iso.sh
lib/util-iso.sh
+4
-2
lib/util.sh
lib/util.sh
+2
-0
No files found.
bin/buildiso.in
100644 → 100755
View file @
70f036cb
...
...
@@ -79,7 +79,8 @@ display_settings(){
msg
"ISO INFO:"
msg2
"iso_label: %s"
"
${
iso_label
}
"
msg2
"iso_compression: %s"
"
${
iso_compression
}
"
msg
"BUILD QUEUE:"
run show_profile
"
${
build_list_iso
}
"
}
...
...
@@ -116,6 +117,8 @@ usage() {
echo
' -m Set SquashFS image mode to persistence'
echo
' -c Disable clean work dir'
echo
' -f Build full ISO (extra=true)'
echo
' -d <comp> Compression used for build ISO: xz, gzip, lzma, lzo, lz4'
echo
" [default:
${
iso_compression
}
]"
echo
' -x Build images only'
echo
' -z Generate iso only'
echo
' Requires pre built images (-x)'
...
...
@@ -129,7 +132,7 @@ usage() {
orig_argv
=(
"
$@
"
)
opts
=
'p:a:b:r:t:k:i:g:cfzxmvqh'
opts
=
'p:a:b:r:t:k:i:g:
d:
cfzxmvqh'
while
getopts
"
${
opts
}
"
arg
;
do
case
"
${
arg
}
"
in
...
...
@@ -137,6 +140,7 @@ while getopts "${opts}" arg; do
b
)
target_branch
=
"
$OPTARG
"
;;
c
)
clean_first
=
false
;;
f
)
full_iso
=
true
;;
d
)
iso_compression
=
"
$OPTARG
"
;;
g
)
gpgkey
=
"
$OPTARG
"
;;
k
)
kernel
=
"
$OPTARG
"
;;
m
)
persist
=
true
;;
...
...
data/manjaro-tools.conf
View file @
70f036cb
...
...
@@ -49,6 +49,10 @@
# the branding; default: auto
# dist_branding="MJRO"
# compression used, possible values xz (default, best compression), gzip, lzma, lzo, lz4
# lz4 is faster but worst compression, may be useful for locally testing isos
# iso_compression=xz
# unset defaults to given value
# kernel="linux414"
...
...
lib/util-iso.sh
View file @
70f036cb
...
...
@@ -137,12 +137,14 @@ make_sfs() {
mksfs_args+
=(
${
sfs
}
-noappend
)
local
highcomp
=
"-b 256K -Xbcj x86"
comp
=
'xz'
local
highcomp
=
"-b 256K -Xbcj x86"
# local comp='xz'
[[
"
${
iso_compression
}
"
!=
"xz"
]]
&&
highcomp
=
""
if
[[
"
${
name
}
"
==
"mhwdfs"
&&
${
used_kernel
}
<
"4"
]]
;
then
mksfs_args+
=(
-comp
lz4
)
else
mksfs_args+
=(
-comp
${
comp
}
${
highcomp
}
)
mksfs_args+
=(
-comp
${
iso_compression
}
${
highcomp
}
)
fi
if
${
verbose
}
;
then
mksquashfs
"
${
mksfs_args
[@]
}
"
>
/dev/null
...
...
lib/util.sh
View file @
70f036cb
...
...
@@ -311,6 +311,8 @@ init_buildiso(){
[[
-z
${
dist_branding
}
]]
&&
dist_branding
=
"MJRO"
[[
-z
${
iso_compression
}
]]
&&
iso_compression
=
'xz'
iso_label
=
$(
get_iso_label
"
${
dist_branding
}${
dist_release
//.
}
"
)
[[
-z
${
kernel
}
]]
&&
kernel
=
"linux414"
...
...
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