Commit ac44e01b authored by udeved's avatar udeved
Browse files

Merge branch 'devel'

parents 0a29834e 3c105473
......@@ -3,14 +3,33 @@ Version=0.9.15
PREFIX = /usr/local
SYSCONFDIR = /etc
BIN = \
SYSCONF = \
data/manjaro-tools.conf
BIN_BASE = \
bin/mkchroot \
bin/basestrap \
bin/manjaro-chroot \
bin/fstabgen \
bin/buildset \
bin/chroot-run
LIBS_BASE = \
lib/util.sh \
lib/util-mount.sh \
lib/util-msg.sh \
lib/util-pac-conf.sh \
lib/util-fstab.sh
SHARED_BASE = \
data/pacman-default.conf \
data/pacman-multilib.conf \
data/pacman-mirrors-stable.conf \
data/pacman-mirrors-testing.conf \
data/pacman-mirrors-unstable.conf
SETS_PKG = \
data/pkg.d/default.set
BIN_PKG = \
bin/checkpkg \
bin/lddd \
......@@ -22,49 +41,25 @@ BIN_PKG = \
bin/buildpkg \
bin/buildtree
BIN_ISO = \
bin/buildiso \
bin/testiso \
bin/deployiso
SYSCONF = \
conf/manjaro-tools.conf
SETS_PKG = \
sets/pkg.d/default.set
SETS_ISO = \
sets/iso.d/default.set \
sets/iso.d/official.set \
sets/iso.d/community.set \
sets/iso.d/community-minimal.set
SHARED = \
conf/pacman-default.conf \
conf/pacman-multilib.conf \
conf/pacman-mirrors-stable.conf \
conf/pacman-mirrors-testing.conf \
conf/pacman-mirrors-unstable.conf
LIBS_PKG = \
lib/util-pkg.sh \
lib/util-pkgtree.sh
SHARED_PKG = \
conf/makepkg-i686.conf \
conf/base-devel-udev \
conf/makepkg-x86_64.conf
SHARED_ISO = \
conf/pacman-gfx.conf \
conf/profile.conf.example
data/makepkg-i686.conf \
data/base-devel-udev \
data/makepkg-x86_64.conf
LIBS = \
lib/util.sh \
lib/util-mount.sh \
lib/util-msg.sh \
lib/util-pac-conf.sh \
lib/util-fstab.sh
SETS_ISO = \
data/iso.d/default.set \
data/iso.d/official.set \
data/iso.d/community.set \
data/iso.d/community-minimal.set
LIBS_PKG = \
lib/util-pkg.sh \
lib/util-pkgtree.sh
BIN_ISO = \
bin/buildiso \
bin/testiso \
bin/deployiso
LIBS_ISO = \
lib/util-iso.sh \
......@@ -75,9 +70,12 @@ LIBS_ISO = \
lib/util-livecd.sh \
lib/util-iso-boot.sh \
lib/util-publish.sh \
lib/util-sets.sh \
lib/util-iso-log.sh
SHARED_ISO = \
data/pacman-gfx.conf \
data/profile.conf.example
CPIOHOOKS = \
initcpio/hooks/miso \
initcpio/hooks/miso_overlayfs \
......@@ -94,12 +92,11 @@ CPIOINST = \
initcpio/inst/miso_kms
SCRIPTS = \
scripts/mhwd-live \
scripts/livecd \
scripts/kbd-model-map
data/scripts/mhwd-live \
data/scripts/livecd \
data/scripts/kbd-model-map
MAN_XML = \
buildset.xml \
buildpkg.xml \
buildtree.xml \
buildiso.xml \
......@@ -107,10 +104,9 @@ MAN_XML = \
manjaro-tools.conf.xml \
profile.conf.xml
all: $(BIN) $(BIN_PKG) $(BIN_ISO) doc #bin/bash_completion bin/zsh_completion
all: $(BIN_BASE) $(BIN_PKG) $(BIN_ISO) doc
edit = sed -e "s|@pkgdatadir[@]|$(DESTDIR)$(PREFIX)/share/manjaro-tools|g" \
-e "s|@bindir[@]|$(DESTDIR)$(PREFIX)/bin|g" \
edit = sed -e "s|@datadir[@]|$(DESTDIR)$(PREFIX)/share/manjaro-tools|g" \
-e "s|@sysconfdir[@]|$(DESTDIR)$(SYSCONFDIR)/manjaro-tools|g" \
-e "s|@libdir[@]|$(DESTDIR)$(PREFIX)/lib/manjaro-tools|g" \
-e "s|@version@|${Version}|"
......@@ -127,7 +123,7 @@ doc:
$(foreach var,$(MAN_XML),xsltproc /usr/share/docbook2X/xslt/man/docbook.xsl docbook/$(var) | db2x_manxml --output-dir man ;)
clean:
rm -f $(BIN) ${BIN_PKG} ${BIN_ISO} #bin/bash_completion bin/zsh_completion
rm -f $(BIN_BASE) ${BIN_PKG} ${BIN_ISO}
rm -rf man
install_base:
......@@ -135,24 +131,17 @@ install_base:
install -m0644 ${SYSCONF} $(DESTDIR)$(SYSCONFDIR)/manjaro-tools
install -dm0755 $(DESTDIR)$(PREFIX)/bin
install -m0755 ${BIN} $(DESTDIR)$(PREFIX)/bin
install -m0755 ${BIN_BASE} $(DESTDIR)$(PREFIX)/bin
install -dm0755 $(DESTDIR)$(PREFIX)/lib/manjaro-tools
install -m0644 ${LIBS} $(DESTDIR)$(PREFIX)/lib/manjaro-tools
install -m0644 ${LIBS_BASE} $(DESTDIR)$(PREFIX)/lib/manjaro-tools
install -dm0755 $(DESTDIR)$(PREFIX)/share/manjaro-tools
install -m0644 ${SHARED} $(DESTDIR)$(PREFIX)/share/manjaro-tools
install -dm0755 $(DESTDIR)$(PREFIX)/share/man/man1
gzip -c man/buildset.1 > $(DESTDIR)$(PREFIX)/share/man/man1/buildset.1.gz
# install -Dm0644 bin/bash_completion $(DESTDIR)/$(PREFIX)/share/bash-completion/completions/manjaro_tools
# install -Dm0644 bin/zsh_completion $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_manjaro_tools
install -m0644 ${SHARED_BASE} $(DESTDIR)$(PREFIX)/share/manjaro-tools
install_pkg:
install -dm0755 $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/sets/pkg.d
install -m0644 ${SETS_PKG} $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/sets/pkg.d
install -dm0755 $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/pkg.d
install -m0644 ${SETS_PKG} $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/pkg.d
install -dm0755 $(DESTDIR)$(PREFIX)/bin
install -m0755 ${BIN_PKG} $(DESTDIR)$(PREFIX)/bin
......@@ -169,10 +158,9 @@ install_pkg:
gzip -c man/buildpkg.1 > $(DESTDIR)$(PREFIX)/share/man/man1/buildpkg.1.gz
gzip -c man/buildtree.1 > $(DESTDIR)$(PREFIX)/share/man/man1/buildtree.1.gz
install_iso:
install -dm0755 $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/sets/iso.d
install -m0644 ${SETS_ISO} $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/sets/iso.d
install -dm0755 $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/iso.d
install -m0644 ${SETS_ISO} $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/iso.d
install -dm0755 $(DESTDIR)$(PREFIX)/bin
install -m0755 ${BIN_ISO} $(DESTDIR)$(PREFIX)/bin
......@@ -200,20 +188,14 @@ install_iso:
gzip -c man/manjaro-tools.conf.5 > $(DESTDIR)$(PREFIX)/share/man/man5/manjaro-tools.conf.5.gz
gzip -c man/profile.conf.5 > $(DESTDIR)$(PREFIX)/share/man/man5/profile.conf.5.gz
uninstall_base:
for f in ${SYSCONF}; do rm -f $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/$$f; done
for f in ${BIN}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
for f in ${SHARED}; do rm -f $(DESTDIR)$(PREFIX)/share/manjaro-tools/$$f; done
for f in ${LIBS}; do rm -f $(DESTDIR)$(PREFIX)/lib/manjaro-tools/$$f; done
rm -f $(DESTDIR)$(PREFIX)/share/man/man1/buildset.1.gz
# rm $(DESTDIR)/$(PREFIX)/share/bash-completion/completions/manjaro_tools
# rm $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_manjaro_tools
for f in ${BIN_BASE}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
for f in ${SHARED_BASE}; do rm -f $(DESTDIR)$(PREFIX)/share/manjaro-tools/$$f; done
for f in ${LIBS_BASE}; do rm -f $(DESTDIR)$(PREFIX)/lib/manjaro-tools/$$f; done
uninstall_pkg:
for f in ${SETS_PKG}; do rm -f $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/sets/pkg.d/$$f; done
for f in ${SETS_PKG}; do rm -f $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/pkg.d/$$f; done
for f in ${BIN_PKG}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
rm -f $(DESTDIR)$(PREFIX)/bin/find-libprovides
for f in ${SHARED_PKG}; do rm -f $(DESTDIR)$(PREFIX)/share/manjaro-tools/$$f; done
......@@ -221,9 +203,8 @@ uninstall_pkg:
rm -f $(DESTDIR)$(PREFIX)/share/man/man1/buildpkg.1.gz
rm -f $(DESTDIR)$(PREFIX)/share/man/man1/buildtree.1.gz
uninstall_iso:
for f in ${SETS_ISO}; do rm -f $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/sets/iso.d/$$f; done
for f in ${SETS_ISO}; do rm -f $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/iso.d/$$f; done
for f in ${BIN_ISO}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
for f in ${SHARED_ISO}; do rm -f $(DESTDIR)$(PREFIX)/share/manjaro-tools/$$f; done
for f in ${LIBS_ISO}; do rm -f $(DESTDIR)$(PREFIX)/lib/manjaro-tools/$$f; done
......@@ -235,7 +216,6 @@ uninstall_iso:
rm -f $(DESTDIR)$(PREFIX)/share/man/man5/manjaro-tools.conf.5.gz
rm -f $(DESTDIR)$(PREFIX)/share/man/man5/profile.conf.5.gz
install: install_base install_pkg install_iso
uninstall: uninstall_base uninstall_pkg uninstall_iso
......
......@@ -17,7 +17,7 @@ By default, the config is installed in
A user manjaro-tools.conf can be placed in
~~~
$HOME/.config/manjaro-tools.conf
$HOME/.config/manjaro-tools/manjaro-tools.conf
~~~
If the userconfig is present, manjaro-tools will load the userconfig values, however, if variables have been set in the systemwide
......@@ -33,6 +33,19 @@ By default it is commented and shows just initialization values done in code.
Tools configuration is done in manjaro-tools.conf or by args.
Specifying args will override manjaro-tools.conf settings.
User sets can be placed in
~~~
$HOME/.config/manjaro-tools/{pkg,iso}.d
~~~
overriding
~~~
/etc/manjaro-tools/{pkg,iso}.d
~~~
~~~
######################################################
################ manjaro-tools.conf ##################
......@@ -50,9 +63,6 @@ Specifying args will override manjaro-tools.conf settings.
# 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
# custom build mirror server
# build_mirror=http://mirror.netzspielplatz.de/manjaro/packages
......@@ -73,6 +83,9 @@ Specifying args will override manjaro-tools.conf settings.
################ buildiso ################
# the iso-profiles directory name/git repo name
# profile_repo='manjaro-tools-iso-profiles'
# default iso buildset; name without .set extension
# buildset_iso=default
......@@ -80,10 +93,10 @@ Specifying args will override manjaro-tools.conf settings.
# dist_name="Manjaro"
# unset defaults to given value
# dist_release=15.09
# dist_release=15.12
# unset defaults to value sourced from /etc/lsb-release
# dist_codename="Bellatrix"
# dist_codename="Capella"
# unset defaults to given value
# dist_branding="MJRO"
......@@ -137,7 +150,7 @@ It it run in a abs/pkgbuilds directory which contains directories with PKGBUILD.
~~~
$ buildpkg -h
Usage: buildpkg [options] [--] [makepkg args]
Usage: buildpkg [options]
-p <pkg> Buildset or pkg [default: default]
-a <arch> Arch [default: auto]
-b <branch> Branch [default: stable]
......@@ -242,60 +255,8 @@ The branch can be defined also in manjaro-tools.conf, but a manual parameter wil
######* -s
* Use this to sqfs compress the chroots if you previously used -i.
###4. buildset
buildpkg and buildiso support building from buildsets
Default location of sets is:
~~~
/etc/manjaro-tools/manjaro-tools/sets/pkg.d
/etc/manjaro-tools/manjaro-tools/sets/iso.d
~~~
but it can be configured in the manjaro-tools.conf.
buildset is a little helper tool to easily create buildsets.
It is run inside the abs/pkgbuilds or iso profiles directory.
####Arguments
~~~
$ buildset -h
Usage: buildset [options]
-c <name> Create set
-r <name> Remove set
-s <name> Show set
-i Iso mode
-q Query sets
-h This help
~~~
######* create a pkg buildset for lxqt
~~~
buildset -c lxqt-0.8
~~~
######* create a iso buildset
~~~
buildset -ic manjaro-0.9.0
~~~
The buildset name should not be a name of a package or profile!
Else buildpkg/buildiso won't recognize the build list and will only build the package/profile specified. The -p arg handles set and package/profile name.
If you create a buildset manually, the buildset must have a .set extension.
* Examples:
~~~
/etc/manjaro-tools/sets/pkg.d/lxqt-0.8.set
/etc/manjaro-tools/sets/iso.d/manjaro-0.9.0.set
~~~
###5. buildtree
###4. buildtree
buildtree is a little tools to sync arch abs and manjaro PKGBUILD git repos.
......@@ -317,7 +278,7 @@ Usage: buildtree [options]
buildtree -as
~~~
###6. manjaro-chroot
###5. manjaro-chroot
manjaro-chroot is a little tool to quickly chroot into a second system installed on the host.
If the automount option is enabled, manjaro-chroot will detect installed systems with os-prober, and pops up a list with linux systems to select from.
......@@ -327,12 +288,15 @@ If there is only 1 system installed besides the host system, no list will pop up
~~~
$ manjaro-chroot -h
usage: ${0##*/} chroot-dir [command]
usage: manjaro-chroot -a [or] manjaro-chroot chroot-dir [command]
-a Automount detected linux system
-q Query settings and pretend
-h Print this help message
If 'command' is unspecified, manjaro-chroot will launch /bin/sh.
If 'automount' is true, manjaro-chroot will launch /bin/bash
and /build/manjaro-tools/manjaro-chroot.
~~~
######* automount
......@@ -347,7 +311,7 @@ manjaro-chroot -a
manjaro-chroot /mnt /bin/bash
~~~
###7. deployiso
###6. deployiso
deployiso is a script to upload a specific iso or a buiildset to SF.
It needs to be run inside the iso-profiles directory.
......@@ -360,10 +324,12 @@ Ideally, you have a running ssh agent on the host, and your key added, and your
$ deployiso -h
Usage: deployiso [options]
-p Source folder to upload [default:default]
-a Arch to upload [default:x86_64]
-l Limit bandwidth in kB/s [default:80]
-c Create new remote edition_type with subtree
-u Update remote iso
-l Limit bandwidth in kB/s
-q Query settings and pretend upload
-v Verbose output
-h This help
~~~
......
......@@ -12,7 +12,7 @@ version=@version@
shopt -s extglob
PKGDATADIR='@pkgdatadir@'
DATADIR='@datadir@'
LIBDIR='@libdir@'
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
......
......@@ -11,9 +11,8 @@
version=@version@
BINDIR='@bindir@'
LIBDIR='@libdir@'
PKGDATADIR='@pkgdatadir@'
DATADIR='@datadir@'
SYSCONFDIR='@sysconfdir@'
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
......@@ -21,46 +20,45 @@ SYSCONFDIR='@sysconfdir@'
import ${LIBDIR}/util.sh
show_profile(){
cd $1
load_profile "$1"
if ${verbose};then
msg2 "edition_type: ${edition_type}"
msg2 "work_dir: ${work_dir}"
msg2 "cache_dir_iso: ${cache_dir_iso}"
msg2 "iso_file: ${iso_file}"
msg2 "is_custom_pac_conf: ${is_custom_pac_conf}"
msg2 "initsys: ${initsys}"
if ${use_overlayfs};then
msg2 "mount system: overlayfs"
else
msg2 "mount system: aufs"
fi
[[ ${arch} == 'x86_64' ]] && msg2 "multilib: ${multilib}"
msg2 "displaymanager: ${displaymanager}"
msg2 "autologin: ${autologin}"
msg2 "nonfree_xorg: ${nonfree_xorg}"
msg2 "kernel: ${kernel}"
msg2 "efi_boot_loader: ${efi_boot_loader}"
msg2 "efi_part_size: ${efi_part_size}"
msg2 "pxe_boot: ${pxe_boot}"
msg2 "plymouth_boot: ${plymouth_boot}"
${plymouth_boot} && msg2 "plymouth_theme: ${plymouth_theme}"
msg2 "hostname: ${hostname}"
msg2 "username: ${username}"
msg2 "password: ${password}"
msg2 "addgroups: ${addgroups}"
if [[ ${initsys} == 'systemd' ]];then
msg2 "start_systemd: ${start_systemd[*]}"
msg2 "start_systemd_live: ${start_systemd_live[*]}"
msg2 "disable_systemd: ${disable_systemd[*]}"
else
msg2 "start_openrc: ${start_openrc[*]}"
msg2 "start_openrc_live: ${start_openrc_live[*]}"
msg2 "disable_openrc: ${disable_openrc[*]}"
fi
eval_edition "$1"
load_profile "${run_dir}/${edition}/$1"
msg2 "edition: ${edition}"
if ${verbose};then
msg2 "work_dir: ${work_dir}"
msg2 "iso_dir: ${iso_dir}"
msg2 "iso_file: ${iso_file}"
msg2 "is_custom_pac_conf: ${is_custom_pac_conf}"
msg2 "initsys: ${initsys}"
if ${use_overlayfs};then
msg2 "mount system: overlayfs"
else
msg2 "mount system: aufs"
fi
cd ..
[[ ${arch} == 'x86_64' ]] && msg2 "multilib: ${multilib}"
msg2 "displaymanager: ${displaymanager}"
msg2 "autologin: ${autologin}"
msg2 "nonfree_xorg: ${nonfree_xorg}"
msg2 "kernel: ${kernel}"
msg2 "efi_boot_loader: ${efi_boot_loader}"
msg2 "efi_part_size: ${efi_part_size}"
msg2 "pxe_boot: ${pxe_boot}"
msg2 "plymouth_boot: ${plymouth_boot}"
${plymouth_boot} && msg2 "plymouth_theme: ${plymouth_theme}"
msg2 "hostname: ${hostname}"
msg2 "username: ${username}"
msg2 "password: ${password}"
msg2 "addgroups: ${addgroups}"
if [[ ${initsys} == 'systemd' ]];then
msg2 "start_systemd: ${start_systemd[*]}"
msg2 "start_systemd_live: ${start_systemd_live[*]}"
msg2 "disable_systemd: ${disable_systemd[*]}"
else
msg2 "start_openrc: ${start_openrc[*]}"
msg2 "start_openrc_live: ${start_openrc_live[*]}"
msg2 "disable_openrc: ${disable_openrc[*]}"
fi
fi
}
display_settings(){
......@@ -69,9 +67,10 @@ display_settings(){
msg "PROFILE:"
msg2 "sets_dir_iso: ${sets_dir_iso}"
msg2 "buildsets: $(load_sets ${sets_dir_iso})"
msg2 "buildsets: $(list_sets ${sets_dir_iso})"
msg2 "buildset_iso: ${buildset_iso}"
msg2 "is_buildset: ${is_buildset}"
msg2 "profile_repo: ${profile_repo}"
msg "OPTIONS:"
msg2 "arch: ${arch}"
......@@ -103,11 +102,15 @@ display_settings(){
load_user_info
load_config "${USER_CONFIG}/manjaro-tools.conf"
load_config "${USERCONFDIR}/manjaro-tools.conf"
load_config "${SYSCONFDIR}/manjaro-tools.conf"
clean_first=true
# to force old way to have buildiso run in iso-profiles dir
# run_dir=$(pwd)
load_run_dir "${profile_repo}"
clean_first=true
pretend=false
images_only=false
iso_only=false
......@@ -164,15 +167,15 @@ timer_start=$(get_timer)
[[ "${arch}" == 'x86_64' ]] && pacman_conf_arch='multilib'
mirrors_conf="${PKGDATADIR}/pacman-mirrors-${branch}.conf"
mirrors_conf="${DATADIR}/pacman-mirrors-${branch}.conf"
check_root "$0" "${orig_argv[@]}"
eval_buildset "${buildset_iso}" "${sets_dir_iso}"
eval_buildset "${sets_dir_iso}" "${buildset_iso}"
import ${LIBDIR}/util-iso.sh
check_requirements "${buildset_iso}"
check_requirements
${pretend} && display_settings && exit 1
......
......@@ -14,7 +14,7 @@ version=@version@
shopt -s nullglob
LIBDIR='@libdir@'
PKGDATADIR='@pkgdatadir@'
DATADIR='@datadir@'
SYSCONFDIR='@sysconfdir@'
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
......@@ -37,7 +37,7 @@ display_settings(){
msg "PROFILE:"
msg2 "sets_dir_pkg: ${sets_dir_pkg}"
msg2 "buildsets: $(load_sets ${sets_dir_pkg})"
msg2 "buildsets: $(list_sets ${sets_dir_pkg})"
msg2 "buildset_pkg: ${buildset_pkg}"
msg2 "is_buildset: ${is_buildset}"
......@@ -56,7 +56,7 @@ display_settings(){
msg "PATHS:"
msg2 "work_dir: ${work_dir}"
msg2 "cache_dir_pkg: ${cache_dir_pkg}"
msg2 "pkg_dir: ${pkg_dir}"
msg2 "build_mirror: ${build_mirror}/${branch}"
if ${clean_first};then
......@@ -70,7 +70,7 @@ display_settings(){
load_user_info
load_config "${USER_CONFIG}/manjaro-tools.conf"
load_config "${USERCONFDIR}/manjaro-tools.conf"
load_config "${SYSCONFDIR}/manjaro-tools.conf"
load_vars "$USER_HOME/.makepkg.conf"
......@@ -131,19 +131,19 @@ done
if [[ "${arch}" == 'multilib' ]]; then
pacman_conf_arch=${arch}
work_dir=${chroots_pkg}/${branch}/${arch}
cache_dir_pkg=${cache_dir}/pkg/${branch}/${arch}
pkg_dir=${cache_dir_pkg}/${branch}/${arch}
arch='x86_64'
is_multilib=true
else
pacman_conf_arch='default'
work_dir=${chroots_pkg}/${branch}/${arch}
cache_dir_pkg=${cache_dir}/pkg/${branch}/${arch}
pkg_dir=${cache_dir_pkg}/${branch}/${arch}
is_multilib=false
fi
pacman_conf="${PKGDATADIR}/pacman-${pacman_conf_arch}.conf"
makepkg_conf="${PKGDATADIR}/makepkg-${arch}.conf"
mirrors_conf="${PKGDATADIR}/pacman-mirrors-${branch}.conf"
pacman_conf="${DATADIR}/pacman-${pacman_conf_arch}.conf"
makepkg_conf="${DATADIR}/makepkg-${arch}.conf"
mirrors_conf="${DATADIR}/pacman-mirrors-${branch}.conf"
mkchroot_args+=(-C ${pacman_conf} -M ${makepkg_conf} -S ${mirrors_conf} -B "${build_mirror}/${branch}")
......@@ -153,18 +153,20 @@ check_root "$0" "${orig_argv[@]}"
timer_start=$(get_timer)
prepare_dir "${cache_dir_pkg}"
eval_buildset "${buildset_pkg}" "${sets_dir_pkg}"
eval_buildset "${sets_dir_pkg}" "${buildset_pkg}"
check_requirements
prepare_dir "${pkg_dir}"
init_base_devel
${pretend} && display_settings && exit
${wipe_clean} && clean_up
[[ -d ${work_dir}/root ]] && check_chroot_version "${work_dir}/root"
#[[ -d ${work_dir}/root ]] && check_chroot_version "${work_dir}/root"
chroot_init
run make_pkg "${buildset_pkg}"