From 3491ea5d799479c9ae0da2c2864084146d61a10a Mon Sep 17 00:00:00 2001
From: Jan Steffens <jan.steffens@gmail.com>
Date: Sat, 12 Mar 2011 15:16:31 +0100
Subject: Syntax cleanup

No functional change.
---
 archbuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'archbuild')

diff --git a/archbuild b/archbuild
index fc2ec34..3435be5 100755
--- a/archbuild
+++ b/archbuild
@@ -4,8 +4,8 @@ base_packages='base base-devel sudo'
 
 cmd="$(basename "${0%-build}")"
 if [ "${cmd%-*}" == 'multilib' ]; then
-        repo="${cmd}"
-        arch='x86_64'
+	repo="${cmd}"
+	arch='x86_64'
 	base_packages+=' gcc-multilib libtool-multilib'
 else
 	repo=${cmd%-*}
-- 
cgit v1.2.3-70-g09d2


From 96f22cfededae216e127e6fb1d616d003cd8d978 Mon Sep 17 00:00:00 2001
From: Jan Steffens <jan.steffens@gmail.com>
Date: Sun, 13 Mar 2011 20:29:13 +0100
Subject: Use the multilib-devel group

---
 archbuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'archbuild')

diff --git a/archbuild b/archbuild
index 3435be5..8d75e77 100755
--- a/archbuild
+++ b/archbuild
@@ -6,7 +6,7 @@ cmd="$(basename "${0%-build}")"
 if [ "${cmd%-*}" == 'multilib' ]; then
 	repo="${cmd}"
 	arch='x86_64'
-	base_packages+=' gcc-multilib libtool-multilib'
+	base_packages+=' multilib-devel'
 else
 	repo=${cmd%-*}
 	arch=${cmd##*-}
-- 
cgit v1.2.3-70-g09d2


From 5434d3991cd51873f987bde49d55948341c09f3e Mon Sep 17 00:00:00 2001
From: Jan Steffens <jan.steffens@gmail.com>
Date: Sun, 13 Mar 2011 18:09:52 +0100
Subject: Remove sudo from archbuild

Archbuild should be called via sudo.
---
 archbuild | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'archbuild')

diff --git a/archbuild b/archbuild
index 8d75e77..7e8c456 100755
--- a/archbuild
+++ b/archbuild
@@ -29,20 +29,25 @@ while getopts 'cr:' arg; do
 	esac
 done
 
+if [ "$EUID" != '0' ]; then
+	echo 'This script must be run as root.'
+	exit 1
+fi
+
 if ${clean_first} || [ ! -d "${chroots}/${repo}-${arch}" ]; then
 	echo "Creating chroot for [${repo}] (${arch})..."
-	sudo rm -rf ${chroots}/${repo}-${arch}
-	sudo mkdir -p ${chroots}/${repo}-${arch}
-	setarch ${arch} sudo mkarchroot \
+	rm -rf ${chroots}/${repo}-${arch}
+	mkdir -p ${chroots}/${repo}-${arch}
+	setarch ${arch} mkarchroot \
 		-C /usr/share/devtools/pacman-${repo}.conf \
 		-M /usr/share/devtools/makepkg-${arch}.conf \
 		${chroots}/${repo}-${arch}/root \
 		${base_packages}
 else
-	setarch ${arch} sudo mkarchroot \
+	setarch ${arch} mkarchroot \
 		-u \
 		${chroots}/${repo}-${arch}/root
 fi
 
 echo "Building in chroot for [${repo}] (${arch})..."
-setarch ${arch} sudo makechrootpkg -c -r ${chroots}/${repo}-${arch}
+setarch ${arch} makechrootpkg -c -r ${chroots}/${repo}-${arch}
-- 
cgit v1.2.3-70-g09d2


From 174ff59dba8c24f544e354cd43f3b68aea91d265 Mon Sep 17 00:00:00 2001
From: Jan Steffens <jan.steffens@gmail.com>
Date: Sun, 13 Mar 2011 19:06:27 +0100
Subject: Add flock-based locking to chroots

This prevents accidents when chroots are shared between multiple users.
---
 archbuild     | 13 +++++++++++++
 makechrootpkg | 23 +++++++++++++++++++++++
 mkarchroot    | 16 ++++++++++++++++
 3 files changed, 52 insertions(+)

(limited to 'archbuild')

diff --git a/archbuild b/archbuild
index 7e8c456..9dd4888 100755
--- a/archbuild
+++ b/archbuild
@@ -36,6 +36,19 @@ fi
 
 if ${clean_first} || [ ! -d "${chroots}/${repo}-${arch}" ]; then
 	echo "Creating chroot for [${repo}] (${arch})..."
+
+	for copy in ${chroots}/${repo}-${arch}/*; do
+		[[ -d $copy ]] || continue
+		echo "Deleting chroot copy '$(basename "${copy}")'..."
+
+		# Lock the copy
+		exec 9>${copy}.lock
+		flock 9
+
+		rm -rf ${copy}
+	done
+	exec 9>&-
+
 	rm -rf ${chroots}/${repo}-${arch}
 	mkdir -p ${chroots}/${repo}-${arch}
 	setarch ${arch} mkarchroot \
diff --git a/makechrootpkg b/makechrootpkg
index a38a740..1f6f20a 100755
--- a/makechrootpkg
+++ b/makechrootpkg
@@ -105,11 +105,34 @@ if [ ! -d "$chrootdir/root" ]; then
 fi
 
 umask 0022
+
+# Lock the chroot we want to use. We'll keep this lock until we exit.
+# Note this is the same FD number as in mkarchroot
+exec 9>"$copydir.lock"
+if ! flock -n 9; then
+	echo -n "locking chroot copy '$copy'..."
+	flock 9
+	echo "done"
+fi
+
 if [ ! -d "$copydir" -o "$clean_first" -eq "1" ]; then
+	# Get a read lock on the root chroot to make
+	# sure we don't clone a half-updated chroot
+	exec 8>"$chrootdir/root.lock"
+
+	if ! flock -sn 8; then
+		echo -n "locking clean chroot..."
+		flock -s 8
+		echo "done"
+	fi
+
 	echo -n 'creating clean working copy...'
 	mkdir -p "$copydir"
 	rsync -a --delete -q -W -x "$chrootdir/root/" "$copydir"
 	echo 'done'
+
+	# Drop the read lock again
+	exec 8>&-
 fi
 
 if [ -n "$install_pkg" ]; then
diff --git a/mkarchroot b/mkarchroot
index 254841e..5c6548e 100755
--- a/mkarchroot
+++ b/mkarchroot
@@ -141,6 +141,20 @@ chroot_umount () {
 	umount "${working_dir}/${cache_dir}"
 	[ -n "${host_mirror_path}" ] && umount "${working_dir}/${host_mirror_path}"
 }
+
+chroot_lock () {
+	# Only reopen the FD if it wasn't handed to us
+	if [ "$(readlink -f /dev/fd/9)" != "${working_dir}.lock" ]; then
+	  exec 9>"${working_dir}.lock"
+	fi
+
+	# Lock the chroot. Take note of the FD number.
+	if ! flock -n 9; then
+		echo -n "locking chroot..."
+		flock 9
+		echo "done"
+	fi
+}
 # }}}
 
 umask 0022
@@ -153,6 +167,7 @@ if [ "$RUN" != "" ]; then
 		exit 1
 	fi
 
+	chroot_lock
 	chroot_mount
 	copy_hostconf
 
@@ -169,6 +184,7 @@ else
 	mkdir -p "${working_dir}/var/lib/pacman/sync"
 	mkdir -p "${working_dir}/etc/"
 
+	chroot_lock
 	chroot_mount
 
 	pacargs="--noconfirm --root=${working_dir} --cachedir=${cache_dir}"
-- 
cgit v1.2.3-70-g09d2


From 0af05a48abb1d35380f4f4259deb163eb3b7b174 Mon Sep 17 00:00:00 2001
From: Jan Steffens <jan.steffens@gmail.com>
Date: Sun, 13 Mar 2011 15:19:20 +0100
Subject: Use Btrfs snapshots for chroot copies, when available

This is much faster than using Rsync to clone.

Rsync stays available when the chroots are not on a Btrfs.
---
 archbuild     |  1 +
 makechrootpkg | 14 ++++++++++++--
 mkarchroot    |  4 ++++
 3 files changed, 17 insertions(+), 2 deletions(-)

(limited to 'archbuild')

diff --git a/archbuild b/archbuild
index 9dd4888..19b734b 100755
--- a/archbuild
+++ b/archbuild
@@ -45,6 +45,7 @@ if ${clean_first} || [ ! -d "${chroots}/${repo}-${arch}" ]; then
 		exec 9>${copy}.lock
 		flock 9
 
+		{ type -P btrfs && btrfs subvolume delete ${copy}; } &>/dev/null
 		rm -rf ${copy}
 	done
 	exec 9>&-
diff --git a/makechrootpkg b/makechrootpkg
index 1f6f20a..5bf492f 100755
--- a/makechrootpkg
+++ b/makechrootpkg
@@ -127,8 +127,18 @@ if [ ! -d "$copydir" -o "$clean_first" -eq "1" ]; then
 	fi
 
 	echo -n 'creating clean working copy...'
-	mkdir -p "$copydir"
-	rsync -a --delete -q -W -x "$chrootdir/root/" "$copydir"
+	use_rsync=false
+	if type -P btrfs >/dev/null; then
+		[ -d $copydir ] && btrfs subvolume delete "$copydir" &>/dev/null
+		btrfs subvolume snapshot "$chrootdir/root" "$copydir" &>/dev/null || use_rsync=true
+	else
+		use_rsync=true
+	fi
+
+	if $use_rsync; then
+		mkdir -p "$copydir"
+		rsync -a --delete -q -W -x "$chrootdir/root/" "$copydir"
+	fi
 	echo 'done'
 
 	# Drop the read lock again
diff --git a/mkarchroot b/mkarchroot
index 5c6548e..f385731 100755
--- a/mkarchroot
+++ b/mkarchroot
@@ -181,6 +181,10 @@ else
 		exit 1
 	fi
 
+	if { type -P btrfs && btrfs subvolume create "${working_dir}"; } &>/dev/null; then
+		chmod 0755 "${working_dir}"
+	fi
+
 	mkdir -p "${working_dir}/var/lib/pacman/sync"
 	mkdir -p "${working_dir}/etc/"
 
-- 
cgit v1.2.3-70-g09d2