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

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

Browse source
This commit is contained in:
udeved 2017-02-20 21:24:21 +01:00
commit 59b1be485d
6 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

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

7
bin/mkchrootpkg.in
View file

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

2
data/iso.list.d/default.list
View file

@ -1 +1 @@
xfce-minimal xfce

3
data/manjaro-tools.conf
View file

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

7
lib/util-yaml.sh
View file

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

6
lib/util.sh
View file

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