From 0e1e469c646b638cee62c4d9768112f2435f64f9 Mon Sep 17 00:00:00 2001 From: udeved Date: Thu, 21 May 2015 22:42:40 +0200 Subject: [PATCH] [conf] simplify chroots and sets dir --- conf/manjaro-tools.conf | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/conf/manjaro-tools.conf b/conf/manjaro-tools.conf index d1d5197..26d5ce8 100644 --- a/conf/manjaro-tools.conf +++ b/conf/manjaro-tools.conf @@ -2,15 +2,21 @@ ################ manjaro-tools.conf ################## ###################################################### -# unset defaults to given value +# default branch # branch=stable -# unset defaults to given value +# default arch: auto detect # arch=$(uname -m) # cache dir where buildpkg or buildiso cache packages # cache_dir=/var/cache/manjaro-tools +# build dir where buildpkg or buildiso chroots are created +# chroots_dir=/var/lib/manjaro-tools + +# default path to sets +# sets_dir=/etc/manjaro-tools/sets + ################ buildtree ############### # manjaro package tree @@ -22,12 +28,6 @@ ################ buildpkg ################ -# default chroot path -# chroots_pkg=/opt/buildpkg - -# custom path to pkg sets -# sets_dir_pkg=/etc/manjaro-tools/sets/pkg - # default pkg buildset; name without .set extension # buildset_pkg=default @@ -44,12 +44,6 @@ ################ buildiso ################ -# default work dir where the image chroots are located -# chroots_iso=/opt/buildiso - -# custom path to iso sets -# sets_dir_iso=/etc/manjaro-tools/sets/iso - # default iso buildset; name without .set extension # buildset_iso=default @@ -71,13 +65,13 @@ # unset defaults to given value # iso_name=manjaro -# publisher +# iso publisher # iso_publisher="Manjaro Linux " -# iso_app_id +# iso app id # iso_app_id="Manjaro Linux Live/Rescue CD" -# unset defaults to given value +# default compression # iso_compression=xz # valid: md5, sha1, sha256, sha384, sha512