summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSébastien Luttringer <seblu@seblu.net>2013-01-02 01:42:44 +0100
committerPierre Schmitz <pierre@archlinux.de>2013-01-20 10:21:31 +0100
commitfb71ad1e7fe24edcc142b8643f311c28073c5c03 (patch)
tree5c1be4892c7fd3927a35179532fa5f4c1305494f
parent828143751b6fed6d02b2857e9273f19b38ed4a8a (diff)
downloaddevtools-fb71ad1e7fe24edcc142b8643f311c28073c5c03.tar.xz
Allow makechroot options in archbuild
This will allow, by example, to easily build a package with a custom pkg. staging-x86_64-build -- -cI /var/cache/pacman/pkg/ldoc-1.2.0-1-any.pkg.tar.xz staging-x86_64-build -- -n Signed-off-by: Sébastien Luttringer <seblu@seblu.net> Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
-rw-r--r--archbuild.in16
1 files changed, 12 insertions, 4 deletions
diff --git a/archbuild.in b/archbuild.in
index 10d33b8..44288df 100644
--- a/archbuild.in
+++ b/archbuild.in
@@ -3,6 +3,7 @@
m4_include(lib/common.sh)
base_packages=(base base-devel sudo)
+makechrootpkg_args=(-c -n)
cmd="${0##*/}"
if [[ "${cmd%%-*}" == 'multilib' ]]; then
@@ -18,13 +19,17 @@ chroots='/var/lib/archbuild'
clean_first=false
usage() {
- echo "Usage: $cmd"
+ echo "Usage: $cmd [options] -- [makechrootpkg args]"
+ echo ' -h This help'
echo ' -c Recreate the chroot before building'
echo ' -r <dir> Create chroots in this directory'
+ echo ''
+ echo "Default makechrootpkg args: ${makechrootpkg_args[*]}"
+ echo ''
exit 1
}
-while getopts 'cr:' arg; do
+while getopts 'hcr:' arg; do
case "${arg}" in
c) clean_first=true ;;
r) chroots="$OPTARG" ;;
@@ -32,7 +37,10 @@ while getopts 'cr:' arg; do
esac
done
-if [[ "$EUID" != '0' ]]; then
+# Pass all arguments after -- right to makepkg
+makechrootpkg_args=("${@:$OPTIND}")
+
+if (( EUID )); then
die 'This script must be run as root.'
fi
@@ -71,4 +79,4 @@ else
fi
msg "Building in chroot for [${repo}] (${arch})..."
-exec setarch "${arch}" makechrootpkg -c -n -r "${chroots}/${repo}-${arch}"
+exec setarch "${arch}" makechrootpkg "${makechrootpkg_args[@]}" -r "${chroots}/${repo}-${arch}"