root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

Adopt by default kernel 4.19 and master branch. Note when we decide to create a v18.0 branch we need to change it

Browse source 
Signed-off-by: Ste74 <stefano@manjaro.org>
This commit is contained in:
Ste74 2018-11-02 18:41:23 +01:00
parent 8f4742cd4a
commit 31249fa9fd
No known key found for this signature in database
GPG key ID: 8DB9F8C18DF53602
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
data/manjaro-tools.conf
View file

@ -37,17 +37,17 @@
################ buildiso ################ ################ buildiso ################
#default branch for iso-profiles repo: v17.1>current release | master>development release #default branch for iso-profiles repo: master>current release
# branch=v17.1 # branch=master
# default iso build list; name without .list extension # default iso build list; name without .list extension
# build_list_iso=default # build_list_iso=default
# the dist release; default: auto # the dist release; default: auto
# dist_release=17.1 # dist_release=18.0
# the dist codename; default: auto # the dist codename; default: auto
# dist_codename=Hakoila # dist_codename=Illyria
# the branding; default: auto # the branding; default: auto
# dist_branding="MJRO" # dist_branding="MJRO"
@ -57,7 +57,7 @@
# iso_compression=xz # iso_compression=xz
# unset defaults to given value # unset defaults to given value
# kernel="linux414" # kernel="linux419"
# gpg key; leave empty or commented to skip sfs signing # gpg key; leave empty or commented to skip sfs signing
# gpgkey="" # gpgkey=""

4
lib/util.sh
View file

@ -315,7 +315,7 @@ init_buildiso(){
iso_label=$(get_iso_label "${dist_branding}${dist_release//.}") iso_label=$(get_iso_label "${dist_branding}${dist_release//.}")
[[ -z ${kernel} ]] && kernel="linux414" [[ -z ${kernel} ]] && kernel="linux419"
load_run_dir "${profile_repo}" load_run_dir "${profile_repo}"
@ -325,7 +325,7 @@ init_buildiso(){
branch=$(git rev-parse --abbrev-ref HEAD) branch=$(git rev-parse --abbrev-ref HEAD)
cd ${current_path} cd ${current_path}
else else
[[ -z ${branch} ]] && branch="v17.1" #current branch release [[ -z ${branch} ]] && branch="master" #current branch release
fi fi
[[ -z ${gpgkey} ]] && gpgkey='' [[ -z ${gpgkey} ]] && gpgkey=''