# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1519210519 -7200
# Node ID f2773281e93d2962f277723a494f6e1db659a52b
# Parent  cb2fe4f46a0876d9e578a0edec7ed18612ed6fb9
cook: change chroot mount options to "-o bind", add /dev here; mark "*.so.dbg" as @dev files

diff -r cb2fe4f46a08 -r f2773281e93d cook
--- a/cook	Sun Feb 04 20:42:31 2018 +0000
+++ b/cook	Wed Feb 21 12:55:19 2018 +0200
@@ -1239,20 +1239,21 @@
 	grep -q ^AUFS_NOT_SUPPORTED $receipt && return
 	grep -q ^AUFS_NOT_RAMFS $receipt && base="/mnt/aufsmnt$$"
 	[ -n "$AUFS_MOUNTS" -a ! -f /aufs-umount.sh ] || return
-	grep -q ^aufs /proc/modules || modprobe aufs 2> /dev/null || return
+	grep -q ^aufs /proc/modules || modprobe aufs 2>/dev/null || return
 	mkdir ${base}root ${base}rw || return
 
 	_ 'Setup aufs chroot...'
 
 	# Sanity check
-	for i in / /proc /sys /dev/shm /home ; do
+	for i in / /proc /sys /dev /dev/shm /home; do
 		case " $AUFS_MOUNTS " in
-		*\ $i\ *) ;;
-		*)	AUFS_MOUNTS="$AUFS_MOUNTS $i" ;;
+			*\ $i\ *) ;;
+			*)	AUFS_MOUNTS="$AUFS_MOUNTS $i" ;;
 		esac
 	done
 	for mnt in $(ls -d $AUFS_MOUNTS | sort | uniq); do
-		mount --bind $mnt ${base}root$mnt
+		mkdir -p           ${base}root$mnt	# for `mount -o bind`
+		mount -o bind $mnt ${base}root$mnt	# use `-o bind` instead of `--bind`
 		if [ $mnt == / ] && ! mount -t aufs -o br=${base}rw:/ none ${base}root; then
 			_ 'Aufs mount failure'
 			umount ${base}root
@@ -1463,6 +1464,7 @@
 					/\/fonts\.scale$/d; /\/fonts\.dir$/d;
 					/\/share\/appdata\//d; /\/share\/help\//d;
 					/\/share\/icons\/hicolor\/[12356][1245][268]*x[12356][1245][268]*\//d;	# 22, 24, 32, 64, 128, 256, 512
+					/\.so\.dbg$/d;
 					' $filelist
 				;;
 			@dev)
@@ -1470,6 +1472,7 @@
 				sed -n '/\.h$/p; /\.hxx$/p; /\.a$/p; /\.la$/p; /\.pc$/p; /\.pri$/p; /bin\/.*-config$/p;
 					/\.m4$/p; /\.gir$/p; /\.typelib$/p; /\.vapi$/p; /\.deps$/p; /\.cmake$/p;
 					/\/Makefile.*/p; /\.inc$/p; /\/include\//p;
+					/\.so\.dbg$/p;
 					' $filelist
 				;;
 			@rm)