Merge branch 'machine-name' into 'master'

feat(makechrootpkg): use meaningful machine name

See merge request archlinux/devtools!269

src/archbuild.in

@@ -80,7 +80,7 @@ check_root SOURCE_DATE_EPOCH,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAG
 makechrootpkg_args+=("${@:$OPTIND}")
 
 # Automatically recreate the root chroot if a version mismatch is detected
-CURRENT_CHROOT_VERSION=$(cat "${chroots}/${repo}-${arch}/root/.arch-chroot" 2>/dev/null)
+CURRENT_CHROOT_VERSION=$(cat "${chroots}/${repo}-${arch}/root/.arch-chroot")
 if [[ -f "${chroots}/${repo}-${arch}/root/.arch-chroot" ]] && [[ "$CURRENT_CHROOT_VERSION" != "$CHROOT_VERSION" ]]; then
 	warning "Recreating chroot '%s' (%s) as it is not at version %s" "${chroots}/${repo}-${arch}/root" "$CURRENT_CHROOT_VERSION" "$CHROOT_VERSION"
 	clean_first=true

src/commitpkg.in

@@ -155,7 +155,7 @@ if (( ${#needsversioning[*]} )); then
 		if [[ ! -f "${file}" ]]; then
 			continue
 		fi
-		if ! git ls-files --error-unmatch "$file"; then
+		if ! git ls-files --error-unmatch "$file" >/dev/null; then
 			die "%s is not under version control" "$file"
 		fi
 	done

src/lib/license/setup.sh

@@ -191,7 +191,9 @@ path = [
     ".nvchecker.toml",
     "*.install",
     "*.sysusers",
+    "*sysusers.conf",
     "*.tmpfiles",
+    "*tmpfiles.conf",
     "*.logrotate",
     "*.pam",
     "*.service",

src/makechrootpkg.in

@@ -150,7 +150,9 @@ install_packages() {
 	pkgnames=("${install_pkgs[@]##*/}")
 
 	cp -- "${install_pkgs[@]}" "$copydir/root/"
-	arch-nspawn "$copydir" "${bindmounts_ro[@]}" "${bindmounts_rw[@]}" "${bindmounts_tmpfs[@]}" \
+	arch-nspawn "$copydir" \
+		--machine="$(display_name installing "${pkgnames[@]}")" \
+		"${bindmounts_ro[@]}" "${bindmounts_rw[@]}" "${bindmounts_tmpfs[@]}" \
 		pacman -U --noconfirm --ask=4 -- "${pkgnames[@]/#//root/}"
 	ret=$?
 	rm -- "${pkgnames[@]/#/$copydir/root/}"
@@ -291,6 +293,33 @@ move_products() {
 		fi
 	done
 }
+
+# Usage: display_name verb pkgname [pkgname...]
+display_name() {
+	local max_hostname max_pkgnames_length max_pid_digits pkgnames tool verb
+
+	max_hostname=64  # see gethostname(2)
+	num_joiner_chars=3  # see template string below
+	max_pid_digits=7  # ceil(log(2^22, 10))
+
+	tool="${0##*/}"
+	verb="${1?}"
+	shift
+	max_pkgnames_length=$((
+		max_hostname - num_joiner_chars - max_pid_digits - "${#tool}" - "${#verb}"
+	))
+	# Normalize the package name so it doubles as a valid hostname
+	# https://github.com/systemd/systemd/blob/v256/src/basic/hostname-util.c#L83-L136
+	pkgnames="$(
+		tr -s -c 'a-z0-9 ' - <<< "$*" | tr ' ' . | head -c ${max_pkgnames_length}
+	)"
+
+	if [[ $# -eq 0 ]]; then
+		printf '%s.%s.%s' "${tool}" "${verb}" $$
+	else
+		printf '%s.%s.%s.%s' "${tool}" "${verb}" "${pkgnames%%-}" $$
+	fi
+}
 # }}}
 
 while getopts 'hcur:I:l:nCTD:d:U:x:t:' arg; do
@@ -368,6 +397,7 @@ if [[ ! -d $copydir ]] || (( clean_first )); then
 fi
 
 (( update_first )) && arch-nspawn "$copydir" \
+		--machine="$(display_name updating)" \
 		"${bindmounts_ro[@]}" "${bindmounts_rw[@]}" "${bindmounts_tmpfs[@]}" \
 		pacman -Syuu --noconfirm
 
@@ -396,11 +426,19 @@ nspawn_build_args=(
 	"${bindmounts_tmpfs[@]}"
 )
 
+{
+	read -r -d $'\n' pkgbase
+	mapfile -t pkgnames
+} < <(sudo -u "$makepkg_user" bash -c '
+		source PKGBUILD
+		printf "%s\n" "${pkgbase:-${pkgname}}" "${pkgname[@]}"
+')
+
 if arch-nspawn "$copydir" \
 	"${nspawn_build_args[@]}" \
+	--machine="$(display_name building "${pkgbase}")" \
 	/chrootbuild "${makepkg_args[@]}"
 then
-	mapfile -t pkgnames < <(sudo -u "$makepkg_user" bash -c 'source PKGBUILD; printf "%s\n" "${pkgname[@]}"')
 	move_products
 else
 	(( ret += 1 ))
@@ -413,8 +451,11 @@ if [[ $inspect == always ]] || ( [[ $inspect == failure ]] && (( ret != 0 )) );
 	else
 		error "Build failed, inspecting %s" "$copydir"
 	fi
+	# Use a short machine name without dots so the shell picks it up
+	# as part of the window title
 	arch-nspawn "$copydir" \
 		"${nspawn_build_args[@]}" \
+		--machine="inspecting-$$" \
 		--user=builduser \
 		--chdir=/build
 fi
@@ -444,7 +485,9 @@ else
 		for remotepkg in "${remotepkgs[@]}"; do
 			if [[ $remotepkg != file://* ]]; then
 				msg2 "Downloading current versions"
-				arch-nspawn "$copydir" pacman --noconfirm -Swdd "${pkgnames[@]}"
+				arch-nspawn "$copydir" \
+					--machine="$(display_name downloading "${pkgnames[@]}")" \
+					pacman --noconfirm -Swdd "${pkgnames[@]}"
 				mapfile -t remotepkgs < <(pacman --config "$copydir"/etc/pacman.conf \
 					--dbpath "$copydir"/var/lib/pacman \
 					-Sddp "${pkgnames[@]}")