alarm/devtools-alarm to 20220621-1

This commit is contained in:
Kevin Mihelich 2022-08-12 02:04:10 +00:00
parent 6ab8983ae1
commit 2202d1219a
9 changed files with 87 additions and 73 deletions

View file

@ -1,4 +1,4 @@
From 003ca8fea163645d1ef73a601f183dfe30d858f6 Mon Sep 17 00:00:00 2001
From d7db6adbb1f9b58e86148117d5449c18232c8a43 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/8] makechrootpkg: cache dir
@ -8,10 +8,10 @@ Subject: [PATCH 1/8] makechrootpkg: cache dir
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/makechrootpkg.in b/makechrootpkg.in
index d308af2..71ee9c0 100644
index 126d1da..aef2702 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -64,6 +64,7 @@ usage() {
@@ -56,6 +56,7 @@ usage() {
echo 'Flags:'
echo '-h This help'
echo '-c Clean the chroot before building'
@ -19,7 +19,7 @@ index d308af2..71ee9c0 100644
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'
@@ -277,12 +278,13 @@ move_products() {
@@ -274,12 +275,13 @@ move_products() {
}
# }}}
@ -34,7 +34,7 @@ index d308af2..71ee9c0 100644
r) passeddir="$OPTARG" ;;
I) install_pkgs+=("$OPTARG") ;;
l) copy="$OPTARG" ;;
@@ -305,6 +307,10 @@ chrootdir=$(readlink -e "$passeddir")
@@ -302,6 +304,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 d308af2..71ee9c0 100644
if [[ ${copy:0:1} = / ]]; then
copydir=$copy
else
@@ -364,7 +370,7 @@ download_sources
@@ -361,7 +367,7 @@ download_sources
prepare_chroot
@ -55,5 +55,5 @@ index d308af2..71ee9c0 100644
--bind="${SRCDEST//:/\\:}:/srcdest" \
"${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \
--
2.30.0
2.36.1

View file

@ -1,4 +1,4 @@
From 862cf122e47f16c2bdd903df2eeb3e9d4d9e2497 Mon Sep 17 00:00:00 2001
From 849d82cd9eed1d4ad08aee9cb1c47ee0cf82c186 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/8] arch-nspawn: keep mirrorlist
@ -8,10 +8,10 @@ Subject: [PATCH 2/8] arch-nspawn: keep mirrorlist
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch-nspawn.in b/arch-nspawn.in
index cde1f60..18febda 100644
index 275cff7..2c61371 100644
--- a/arch-nspawn.in
+++ b/arch-nspawn.in
@@ -96,8 +96,7 @@ done
@@ -86,8 +86,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
@ -22,5 +22,5 @@ index cde1f60..18febda 100644
[[ -n $pac_conf ]] && cp "$pac_conf" "$working_dir/etc/pacman.conf"
[[ -n $makepkg_conf ]] && cp "$makepkg_conf" "$working_dir/etc/makepkg.conf"
--
2.30.0
2.36.1

View file

@ -1,4 +1,4 @@
From 27859bef1f1a87cf2d2d1163ee3dc8e906b90abd Mon Sep 17 00:00:00 2001
From 20af170ed679522bb78ffec04f9f4234209dab00 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/8] makechrootpkg: distcc
@ -8,20 +8,23 @@ Subject: [PATCH 3/8] makechrootpkg: distcc
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/makechrootpkg.in b/makechrootpkg.in
index 71ee9c0..af3cc28 100644
index aef2702..0929df1 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -214,7 +214,9 @@ _chrootbuild() {
@@ -208,10 +208,12 @@ _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
- sudo --preserve-env=SOURCE_DATE_EPOCH -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
+ 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 \
--preserve-env=BUILDTOOL \
--preserve-env=BUILDTOOLVER \
- -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
+ -iu builduser DISTCC_IO_TIMEOUT=1200 DISTCC_DIR='/build/.distcc' bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
ret=$?
case $ret in
0|14)
--
2.30.0
2.36.1

View file

@ -1,4 +1,4 @@
From d9d880448cf065cf5a9ad8649d2ce53f9055e289 Mon Sep 17 00:00:00 2001
From 0e72ba89cc863b7545577c3c463a30725cfa7340 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/8] arch-nspawn: arm fix
@ -9,25 +9,25 @@ Subject: [PATCH 4/8] arch-nspawn: arm fix
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch-nspawn.in b/arch-nspawn.in
index 18febda..be9f49a 100644
index 2c61371..42f19cc 100644
--- a/arch-nspawn.in
+++ b/arch-nspawn.in
@@ -126,7 +126,7 @@ eval "$(grep -a '^CARCH=' "$working_dir/etc/makepkg.conf")"
@@ -121,7 +121,7 @@ else
set_arch="${CARCH}"
fi
[[ -z $nosetarch ]] || unset CARCH
-exec ${CARCH:+setarch "$CARCH"} systemd-nspawn -q \
-exec ${CARCH:+setarch "$set_arch"} systemd-nspawn -q \
+exec systemd-nspawn -q \
-D "$working_dir" \
-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 af3cc28..aeb6d4a 100644
index 0929df1..367f030 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -241,7 +241,7 @@ download_sources() {
@@ -238,7 +238,7 @@ download_sources() {
# Ensure sources are downloaded
sudo -u "$makepkg_user" --preserve-env=GNUPGHOME \
sudo -u "$makepkg_user" --preserve-env=GNUPGHOME,SSH_AUTH_SOCK \
env SRCDEST="$SRCDEST" BUILDDIR="$WORKDIR" \
- makepkg --config="$copydir/etc/makepkg.conf" --verifysource -o "${verifysource_args[@]}" ||
+ makepkg -A --config="$copydir/etc/makepkg.conf" --verifysource -o "${verifysource_args[@]}" ||
@ -35,5 +35,5 @@ index af3cc28..aeb6d4a 100644
}
--
2.30.0
2.36.1

View file

@ -1,4 +1,4 @@
From 1efb4468c3f189cf540f7b42f9dc1ab7718a9e77 Mon Sep 17 00:00:00 2001
From fe9761f7d56bc921a4a9d983d73e63f820df5184 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/8] makechrootpkg: no default logging
@ -8,10 +8,10 @@ Subject: [PATCH 5/8] makechrootpkg: no default logging
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/makechrootpkg.in b/makechrootpkg.in
index aeb6d4a..6b774be 100644
index 367f030..f1a8437 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -17,7 +17,7 @@ source /usr/share/makepkg/util/config.sh
@@ -9,7 +9,7 @@ source /usr/share/makepkg/util/config.sh
shopt -s nullglob
@ -21,5 +21,5 @@ index aeb6d4a..6b774be 100644
verifysource_args=()
chrootdir=
--
2.30.0
2.36.1

View file

@ -1,4 +1,4 @@
From bc5a5e2554771a6310bbb35fd6c5e9afffc6d3a0 Mon Sep 17 00:00:00 2001
From 25cb666403f4c12fed5885b148237ac5a108ec04 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/8] archbuild: no setarch
@ -8,18 +8,18 @@ Subject: [PATCH 6/8] archbuild: no setarch
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/archbuild.in b/archbuild.in
index 5b98976..b62794f 100644
index e6cf19a..490bd09 100644
--- a/archbuild.in
+++ b/archbuild.in
@@ -69,7 +69,7 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then
@@ -75,7 +75,7 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then
rm -rf --one-file-system "${chroots}/${repo}-${arch}"
(umask 0022; mkdir -p "${chroots}/${repo}-${arch}")
- setarch "${arch}" mkarchroot \
- setarch "${set_arch}" mkarchroot \
+ mkarchroot \
-C "${pacman_config}" \
-M "${makepkg_config}" \
"${chroots}/${repo}-${arch}/root" \
--
2.30.0
2.36.1

View file

@ -1,4 +1,4 @@
From 31d29cb9b28750c240e9503203d04a779c124eda Mon Sep 17 00:00:00 2001
From 28e5357b1c6b0851ac171249fb10f8b170faf0c3 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/8] makechrootpkg: don't delete MAKEFLAGS and PACKAGER
@ -8,10 +8,10 @@ Subject: [PATCH 7/8] makechrootpkg: don't delete MAKEFLAGS and PACKAGER
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/makechrootpkg.in b/makechrootpkg.in
index 6b774be..7c493b5 100644
index f1a8437..f0378b3 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -172,9 +172,7 @@ prepare_chroot() {
@@ -164,9 +164,7 @@ prepare_chroot() {
$install -d "$copydir"/{build,startdir,{pkg,srcpkg,src,log}dest}
@ -23,5 +23,5 @@ index 6b774be..7c493b5 100644
grep -q "^$x" "$copydir/etc/makepkg.conf" && continue
echo "$x" >>"$copydir/etc/makepkg.conf"
--
2.30.0
2.36.1

View file

@ -1,4 +1,4 @@
From ab24ea00b2752d895d7e1450154ee3f52afa66ea Mon Sep 17 00:00:00 2001
From 7ce31cb2855ca525dba932e566646f2e337930ed 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
@ -8,18 +8,18 @@ Subject: [PATCH 8/8] makechrootpkg: gotmpdir
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/makechrootpkg.in b/makechrootpkg.in
index 7c493b5..a8b5cb3 100644
index f0378b3..179e8c6 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 "$@"
@@ -211,7 +211,7 @@ _chrootbuild() {
sudo --preserve-env=SOURCE_DATE_EPOCH \
--preserve-env=BUILDTOOL \
--preserve-env=BUILDTOOLVER \
- -iu builduser DISTCC_IO_TIMEOUT=1200 DISTCC_DIR='/build/.distcc' bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
+ -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
2.36.1

View file

@ -6,19 +6,20 @@
pkgname=devtools-alarm
_pkgname=devtools
pkgver=20210202
pkgrel=2
pkgver=20220621
pkgrel=1
pkgdesc='Tools for Arch Linux ARM package maintainers'
arch=('any')
license=('GPL')
url='https://git.archlinux.org/devtools.git/'
url='https://gitlab.archlinux.org/archlinux/devtools'
conflicts=('devtools')
provides=('devtools')
depends=('bash' 'openssh' 'subversion' 'rsync' 'arch-install-scripts'
'git' 'bzr' 'mercurial' 'diffutils' 'util-linux')
'git' 'bzr' 'mercurial' 'diffutils' 'util-linux' 'awk')
makedepends=('asciidoc')
optdepends=('btrfs-progs: btrfs support')
source=(https://sources.archlinux.org/other/${_pkgname}/${_pkgname}-${pkgver}.tar.gz{,.sig}
source=(${url}/uploads/8217baae0afcdb540bde9f5b030f05a9/devtools-${pkgver}.tar.gz
${url}/uploads/8570458d06b07d5a3ff8d30a1fc392d4/devtools-${pkgver}.tar.gz.sig
'0001-makechrootpkg-cache-dir.patch'
'0002-arch-nspawn-keep-mirrorlist.patch'
'0003-makechrootpkg-distcc.patch'
@ -27,25 +28,35 @@ source=(https://sources.archlinux.org/other/${_pkgname}/${_pkgname}-${pkgver}.ta
'0006-archbuild-no-setarch.patch'
'0007-makechrootpkg-don-t-delete-MAKEFLAGS-and-PACKAGER.patch'
'0008-makechrootpkg-gotmpdir.patch')
validpgpkeys=('487EACC08557AD082088DABA1EB2638FF56C0C53'
'4AA4767BBC9C4B1D18AE28B77F2D434B9741E8AC'
'86CFFCA918CF3AF47147588051E8B148A9999C34'
'8FC15A064950A99DD1BD14DD39E4B877E62EB915'
'8218F88849AAC522E94CF470A5E9288C4FA415FA'
'B81B051F2D7FC867AAFF35A58DBD63B82072D77A'
'F3691687D867B81B51CE07D9BBE43771487328A9'
'6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD'
'E240B57E2C4630BA768E2F26FC1B547C8D8172C8')
sha256sums=('ad1a65f0f349093b557bd6f45fd5f84ba2be246702908193ae7351457a218d6e'
validpgpkeys=(
'4AA4767BBC9C4B1D18AE28B77F2D434B9741E8AC' # Pierre Schmitz <pierre@archlinux.org>
'86CFFCA918CF3AF47147588051E8B148A9999C34' # Evangelos Foutras <foutrelis@archlinux.org>
'8FC15A064950A99DD1BD14DD39E4B877E62EB915' # Sven-Hendrik Haase <svenstaro@archlinux.org>
'A2FF3A36AAA56654109064AB19802F8B0D70FC30' # Jan Alexander Steffens (heftig) <heftig@archlinux.org>
'B81B051F2D7FC867AAFF35A58DBD63B82072D77A' # Sébastien Luttringer <seblu@archlinux.org>
'6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD' # Allan McRae (Developer) <allan@archlinux.org>
'E240B57E2C4630BA768E2F26FC1B547C8D8172C8' # Levente Polyak <anthraxx@archlinux.org>
)
sha256sums=('0938d41b4bc469e62d86d2a287612a090640f6eebde92137b8bd7727b89e95dd'
'SKIP'
'0bb5e961790db624eec496fda33d979a785a2c7e12b57fa64d18d9f0917c1a9a'
'198bea6f95df48340562537597e9a0eaa7a379abad05fff5653df75e59552074'
'172027cd7892e841b0e1c0c668a60ca17ed87ce7a5ab6020e1e3e7275d30c2c2'
'cb331d4a6bdb6741ccc1f40ccd9e50ba6789103d677c39ff801074d8794bba48'
'820ab51b324d88e8ef92f0a16327786e108d4ac3ea76e079ab49db08c7dc85cb'
'7ae38f019fe8694f220c31934c0f4dfefe8238377089383432cca70ad8c2925d'
'8c5dcd25d2b31548953b5c689541e38fa8a18df46181edfa8eff093b39cb4fbb'
'f3e4dc3cd27fa2cf634c82e95ab66ba1872ffbca0c4acb05565c49e819cfbc17')
'618bda0dad5337f8e1500832a5f255300802e94ada7711907dc47f2569e9f519'
'b0e43fb242096127aba846d9f597bb31c34a5de636e4bd473a2fdf63d9a89976'
'd6ef2ff23accb15b554cf54d75ca5a55ff67400c0852d2646a3bd5533d1ed70d'
'9d9e6949882d89dfb1cc8dc833dbb1f4bb4a0d1be50439a3ae27e78820df3763'
'1d6f17cc9c77690bdd007e276da52a6acf54b52dbe081ce6c6767a3fa1b5b113'
'2f68d22a0c04fe6a47266a9e2b68b90b092be6ab5888686609fd85b19ed8c5b3'
'3b6d1b20d5145d13c8d8b8fd4a6555034579067dcb768ea574e29bfb7101fb09'
'1162044b55ebf6cbec81da94dd1d85e48657311f03e322f3a17dc22e060b54a1')
b2sums=('007f62b6cb3f06904fcafec4869a43136643bd364a7f0f314c792c08fbdafafaf8a268f8a372f78402deaa1f87bfc3f2fc7099f78742c6776d4ac49fe4884d58'
'SKIP'
'1d1a9c5ea3279dc0bae47265f5068b6fae2de63c6f81cba0a713b36b84ddb60f5e982f5e3acc21dd2316fbf9b756036091c51545f1fa1a623628e72bbe2b717d'
'ed5c5c92caf67e13ba06dae6c73d775786eaf640fbc06cb70faf0d0f088f9c092fda2be76d767b20d96a10c670818d3bf7ebbc96467418234add7b88f308dc34'
'4406f49a909b7101e2950ae6ee0484f6e71da41396d2a6884b0df996d06fc94026624cc2e87f237b5ffb017414f6c7cd34ef881234654763c4e194c9a1460db2'
'4d8c095d07218f1f7d252e1a2cb0f01cf4c2fd856a9dfaa06006e51a32107b53e3ec0ce19606ed5f2c9888863b08330dd4ce2f95d0df8c585edcffe85dd4a094'
'8a672b6debaac19baf2189acbb72b027860bf6d16306feb8d93f48c5ef32f5d073a618a04c65ed645f47d46332b0cead282b63950b2dab0efcab23b38cc61dc8'
'd796e4c6c8522889d803fe6ee6f52cec548e34db28bb2aeb7a62d7d3cb5e357692d83292d6b51045bc799e3f1ce985583b905b0dd9d2b22cfbdd430e6a60f5c8'
'9003b89871dcb20f36991a28a3095762191ed9101283504a3a986e38d1b9f207a5db6d7500f047ee40dea6fe17a21a56a94aba5816ad686490d7534cdf77b715'
'66b23af5326e0031657f2499ae004cf922b71623798f885d7c777fa1cf44172db2ae05d7128bb932df3f3f2a7c47b418d428687c9f149c2d0b487ec6bd68571e')
prepare() {
cd "${_pkgname}-${pkgver}"
@ -61,7 +72,7 @@ prepare() {
build() {
cd ${_pkgname}-${pkgver}
make PREFIX=/usr
make BUILDTOOLVER="${pkgver}-${pkgrel}-${arch}" PREFIX=/usr
}
package() {