mkarchroot: pass inline shell script to chroot

In reference to FS#22304 run pacman -Su again if there are still updates available.
This is the case for packages listed in SyncFirst.

Makefile

@@ -1,4 +1,4 @@
-V=0.9.12
+V=0.9.16
 
 all:
 

archbuild

@@ -9,7 +9,7 @@ if [ "${cmd%-*}" == 'multilib' ]; then
 	base_packages+=' gcc-multilib libtool-multilib'
 else
 	repo=${cmd%-*}
-	arch=${cmd#*-}
+	arch=${cmd##*-}
 fi
 chroots='/var/tmp/archbuild'
 clean_first=false
@@ -38,7 +38,11 @@ if ${clean_first} || [ ! -d "${chroots}/${repo}-${arch}" ]; then
 		-M /usr/share/devtools/makepkg-${arch}.conf \
 		${chroots}/${repo}-${arch}/root \
 		${base_packages}
+else
+	setarch ${arch} sudo mkarchroot \
+		-u \
+		${chroots}/${repo}-${arch}/root
 fi
 
 echo "Building in chroot for [${repo}] (${arch})..."
-setarch ${arch} sudo makechrootpkg -c -u -r ${chroots}/${repo}-${arch}
+setarch ${arch} sudo makechrootpkg -c -r ${chroots}/${repo}-${arch}

archrelease

@@ -13,7 +13,9 @@ if [ ! -f PKGBUILD ]; then
 	abort 'archrelease: PKGBUILD not found'
 fi
 
-if [ "$(basename $(readlink -f .))" != 'trunk' ]; then
+trunk=$(basename $(pwd))
+
+if [ "$(basename $(dirname $(pwd)))" == "repos" ]; then
 	abort 'archrelease: Not in a package trunk dir'
 fi
 
@@ -27,7 +29,7 @@ if [ -d "repos/${1}" ]; then
 	svn rm --force -q "repos/${1}"
 	svn commit -q -m "archrelease: remove ${1}" || abort
 fi
-svn copy -q -r HEAD trunk "repos/${1}"
+svn copy -q -r HEAD "${trunk}" "repos/${1}"
-svn commit -q -m "archrelease: copy trunk to ${1}" || abort
+svn commit -q -m "archrelease: copy ${trunk} to ${1}" || abort
 popd >/dev/null
 echo 'done'

checkpkg

@@ -82,11 +82,11 @@ for _pkgname in ${pkgname[@]}; do
 
 	diff -u filelist-$_pkgname-old filelist-$_pkgname
 
-	if diff filelist-$_pkgname-old filelist-$_pkgname | grep '\.so\.' > /dev/null 2>&1; then
+	if diff filelist-$_pkgname-old filelist-$_pkgname | grep '\.so' > /dev/null 2>&1; then
 		mkdir -p pkg
 		cd pkg
 		bsdtar xf ../"$pkgfile" > /dev/null
-		for i in `diff ../filelist-$_pkgname-old ../filelist-$_pkgname | grep \> | grep \.so\. | awk '{print $2}'`; do
+		for i in `diff ../filelist-$_pkgname-old ../filelist-$_pkgname | grep \> | grep \.so | awk '{print $2}'`; do
 			echo -n "${i}: "
 			objdump -p $i | grep SONAME
 		done

makechrootpkg

@@ -196,11 +196,8 @@ chown -R nobody "$copydir/build"
 chown -R nobody "$copydir/srcdest"
 chown -R nobody "$copydir/pkgdest"
 
-if ! grep "^nobody" "$copydir/etc/sudoers" >/dev/null 2>&1; then
+echo 'nobody ALL = NOPASSWD: /usr/bin/pacman' > "$copydir/etc/sudoers.d/nobody-pacman"
-	touch "$copydir/etc/sudoers"
+chmod 440 "$copydir/etc/sudoers.d/nobody-pacman"
-	echo 'nobody	ALL=(ALL) NOPASSWD: ALL' >> "$copydir/etc/sudoers"
-	chmod 440 "$copydir/etc/sudoers"
-fi
 
 #This is a little gross, but this way the script is recreated every time in the
 #working copy
@@ -256,6 +253,4 @@ if [ -e "${copydir}/build/BUILD_FAILED" ]; then
 	echo "Build failed, check $copydir/build"
 	rm "${copydir}/build/BUILD_FAILED"
 	exit 1
-else
-	rm -rf "${copydir}"/build/*
 fi

mkarchroot

@@ -34,7 +34,7 @@ usage() {
 while getopts 'r:ufnhC:M:c:' arg; do
 	case "${arg}" in
 		r) RUN="$OPTARG" ;;
-		u) RUN='pacman -Syu --noconfirm' ;;
+		u) RUN='/bin/sh -c "pacman -Syu --noconfirm; pacman -Qqu >/dev/null && pacman -Su --noconfirm"' ;;
 		f) FORCE='y' ;;
 		C) pac_conf="$OPTARG" ;;
 		M) makepkg_conf="$OPTARG" ;;
@@ -92,13 +92,27 @@ chroot_mount() {
 	mount -t proc proc "${working_dir}/proc"
 
 	[ -e "${working_dir}/dev" ] || mkdir "${working_dir}/dev"
-	mount -o bind /dev "${working_dir}/dev"
+	mount -t tmpfs dev "${working_dir}/dev" -o mode=0755,size=10M,nosuid
+	mknod -m 666 "${working_dir}/dev/null" c 1 3
+	mknod -m 666 "${working_dir}/dev/zero" c 1 5
+	mknod -m 600 "${working_dir}/dev/console" c 5 1
+	mknod -m 644 "${working_dir}/dev/random" c 1 8
+	mknod -m 644 "${working_dir}/dev/urandom" c 1 9
+	mknod -m 666 "${working_dir}/dev/tty" c 5 0
+	mknod -m 666 "${working_dir}/dev/tty0" c 4 0
+	mknod -m 666 "${working_dir}/dev/full" c 1 7
+	ln -s /proc/kcore "${working_dir}/dev/core"
+	ln -s /proc/self/fd "${working_dir}/dev/fd"
+	ln -s /proc/self/fd/0 "${working_dir}/dev/stdin"
+	ln -s /proc/self/fd/1 "${working_dir}/dev/stdout"
+	ln -s /proc/self/fd/2 "${working_dir}/dev/stderr"
 
 	[ -e "${working_dir}/dev/shm" ] || mkdir "${working_dir}/dev/shm"
-	mount -t tmpfs shm "${working_dir}/dev/shm"
+	mount -t tmpfs shm "${working_dir}/dev/shm" -o nodev,nosuid,size=128M
 
 	[ -e "${working_dir}/dev/pts" ] || mkdir "${working_dir}/dev/pts"
-	mount -t devpts devpts "${working_dir}/dev/pts"
+	mount -t devpts devpts "${working_dir}/dev/pts" -o newinstance,ptmxmode=666
+	ln -s pts/ptmx "${working_dir}/dev/ptmx"
 
 	[ -e "${cache_dir}" ] || mkdir -p "${cache_dir}"
 	[ -e "${working_dir}/${cache_dir}" ] || mkdir -p "${working_dir}/${cache_dir}"
@@ -110,7 +124,7 @@ chroot_mount() {
 		mount -o remount,ro,bind "${host_mirror_path}" "${working_dir}/${host_mirror_path}"
 	fi
 
-	trap 'chroot_umount' 0 1 2 15
+	trap 'chroot_umount' EXIT INT QUIT TERM HUP
 }
 
 copy_hostconf () {
@@ -143,7 +157,7 @@ if [ "$RUN" != "" ]; then
 	chroot_mount
 	copy_hostconf
 
-	chroot "${working_dir}" ${RUN}
+	eval chroot "${working_dir}" ${RUN}
 
 	# }}}
 	else