Merge master

Makefile

@@ -23,13 +23,18 @@ LIBS_BASE = \
 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 \
-	data/pacman-arm.conf
+	data/pacman-mirrors.conf
 
-SETS_PKG = \
-	data/pkg.d/default.set
+LIST_PKG = \
+	data/pkg.list.d/default.list
+
+ARCH_CONF = \
+	data/make.conf.d/i686.conf \
+	data/make.conf.d/x86_64.conf \
+	data/make.conf.d/multilib.conf
+# 	data/make.conf.d/aarch64.conf \
+# 	data/make.conf.d/armv6h.conf \
+# 	data/make.conf.d/armv7h.conf
 
 BIN_PKG = \
 	bin/checkpkg \
@@ -46,17 +51,15 @@ LIBS_PKG = \
 	lib/util-pkgtree.sh
 
 SHARED_PKG = \
-	data/makepkg-i686.conf \
-	data/base-devel-udev \
-	data/makepkg-x86_64.conf \
-	data/makepkg-arm.conf
-
-SETS_ISO = \
-	data/iso.d/default.set \
-	data/iso.d/official.set \
-	data/iso.d/community.set \
-	data/iso.d/minimal.set \
-	data/iso.d/sonar.set
+	data/makepkg.conf \
+	data/base-devel-udev
+
+LIST_ISO = \
+	data/iso.list.d/default.list \
+	data/iso.list.d/official.list \
+	data/iso.list.d/community.list \
+	data/iso.list.d/minimal.list \
+	data/iso.list.d/sonar.list
 
 BIN_ISO = \
 	bin/buildiso \
@@ -136,8 +139,11 @@ install_base:
 	install -m0644 ${SHARED_BASE} $(DESTDIR)$(PREFIX)/share/manjaro-tools
 
 install_pkg:
-	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/pkg.d
-	install -m0644 ${SETS_PKG} $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/pkg.d
+	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/pkg.list.d
+	install -m0644 ${LIST_PKG} $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/pkg.list.d
+
+	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/make.conf.d
+	install -m0644 ${ARCH_CONF} $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/make.conf.d
 
 	install -dm0755 $(DESTDIR)$(PREFIX)/bin
 	install -m0755 ${BIN_PKG} $(DESTDIR)$(PREFIX)/bin
@@ -155,8 +161,8 @@ install_pkg:
 	gzip -c man/buildtree.1 > $(DESTDIR)$(PREFIX)/share/man/man1/buildtree.1.gz
 
 install_iso:
-	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/iso.d
-	install -m0644 ${SETS_ISO} $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/iso.d
+	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/iso.list.d
+	install -m0644 ${LIST_ISO} $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/iso.list.d
 
 	install -dm0755 $(DESTDIR)$(PREFIX)/bin
 	install -m0755 ${BIN_ISO} $(DESTDIR)$(PREFIX)/bin
@@ -188,7 +194,8 @@ uninstall_base:
 	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/pkg.d/$$f; done
+	for f in ${LIST_PKG}; do rm -f $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/pkg.list.d/$$f; done
+	for f in ${ARCH_CONF}; do rm -f $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/make.conf.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
@@ -197,7 +204,7 @@ uninstall_pkg:
 	rm -f $(DESTDIR)$(PREFIX)/share/man/man1/buildtree.1.gz
 
 uninstall_iso:
-	for f in ${SETS_ISO}; do rm -f $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/iso.d/$$f; done
+	for f in ${LIST_ISO}; do rm -f $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/iso.list.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

README.md

@@ -33,16 +33,18 @@ 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
+User build lists(eg 'my-super-build.list') can be placed in
 
 ~~~
-$HOME/.config/manjaro-tools/{pkg,iso}.d
+$HOME/.config/manjaro-tools/pkg.list.d
+$HOME/.config/manjaro-tools/iso.list.d
 ~~~
 
 overriding
 
 ~~~
-/etc/manjaro-tools/{pkg,iso}.d
+/etc/manjaro-tools/pkg.list.d
+/etc/manjaro-tools/iso.list.d
 ~~~
 
 
@@ -81,15 +83,15 @@ overriding
 
 ################ buildpkg ################
 
-# default pkg buildset; name without .set extension
-# buildset_pkg=default
+# default pkg build list; name without .list extension
+# build_list_pkg=default
 
 ################ buildiso ################
 
 # profile_repo='manjaro-tools-iso-profiles'
 
-# default iso buildset; name without .set extension
-# buildset_iso=default
+# default iso build list; name without .list extension
+# build_list_iso=default
 
 # unset defaults to given value
 # dist_name="Manjaro"
@@ -355,7 +357,7 @@ Usage: deployiso [options]
     -h                 This help
 ~~~
 
-######* upload official buildset, ie all built iso defined in a buildset
+######* upload official build list, ie all built iso defined in a build list
 
 ~~~
 deployiso -p official -c

bin/buildiso.in

@@ -21,6 +21,8 @@ import ${LIBDIR}/util.sh
 
 show_profile(){
 	prepare_profile "$1"
+	msg2 "pacman_conf: %s" "${pacman_conf}"
+# 	msg2 "mirrors_conf: %s" "${mirrors_conf}"
 	if ${verbose};then
 		msg2 "work_dir: %s" "${work_dir}"
 		msg2 "iso_dir: %s" "${iso_dir}"
@@ -61,13 +63,11 @@ display_settings(){
 	show_config
 
 	msg "PROFILE:"
-	msg2 "sets_dir_iso: %s" "${sets_dir_iso}"
-	msg2 "buildsets: %s" "$(list_sets ${sets_dir_iso})"
-	msg2 "buildset_iso: %s" "${buildset_iso}"
-	msg2 "is_buildset: %s" "${is_buildset}"
-	${verbose} && msg2 "run_dir: %s" "${run_dir}"
-	${verbose} && msg2 "log_dir: %s" "${log_dir}"
-	msg2 "pacman_conf: %s" "${pacman_conf}"
+	msg2 "list_dir_iso: %s" "${list_dir_iso}"
+	msg2 "build_lists: %s" "$(show_build_lists ${list_dir_iso})"
+	msg2 "build_list_iso: %s" "${build_list_iso}"
+	msg2 "is_build_list: %s" "${is_build_list}"
+	msg2 "build_mirror: %s" "${build_mirror}/${target_branch}"
 
 	msg "OPTIONS:"
 	msg2 "arch: %s" "${target_arch}"
@@ -82,6 +82,12 @@ display_settings(){
 	msg2 "iso_only: %s" "${iso_only}"
 	msg2 "sign: %s" "${sign}"
 
+	if ${verbose}; then
+		msg "PATHS:"
+		msg2 "run_dir: %s" "${run_dir}"
+		msg2 "log_dir: %s" "${log_dir}"
+	fi
+
 	msg "DIST SETTINGS:"
 	msg2 "dist_name: %s" "${dist_name}"
 	msg2 "dist_release: %s" "${dist_release}"
@@ -97,7 +103,7 @@ display_settings(){
 	${verbose} && msg2 "iso_fs: %s" "${iso_fs}"
 
 	msg "BUILD QUEUE:"
-	run show_profile "${buildset_iso}"
+	run show_profile "${build_list_iso}"
 }
 
 load_user_info
@@ -117,11 +123,9 @@ iso_only=false
 verbose=false
 sign=false
 
-pacman_conf_arch='default'
-
 usage() {
 	echo "Usage: ${0##*/} [options]"
-	echo "    -p <profile>       Buildset or profile [default: ${buildset_iso}]"
+	echo "    -p <profile>       Buildset or profile [default: ${build_list_iso}]"
 	echo "    -a <arch>          Arch [default: ${target_arch}]"
 	echo "    -b <branch>        Branch [default: ${target_branch}]"
 	echo '    -r <dir>           Chroots directory'
@@ -151,7 +155,7 @@ opts='p:a:b:r:t:k:i:czxsvqh'
 
 while getopts "${opts}" arg; do
 	case "${arg}" in
-		p) buildset_iso="$OPTARG" ;;
+		p) build_list_iso="$OPTARG" ;;
 		a) target_arch="$OPTARG" ;;
 		b) target_branch="$OPTARG" ;;
 		r) chroots_iso="$OPTARG" ;;
@@ -173,13 +177,9 @@ shift $(($OPTIND - 1))
 
 timer_start=$(get_timer)
 
-[[ "${target_arch}" == 'x86_64' ]] && pacman_conf_arch='multilib'
-
-mirrors_conf="${DATADIR}/pacman-mirrors-${target_branch}.conf"
-
 check_root "$0" "${orig_argv[@]}"
 
-eval_buildset "${sets_dir_iso}" "${buildset_iso}"
+eval_build_list "${list_dir_iso}" "${build_list_iso}"
 
 import ${LIBDIR}/util-iso.sh
 
@@ -187,4 +187,4 @@ check_requirements
 
 ${pretend} && display_settings && exit 1
 
-run build "${buildset_iso}"
+run build "${build_list_iso}"

bin/buildpkg.in

@@ -23,6 +23,7 @@ import ${LIBDIR}/util.sh
 import ${LIBDIR}/util-pkg.sh
 
 show_pkg(){
+	check_build "$1"
 	cd $1
 		source PKGBUILD
 		for n in ${pkgname[@]}; do
@@ -36,16 +37,20 @@ display_settings(){
 	show_config
 
 	msg "PROFILE:"
-	msg2 "sets_dir_pkg: %s" "${sets_dir_pkg}"
-	msg2 "buildsets: %s" "$(list_sets ${sets_dir_pkg})"
-	msg2 "buildset_pkg: %s" "${buildset_pkg}"
-	msg2 "is_buildset: %s" "${is_buildset}"
+	msg2 "list_dir_pkg: %s" "${list_dir_pkg}"
+	msg2 "build_lists: %s" "$(show_build_lists ${list_dir_pkg})"
+	msg2 "build_list_pkg: %s" "${build_list_pkg}"
+	msg2 "is_build_list: %s" "${is_build_list}"
+	msg2 "build_mirror: %s" "${build_mirror}/${target_branch}"
+# 	msg2 "make_conf_dir: %s" "${make_conf_dir}"
+# 	msg2 "build_profiles: %s" "$(show_build_profiles ${make_conf_dir})"
 
 	msg "OPTIONS:"
 	msg2 "arch: %s" "${target_arch}"
 	msg2 "branch: %s" "${target_branch}"
 	msg2 "chroots_pkg: %s" "${chroots_pkg}"
 
+
 	msg "ARGS:"
 	msg2 "clean_first: %s" "${clean_first}"
 	msg2 "wipe_clean: %s" "${wipe_clean}"
@@ -57,9 +62,9 @@ display_settings(){
 	msg "PATHS:"
 	msg2 "work_dir: %s" "${work_dir}"
 	msg2 "pkg_dir: %s" "${pkg_dir}"
-	msg2 "build_mirror: %s" "${build_mirror}/${target_branch}"
-	msg2 "pacman_conf: %s" "${pacman_conf}"
-	msg2 "makepkg_conf: %s" "${makepkg_conf}"
+# 	msg2 "mirrors_conf: %s" "${mirrors_conf}"
+# 	msg2 "pacman_conf: %s" "${pacman_conf}"
+# 	msg2 "makepkg_conf: %s" "${makepkg_conf}"
 
 	if ${clean_first};then
 		msg "PKG:"
@@ -67,7 +72,7 @@ display_settings(){
 	fi
 
 	msg "BUILD QUEUE:"
-	run show_pkg "${buildset_pkg}"
+	run show_pkg "${build_list_pkg}"
 }
 
 load_user_info
@@ -84,13 +89,14 @@ clean_first=false
 wipe_clean=false
 namcap=false
 pretend=false
-is_buildset=false
+is_build_list=false
 sign=false
 udev_root=false
+is_multilib=false
 
 usage() {
 	echo "Usage: ${0##*/} [options]"
-	echo "    -p <pkg>           Buildset or pkg [default: ${buildset_pkg}]"
+	echo "    -p <pkg>           Build list or pkg [default: ${build_list_pkg}]"
 	echo "    -a <arch>          Arch [default: ${target_arch}]"
 	echo "    -b <branch>        Branch [default: ${target_branch}]"
 	echo '    -r <dir>           Chroots directory'
@@ -114,12 +120,12 @@ opts='p:a:b:r:i:cwnsuqh'
 
 while getopts "${opts}" arg; do
 	case "${arg}" in
-		p) buildset_pkg="$OPTARG" ;;
+		p) build_list_pkg="$OPTARG" ;;
 		a) target_arch="$OPTARG" ;;
 		b) target_branch="$OPTARG" ;;
 		r) chroots_pkg="$OPTARG" ;;
 		i) install_pkgs+="$OPTARG"; mkchrootpkg_args+=(-I ${install_pkgs[*]}) ;;
-		c) clean_first=true; mkchroot_args+=(-L) ;;
+		c) clean_first=true ;;
 		w) wipe_clean=true ;;
 		n) namcap=true; mkchrootpkg_args+=(-n) ;;
 		s) sign=true ;;
@@ -130,17 +136,19 @@ while getopts "${opts}" arg; do
 	esac
 done
 
-configure_chroot_arch "${target_arch}"
+check_root "$0" "${orig_argv[@]}"
+
+prepare_conf "${target_arch}"
+
+mirrors_conf=$(get_pac_mirrors_conf "${target_branch}")
 
 mkchroot_args+=(-C ${pacman_conf} -M ${makepkg_conf} -S ${mirrors_conf} -B "${build_mirror}/${target_branch}")
 
 mkchrootpkg_args+=(-r ${work_dir})
 
-check_root "$0" "${orig_argv[@]}"
-
 timer_start=$(get_timer)
 
-eval_buildset "${sets_dir_pkg}" "${buildset_pkg}"
+eval_build_list "${list_dir_pkg}" "${build_list_pkg}"
 
 prepare_dir "${pkg_dir}"
 
@@ -152,4 +160,4 @@ ${wipe_clean} && clean_up
 
 chroot_init
 
-run make_pkg "${buildset_pkg}"
+run make_pkg "${build_list_pkg}"

bin/deployiso.in

@@ -31,10 +31,10 @@ display_settings(){
 	show_config
 
 	msg "PROFILE:"
-	msg2 "sets_dir_iso: %s" "${sets_dir_iso}"
-	msg2 "buildsets: %s" "$(list_sets ${sets_dir_iso})"
-	msg2 "buildset_iso: %s" "${buildset_iso}"
-	msg2 "is_buildset: %s" "${is_buildset}"
+	msg2 "list_dir_iso: %s" "${list_dir_iso}"
+	msg2 "build_lists: %s" "$(show_build_lists ${list_dir_iso})"
+	msg2 "build_list_iso: %s" "${build_list_iso}"
+	msg2 "is_build_list: %s" "${is_build_list}"
 
 	msg "OPTIONS:"
 	msg2 "arch: %s" "${target_arch}"
@@ -62,7 +62,7 @@ display_settings(){
 		msg2 "piece_size: %s" "${piece_size}"
 	fi
 	msg "UPLOAD QUEUE:"
-	run show_profile "${buildset_iso}"
+	run show_profile "${build_list_iso}"
 }
 
 load_user_info
@@ -83,7 +83,7 @@ mktorrent_args=(-v -p)
 
 usage() {
 	echo "Usage: ${0##*/} [options]"
-	echo "    -p                 Source folder to upload [default:${buildset_iso}]"
+	echo "    -p                 Source folder to upload [default:${build_list_iso}]"
 	echo "    -a                 Arch to upload [default:${target_arch}]"
 	echo "    -i                 The iso's init system [default:${initsys}]"
 	echo "    -l                 Limit bandwidth in kB/s [default:${limit}]"
@@ -102,7 +102,7 @@ opts='p:a:l:i:ctuvqh'
 
 while getopts "${opts}" arg; do
 	case "${arg}" in
-                p) buildset_iso="$OPTARG" ;;
+                p) build_list_iso="$OPTARG" ;;
                 a) target_arch="$OPTARG" ;;
                 i) initsys="$OPTARG" ;;
                 l) limit="$OPTARG" ;;
@@ -120,7 +120,7 @@ shift $(($OPTIND - 1))
 
 timer_start=$(get_timer)
 
-eval_buildset "${sets_dir_iso}" "${buildset_iso}"
+eval_build_list "${list_dir_iso}" "${build_list_iso}"
 
 rsync_args+=(--bwlimit=${limit})
 mktorrent_args+=(-l ${piece_size} -a ${tracker_url})
@@ -130,4 +130,4 @@ shell_url=${remote_user},${remote_project}@shell.${remote_url}
 
 ${pretend} && display_settings && exit 1
 
-run sync_dir "${buildset_iso}"
+run sync_dir "${build_list_iso}"

bin/mkchrootpkg.in

@@ -197,8 +197,6 @@ prepare_chroot() {
 	printf >>"$copydir/etc/group"  'builduser:x:%d:\n' $builduser_gid
 	printf >>"$copydir/etc/passwd" 'builduser:x:%d:%d:builduser:/build:/bin/bash\n' $builduser_uid $builduser_gid
 
-	info "copydir: %s" "$copydir"
-
 	$install -d "$copydir"/{build,build/.gnupg,startdir,{pkg,srcpkg,src,log}dest}
 
 	for x in .gnupg/pubring.{kbx,gpg}; do

bin/signfile.in

@@ -25,5 +25,5 @@ if [ ! -e "$1" ]; then
 	exit 1
 fi
 
-msg2 "Signing %s with key %s" "$1" "${GPGKEY}..."
+msg2 "Signing [%s] with key %s" "${1##*/}" "${GPGKEY}..."
 gpg --detach-sign --use-agent -u "${GPGKEY}" "$1"

data/make.conf.d/aarch64.conf

+carch="aarch64"
+chost="aarch64-unknown-linux-gnu"
+cflags="-march=armv8-a -O2 -pipe -fstack-protector --param=ssp-buffer-size=4"

data/make.conf.d/armv6h.conf

+carch="armv6h"
+chost="armv6l-unknown-linux-gnueabihf"
+cflags="-march=armv6 -mfloat-abi=hard -mfpu=vfp -O2 -pipe -fstack-protector --param=ssp-buffer-size=4"

data/make.conf.d/armv7h.conf

+carch="armv7h"
+chost="armv7l-unknown-linux-gnueabihf"
+cflags="-march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -O2 -pipe -fstack-protector --param=ssp-buffer-size=4"

data/make.conf.d/i686.conf

+carch="i686"
+chost="i686-pc-linux-gnu"
+cflags="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong"

data/make.conf.d/multilib.conf

+carch="x86_64"
+chost="x86_64-pc-linux-gnu"
+cflags="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong"

data/make.conf.d/x86_64.conf

+carch="x86_64"
+chost="x86_64-pc-linux-gnu"
+cflags="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong"

data/makepkg-i686.conf

-#
-# /etc/makepkg.conf
-#
-
-#########################################################################
-# SOURCE ACQUISITION
-#########################################################################
-#
-#-- The download utilities that makepkg should use to acquire sources
-#  Format: 'protocol::agent'
-DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
-          'http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
-          'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
-          'rsync::/usr/bin/rsync --no-motd -z %u %o'
-          'scp::/usr/bin/scp -C %u %o')
-
-# Other common tools:
-# /usr/bin/snarf
-# /usr/bin/lftpget -c
-# /usr/bin/wget
-
-#-- The package required by makepkg to download VCS sources
-# Format: 'protocol::package'
-VCSCLIENTS=('bzr::bzr'
-	    'git::git'
-	    'hg::mercurial'
-	    'svn::subversion')
-
-
-#########################################################################
-# ARCHITECTURE, COMPILE FLAGS
-#########################################################################
-#
-CARCH="i686"
-CHOST="i686-pc-linux-gnu"
-
-#-- Compiler and Linker Flags
-# -march (or -mcpu) builds exclusively for an architecture
-# -mtune optimizes for an architecture, but builds for whole processor family
-CPPFLAGS="-D_FORTIFY_SOURCE=2"
-CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong"
-CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong"
-LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro"
-#-- Make Flags: change this for DistCC/SMP systems
-#MAKEFLAGS="-j2"
-#-- Debugging flags
-DEBUG_CFLAGS="-g -fvar-tracking-assignments"
-DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
-
-#########################################################################
-# BUILD ENVIRONMENT
-#########################################################################
-#
-# Defaults: BUILDENV=(fakeroot !distcc color !ccache check !sign)
-#  A negated environment option will do the opposite of the comments below.
-#
-#-- fakeroot: Allow building packages as a non-root user
-#-- distcc:   Use the Distributed C/C++/ObjC compiler
-#-- color:    Colorize output messages
-#-- ccache:   Use ccache to cache compilation
-#-- check:    Run the check() function if present in the PKGBUILD
-#-- sign:     Generate PGP signature file
-#
-BUILDENV=(!distcc color !ccache check !sign)
-#
-#-- If using DistCC, your MAKEFLAGS will also need modification. In addition,
-#-- specify a space-delimited list of hosts running in the DistCC cluster.
-#DISTCC_HOSTS=""
-#
-#-- Specify a directory for package building.
-#BUILDDIR=/tmp/makepkg
-
-#########################################################################
-# GLOBAL PACKAGE OPTIONS
-#   These are default values for the options=() settings
-#########################################################################
-#
-# Default: OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !optipng !upx !debug)
-#  A negated option will do the opposite of the comments below.
-#
-#-- strip:      Strip symbols from binaries/libraries
-#-- docs:       Save doc directories specified by DOC_DIRS
-#-- libtool:    Leave libtool (.la) files in packages
-#-- staticlibs: Leave static library (.a) files in packages
-#-- emptydirs:  Leave empty directories in packages
-#-- zipman:     Compress manual (man and info) pages in MAN_DIRS with gzip
-#-- purge:      Remove files specified by PURGE_TARGETS
-#-- upx:        Compress binary executable files using UPX
-#-- debug:      Add debugging flags as specified in DEBUG_* variables
-#
-OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !optipng !upx !debug)
-
-#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
-INTEGRITY_CHECK=(md5)
-#-- Options to be used when stripping binaries. See `man strip' for details.
-STRIP_BINARIES="--strip-all"
-#-- Options to be used when stripping shared libraries. See `man strip' for details.
-STRIP_SHARED="--strip-unneeded"
-#-- Options to be used when stripping static libraries. See `man strip' for details.
-STRIP_STATIC="--strip-debug"
-#-- Manual (man and info) directories to compress (if zipman is specified)
-MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info})
-#-- Doc directories to remove (if !docs is specified)
-DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
-#-- Files to be removed from all packages (if purge is specified)
-PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
-
-#########################################################################
-# PACKAGE OUTPUT
-#########################################################################
-#
-# Default: put built package and cached source in build directory
-#
-#-- Destination: specify a fixed directory where all packages will be placed
-#PKGDEST=/home/packages
-#-- Source cache: specify a fixed directory where source files will be cached
-#SRCDEST=/home/sources
-#-- Source packages: specify a fixed directory where all src packages will be placed
-#SRCPKGDEST=/home/srcpackages
-#-- Log files: specify a fixed directory where all log files will be placed
-#LOGDEST=/home/makepkglogs
-#-- Packager: name/email of the person or organization building packages
-#PACKAGER="John Doe <john@doe.com>"
-#-- Specify a key to use for package signing
-#GPGKEY=""
-
-#########################################################################
-# COMPRESSION DEFAULTS
-#########################################################################
-#
-COMPRESSGZ=(gzip -c -f -n)
-COMPRESSBZ2=(bzip2 -c -f)
-COMPRESSXZ=(xz -c -z -)
-COMPRESSLRZ=(lrzip -q)
-COMPRESSLZO=(lzop -q)
-COMPRESSZ=(compress -c -f)
-
-#########################################################################
-# EXTENSION DEFAULTS
-#########################################################################
-#
-# WARNING: Do NOT modify these variables unless you know what you are
-#          doing.
-#
-PKGEXT='.pkg.tar.xz'
-SRCEXT='.src.tar.gz'
-
-# vim: set ft=sh ts=2 sw=2 et:

data/makepkg-x86_64.conf

-#
-# /etc/makepkg.conf
-#
-
-#########################################################################
-# SOURCE ACQUISITION
-#########################################################################
-#
-#-- The download utilities that makepkg should use to acquire sources
-#  Format: 'protocol::agent'
-DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
-          'http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
-          'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
-          'rsync::/usr/bin/rsync --no-motd -z %u %o'
-          'scp::/usr/bin/scp -C %u %o')
-
-# Other common tools:
-# /usr/bin/snarf
-# /usr/bin/lftpget -c
-# /usr/bin/wget
-
-#-- The package required by makepkg to download VCS sources
-# Format: 'protocol::package'
-VCSCLIENTS=('bzr::bzr'
-	    'git::git'
-	    'hg::mercurial'