alarm/devtools-alarm to 20210202-2

alarm/devtools-alarm/0001-makechrootpkg-cache-dir.patch

@@ -1,40 +1,40 @@
-From 3fdb469efec65d8881a861770530b0e9d1f33bca Mon Sep 17 00:00:00 2001
+From 003ca8fea163645d1ef73a601f183dfe30d858f6 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sun, 28 Dec 2014 22:25:58 -0700
-Subject: [PATCH 1/7] makechrootpkg: cache dir
+Subject: [PATCH 1/8] makechrootpkg: cache dir
 
 ---
  makechrootpkg.in | 10 ++++++++--
  1 file changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/makechrootpkg.in b/makechrootpkg.in
-index 2407115..f60d978 100644
+index d308af2..71ee9c0 100644
 --- a/makechrootpkg.in
 +++ b/makechrootpkg.in
-@@ -61,6 +61,7 @@ usage() {
+@@ -64,6 +64,7 @@ usage() {
  	echo 'Flags:'
  	echo '-h         This help'
  	echo '-c         Clean the chroot before building'
-+	echo '-C <dir>   Set pacman cache to pass to arch-nspawn'
++	echo '-X <dir>   Set pacman cache to pass to arch-nspawn'
  	echo '-d <dir>   Bind directory into build chroot as read-write'
  	echo '-D <dir>   Bind directory into build chroot as read-only'
  	echo '-u         Update the working copy of the chroot before building'
-@@ -289,12 +290,13 @@ move_products() {
+@@ -277,12 +278,13 @@ move_products() {
  }
  # }}}
  
--while getopts 'hcur:I:l:nTD:d:U:' arg; do
-+while getopts 'hcuC:r:I:l:nTD:d:U:' arg; do
+-while getopts 'hcur:I:l:nCTD:d:U:' arg; do
++while getopts 'hcuX:r:I:l:nCTD:d:U:' arg; do
  	case "$arg" in
  		c) clean_first=1 ;;
  		D) bindmounts_ro+=("--bind-ro=$OPTARG") ;;
  		d) bindmounts_rw+=("--bind=$OPTARG") ;;
  		u) update_first=1 ;;
-+		C) cache_dir="$OPTARG" ;;
++		X) cache_dir="$OPTARG" ;;
  		r) passeddir="$OPTARG" ;;
  		I) install_pkgs+=("$OPTARG") ;;
  		l) copy="$OPTARG" ;;
-@@ -316,6 +318,10 @@ chrootdir=$(readlink -e "$passeddir")
+@@ -305,6 +307,10 @@ chrootdir=$(readlink -e "$passeddir")
  [[ ! -d $chrootdir ]] && die "No chroot dir defined, or invalid path '%s'" "$passeddir"
  [[ ! -d $chrootdir/root ]] && die "Missing chroot dir root directory. Try using: mkarchroot %s/root base-devel" "$chrootdir"
  
@@ -45,7 +45,7 @@ index 2407115..f60d978 100644
  if [[ ${copy:0:1} = / ]]; then
  	copydir=$copy
  else
-@@ -379,7 +385,7 @@ download_sources
+@@ -364,7 +370,7 @@ download_sources
  
  prepare_chroot
  
@@ -55,5 +55,5 @@ index 2407115..f60d978 100644
  	--bind="${SRCDEST//:/\\:}:/srcdest" \
  	"${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \
 -- 
-2.22.0
+2.30.0
 

alarm/devtools-alarm/0002-arch-nspawn-keep-mirrorlist.patch

@@ -1,25 +1,26 @@
-From 716ebf85d285c0b2bedfa368bcb670b5820eb373 Mon Sep 17 00:00:00 2001
+From 862cf122e47f16c2bdd903df2eeb3e9d4d9e2497 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sun, 28 Dec 2014 22:27:34 -0700
-Subject: [PATCH 2/7] arch-nspawn: keep mirrorlist
+Subject: [PATCH 2/8] arch-nspawn: keep mirrorlist
 
 ---
- arch-nspawn.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ arch-nspawn.in | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/arch-nspawn.in b/arch-nspawn.in
-index 5817143..496fbd4 100644
+index cde1f60..18febda 100644
 --- a/arch-nspawn.in
 +++ b/arch-nspawn.in
-@@ -99,7 +99,7 @@ build_mount_args() {
+@@ -96,8 +96,7 @@ done
  copy_hostconf () {
  	unshare --fork --pid gpg --homedir "$working_dir"/etc/pacman.d/gnupg/ --no-permission-warning --quiet --batch --import --import-options import-local-sigs "$(pacman-conf GpgDir)"/pubring.gpg >/dev/null 2>&1
  	pacman-key --gpgdir "$working_dir"/etc/pacman.d/gnupg/ --import-trustdb "$(pacman-conf GpgDir)" >/dev/null 2>&1
+-
 -	printf 'Server = %s\n' "${host_mirrors[@]}" >"$working_dir/etc/pacman.d/mirrorlist"
 +	#printf 'Server = %s\n' "${host_mirrors[@]}" >"$working_dir/etc/pacman.d/mirrorlist"
  
  	[[ -n $pac_conf ]] && cp "$pac_conf" "$working_dir/etc/pacman.conf"
  	[[ -n $makepkg_conf ]] && cp "$makepkg_conf" "$working_dir/etc/makepkg.conf"
 -- 
-2.22.0
+2.30.0
 

alarm/devtools-alarm/0003-makechrootpkg-distcc.patch

@@ -1,17 +1,17 @@
-From 9ca1e5f1c2fdfa559259166e48a4691dfe8f43f4 Mon Sep 17 00:00:00 2001
+From 27859bef1f1a87cf2d2d1163ee3dc8e906b90abd Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sun, 28 Dec 2014 22:32:15 -0700
-Subject: [PATCH 3/7] makechrootpkg: distcc
+Subject: [PATCH 3/8] makechrootpkg: distcc
 
 ---
  makechrootpkg.in | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/makechrootpkg.in b/makechrootpkg.in
-index f60d978..aa65ae5 100644
+index 71ee9c0..af3cc28 100644
 --- a/makechrootpkg.in
 +++ b/makechrootpkg.in
-@@ -230,7 +230,9 @@ _chrootbuild() {
+@@ -214,7 +214,9 @@ _chrootbuild() {
  	# use "$" in arguments to commands with "sudo -i".  ${foo} or
  	# ${1} is OK, but $foo or $1 isn't.
  	# https://bugzilla.sudo.ws/show_bug.cgi?id=765
@@ -23,5 +23,5 @@ index f60d978..aa65ae5 100644
  	case $ret in
  		0|14)
 -- 
-2.22.0
+2.30.0
 

alarm/devtools-alarm/0004-arch-nspawn-arm-fix.patch

@@ -1,7 +1,7 @@
-From 6f96e7a6100b48cd3a0820d530f9d79a31d26293 Mon Sep 17 00:00:00 2001
+From d9d880448cf065cf5a9ad8649d2ce53f9055e289 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sun, 28 Dec 2014 22:33:00 -0700
-Subject: [PATCH 4/7] arch-nspawn: arm fix
+Subject: [PATCH 4/8] arch-nspawn: arm fix
 
 ---
  arch-nspawn.in   | 2 +-
@@ -9,10 +9,10 @@ Subject: [PATCH 4/7] arch-nspawn: arm fix
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/arch-nspawn.in b/arch-nspawn.in
-index 496fbd4..76c595c 100644
+index 18febda..be9f49a 100644
 --- a/arch-nspawn.in
 +++ b/arch-nspawn.in
-@@ -130,7 +130,7 @@ eval "$(grep -a '^CARCH=' "$working_dir/etc/makepkg.conf")"
+@@ -126,7 +126,7 @@ eval "$(grep -a '^CARCH=' "$working_dir/etc/makepkg.conf")"
  
  [[ -z $nosetarch ]] || unset CARCH
  
@@ -22,10 +22,10 @@ index 496fbd4..76c595c 100644
  	-E "PATH=/usr/local/sbin:/usr/local/bin:/usr/bin" \
  	--register=no --keep-unit --as-pid2 \
 diff --git a/makechrootpkg.in b/makechrootpkg.in
-index aa65ae5..c342d18 100644
+index af3cc28..aeb6d4a 100644
 --- a/makechrootpkg.in
 +++ b/makechrootpkg.in
-@@ -257,7 +257,7 @@ download_sources() {
+@@ -241,7 +241,7 @@ download_sources() {
  	# Ensure sources are downloaded
  	sudo -u "$makepkg_user" --preserve-env=GNUPGHOME \
  		env SRCDEST="$SRCDEST" BUILDDIR="$WORKDIR" \
@@ -35,5 +35,5 @@ index aa65ae5..c342d18 100644
  }
  
 -- 
-2.22.0
+2.30.0
 

alarm/devtools-alarm/0005-makechrootpkg-no-default-logging.patch

@@ -1,17 +1,17 @@
-From 1f6b9d855cfad03203364e286d48a8aaeb984abf Mon Sep 17 00:00:00 2001
+From 1efb4468c3f189cf540f7b42f9dc1ab7718a9e77 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sun, 28 Dec 2014 22:33:41 -0700
-Subject: [PATCH 5/7] makechrootpkg: no default logging
+Subject: [PATCH 5/8] makechrootpkg: no default logging
 
 ---
  makechrootpkg.in | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/makechrootpkg.in b/makechrootpkg.in
-index c342d18..086a0a6 100644
+index aeb6d4a..6b774be 100644
 --- a/makechrootpkg.in
 +++ b/makechrootpkg.in
-@@ -15,7 +15,7 @@ m4_include(lib/archroot.sh)
+@@ -17,7 +17,7 @@ source /usr/share/makepkg/util/config.sh
  
  shopt -s nullglob
  
@@ -21,5 +21,5 @@ index c342d18..086a0a6 100644
  verifysource_args=()
  chrootdir=
 -- 
-2.22.0
+2.30.0
 

alarm/devtools-alarm/0006-archbuild-no-setarch.patch

@@ -1,25 +1,25 @@
-From 9f1a776a946ba20f41d7714ca76385db7db81af6 Mon Sep 17 00:00:00 2001
+From bc5a5e2554771a6310bbb35fd6c5e9afffc6d3a0 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sun, 28 Dec 2014 22:34:04 -0700
-Subject: [PATCH 6/7] archbuild: no setarch
+Subject: [PATCH 6/8] archbuild: no setarch
 
 ---
  archbuild.in | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/archbuild.in b/archbuild.in
-index 69bb029..53d60a5 100644
+index 5b98976..b62794f 100644
 --- a/archbuild.in
 +++ b/archbuild.in
 @@ -69,7 +69,7 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then
  
  	rm -rf --one-file-system "${chroots}/${repo}-${arch}"
- 	mkdir -m755 -p "${chroots}/${repo}-${arch}"
+ 	(umask 0022; mkdir -p "${chroots}/${repo}-${arch}")
 -	setarch "${arch}" mkarchroot \
 +	mkarchroot \
  		-C "${pacman_config}" \
  		-M "${makepkg_config}" \
  		"${chroots}/${repo}-${arch}/root" \
 -- 
-2.22.0
+2.30.0
 

alarm/devtools-alarm/0007-makechrootpkg-don-t-delete-MAKEFLAGS-and-PACKAGER.patch

@@ -1,17 +1,17 @@
-From a0d662502a0aab38f3ad07222fc40b74053bbea2 Mon Sep 17 00:00:00 2001
+From 31d29cb9b28750c240e9503203d04a779c124eda Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sun, 3 Jul 2016 21:32:15 -0600
-Subject: [PATCH 7/7] makechrootpkg: don't delete MAKEFLAGS and PACKAGER
+Subject: [PATCH 7/8] makechrootpkg: don't delete MAKEFLAGS and PACKAGER
 
 ---
  makechrootpkg.in | 4 +---
  1 file changed, 1 insertion(+), 3 deletions(-)
 
 diff --git a/makechrootpkg.in b/makechrootpkg.in
-index 086a0a6..bd97afb 100644
+index 6b774be..7c493b5 100644
 --- a/makechrootpkg.in
 +++ b/makechrootpkg.in
-@@ -188,9 +188,7 @@ prepare_chroot() {
+@@ -172,9 +172,7 @@ prepare_chroot() {
  
  	$install -d "$copydir"/{build,startdir,{pkg,srcpkg,src,log}dest}
  
@@ -23,5 +23,5 @@ index 086a0a6..bd97afb 100644
  		grep -q "^$x" "$copydir/etc/makepkg.conf" && continue
  		echo "$x" >>"$copydir/etc/makepkg.conf"
 -- 
-2.22.0
+2.30.0
 

alarm/devtools-alarm/0008-makechrootpkg-gotmpdir.patch

@@ -0,0 +1,25 @@
+From ab24ea00b2752d895d7e1450154ee3f52afa66ea Mon Sep 17 00:00:00 2001
+From: Kevin Mihelich <kevin@archlinuxarm.org>
+Date: Thu, 22 Jul 2021 18:22:43 -0600
+Subject: [PATCH 8/8] makechrootpkg: gotmpdir
+
+---
+ makechrootpkg.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/makechrootpkg.in b/makechrootpkg.in
+index 7c493b5..a8b5cb3 100644
+--- a/makechrootpkg.in
++++ b/makechrootpkg.in
+@@ -214,7 +214,7 @@ _chrootbuild() {
+ 	# https://bugzilla.sudo.ws/show_bug.cgi?id=765
+ 	mkdir /build/.distcc
+ 	chown builduser /build/.distcc
+-	sudo --preserve-env=SOURCE_DATE_EPOCH -iu builduser DISTCC_IO_TIMEOUT=1200 DISTCC_DIR='/build/.distcc' bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
++	sudo --preserve-env=SOURCE_DATE_EPOCH -iu builduser DISTCC_IO_TIMEOUT=1200 DISTCC_DIR='/build/.distcc' GOTMPDIR='/build' bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
+ 	ret=$?
+ 	case $ret in
+ 		0|14)
+-- 
+2.30.0
+

alarm/devtools-alarm/PKGBUILD

@@ -6,8 +6,8 @@
 
 pkgname=devtools-alarm
 _pkgname=devtools
-pkgver=20190912
-pkgrel=1
+pkgver=20210202
+pkgrel=2
 pkgdesc='Tools for Arch Linux ARM package maintainers'
 arch=('any')
 license=('GPL')
@@ -25,7 +25,8 @@ source=(https://sources.archlinux.org/other/${_pkgname}/${_pkgname}-${pkgver}.ta
         '0004-arch-nspawn-arm-fix.patch'
         '0005-makechrootpkg-no-default-logging.patch'
         '0006-archbuild-no-setarch.patch'
-        '0007-makechrootpkg-don-t-delete-MAKEFLAGS-and-PACKAGER.patch')
+        '0007-makechrootpkg-don-t-delete-MAKEFLAGS-and-PACKAGER.patch'
+        '0008-makechrootpkg-gotmpdir.patch')
 validpgpkeys=('487EACC08557AD082088DABA1EB2638FF56C0C53'
               '4AA4767BBC9C4B1D18AE28B77F2D434B9741E8AC'
               '86CFFCA918CF3AF47147588051E8B148A9999C34'
@@ -35,15 +36,16 @@ validpgpkeys=('487EACC08557AD082088DABA1EB2638FF56C0C53'
               'F3691687D867B81B51CE07D9BBE43771487328A9'
               '6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD'
               'E240B57E2C4630BA768E2F26FC1B547C8D8172C8')
-sha256sums=('0f6c83cdfb13b27292b034a5f4bfa46293830f879d4af5226079af30795992fb'
+sha256sums=('ad1a65f0f349093b557bd6f45fd5f84ba2be246702908193ae7351457a218d6e'
             'SKIP'
-            'd562fda07e66ff8f4228abda31ba4abf26561c203234baa479891e1b6e8e286f'
-            'd2201d40292832363188fb9a0541dd20af7c9feb71e62db6077926f8ce52315a'
-            'edfe6b8dd600ca16116860ffb0fa0a998d78d5951f9aad581a3c5b1a40ac0630'
-            '57bbf498932a454bd51f825f09fbe0066d6588f1b41978c09ce337c079758dc2'
-            '0917f6aaabf75f75b74a08f3f244dbe5f6369d115d6e65c8c2fb0b91bc71e3ca'
-            '892c9705e3d37b9a2fc72b60fae798127864a01bab40e825f1a0bc910ee7e330'
-            '26acd09ac3ee2424dc0f93a51472ad4644cd442a44a6fb87efb23e5ea2c2416e')
+            '0bb5e961790db624eec496fda33d979a785a2c7e12b57fa64d18d9f0917c1a9a'
+            '198bea6f95df48340562537597e9a0eaa7a379abad05fff5653df75e59552074'
+            '172027cd7892e841b0e1c0c668a60ca17ed87ce7a5ab6020e1e3e7275d30c2c2'
+            'cb331d4a6bdb6741ccc1f40ccd9e50ba6789103d677c39ff801074d8794bba48'
+            '820ab51b324d88e8ef92f0a16327786e108d4ac3ea76e079ab49db08c7dc85cb'
+            '7ae38f019fe8694f220c31934c0f4dfefe8238377089383432cca70ad8c2925d'
+            '8c5dcd25d2b31548953b5c689541e38fa8a18df46181edfa8eff093b39cb4fbb'
+            'f3e4dc3cd27fa2cf634c82e95ab66ba1872ffbca0c4acb05565c49e819cfbc17')
 
 prepare() {
   cd "${_pkgname}-${pkgver}"
@@ -54,6 +56,7 @@ prepare() {
   patch -p1 -i ../0005-makechrootpkg-no-default-logging.patch
   patch -p1 -i ../0006-archbuild-no-setarch.patch
   patch -p1 -i ../0007-makechrootpkg-don-t-delete-MAKEFLAGS-and-PACKAGER.patch
+  patch -p1 -i ../0008-makechrootpkg-gotmpdir.patch
 }
 
 build() {