Merge branch 'master' of github.com:manjaro/manjaro-tools into stable-0.14.x

README.md

@@ -88,9 +88,6 @@ overriding
 
 ################ buildiso ################
 
-# the name of the profiles directory
-# profile_repo='manjaro-tools-iso-profiles'
-
 # default iso build list; name without .list extension
 # build_list_iso=default
 

bin/mkchrootpkg.in

@@ -239,9 +239,10 @@ EOF
 # so no global variables
 _chrootbuild() {
     . /etc/profile
-    export HOME=/build
-    cd /startdir
-    sudo -u builduser makepkg "$@"
+#     export HOME=/build
+#     cd /startdir
+#     sudo -u builduser makepkg "$@"
+    sudo -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
 }
 
 _chrootnamcap() {

data/iso.list.d/default.list

@@ -1 +1 @@
-xfce-minimal
+xfce

data/manjaro-tools.conf

@@ -37,9 +37,6 @@
 
 ################ buildiso ################
 
-# the name of the profiles directory
-# profile_repo='iso-profiles'
-
 # default iso build list; name without .list extension
 # build_list_iso=default
 

lib/util-yaml.sh

@@ -241,12 +241,11 @@ write_postcfg_conf(){
 get_yaml(){
     local args=() yaml
     if ${chrootcfg};then
-        args+=('chrootcfg')
+        args+=("${profile}/chrootcfg")
     else
-        args+=("packages")
+        args+=("${profile}/packages")
     fi
     args+=("${initsys}")
-    [[ ${edition} == 'sonar' ]] && args+=("${edition}")
     for arg in ${args[@]};do
         yaml=${yaml:-}${yaml:+-}${arg}
     done
@@ -400,7 +399,7 @@ write_pacman_group_yaml(){
 
 prepare_check(){
     profile=$1
-    edition=$(get_edition ${profile})
+    local edition=$(get_edition ${profile})
     profile_dir=${run_dir}/${edition}/${profile}
     check_profile
     load_profile_config "${profile_dir}/profile.conf"

lib/util.sh

@@ -295,6 +295,8 @@ init_buildiso(){
 
     cache_dir_iso="${cache_dir}/iso"
 
+    profile_repo='iso-profiles'
+
     ##### iso settings #####
 
     [[ -z ${dist_release} ]] && dist_release=$(get_release)
@@ -315,8 +317,6 @@ init_buildiso(){
 
     [[ -z ${use_overlayfs} ]] && use_overlayfs='true'
 
-    [[ -z ${profile_repo} ]] && profile_repo='iso-profiles'
-
     [[ -z ${gpgkey} ]] && gpgkey=''
 
     mhwd_repo="/opt/pkg"
@@ -708,7 +708,7 @@ write_repo_conf(){
     local path name
     [[ -z ${repos[@]} ]] && run_dir=${DATADIR}/iso-profiles && return 1
     for r in ${repos[@]}; do
-        path=${r%/.*}
+        path=${r%/repo_info}
         name=${path##*/}
         echo "run_dir=$path" > ${USERCONFDIR}/$name.conf
     done