November 2019 - Arch-projects - lists.archlinux.org

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20191016-20-g4c803b9
by Levente Polyak 02 Dec '19

02 Dec '19

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official devtools repository". The branch, master has been updated via 4c803b9db8f6395c610c96bd090d1ba2ced82a9c (commit) via 104c5bc90e259028f5c9352a32f8976aa0f95a8d (commit) via cee28a1b13ddd0f60b2466b20a43f04a4bf5df54 (commit) via e0f82d394717efb28537f0a366b4a5b3515354b6 (commit) via 74313db9ee243b30b48d355f88b3c8971b90161f (commit) via 2c611d20bdd04feae6ab32a7ef8947aeb4118604 (commit) via ca4d348c86de0a466d48e6d99ac390729707c317 (commit) via 2fb1cc2dd2c2171bd2c078a37f871de45b0fe118 (commit) via bcba56640536406b860fa7364357659b51d0aea5 (commit) via f8f2f0202804a7c6001a98295ec35d43ec5f809c (commit) via 68f0bff172f77390dfad798f12e4a56e0c1f35d4 (commit) via f85a58a0a630d44285532693b61d4b8a58dee495 (commit) via 20eec484fadd7212367749ee7cd37d3aa18e8c4e (commit) via 6fffbfbc8af6b1194b977582fe3cb308b550f864 (commit) from 001726337972f35e1907f6460831c3c3c9d656e4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4c803b9db8f6395c610c96bd090d1ba2ced82a9c Author: Levente Polyak <anthraxx(a)archlinux.org> Date: Sat Nov 30 13:30:34 2019 +0100 Version 20191130 commit 104c5bc90e259028f5c9352a32f8976aa0f95a8d Author: Levente Polyak <anthraxx(a)archlinux.org> Date: Sat Nov 30 13:13:49 2019 +0100 makechrootpkg: sync database for checkpkg to avoid nonexistent targets For build servers or similar infrastructure its relatively common to not sync/update the database regularly. This leads to problems properly running checkpkg duo to nonexistent target files that we try to download. As building on build servers is a very common use case, lets ensure we sync the local database before trying to resolve the package locations. commit cee28a1b13ddd0f60b2466b20a43f04a4bf5df54 Author: Levente Polyak <anthraxx(a)archlinux.org> Date: Sat Nov 30 13:09:14 2019 +0100 makechrootpkg: check local pkg versions before downloading for checkpkg Avoid always trying to download and output the according message. Add checks for packages either not being available in the repo or all variants have up to date versions stored in the local cache. commit e0f82d394717efb28537f0a366b4a5b3515354b6 Author: Levente Polyak <anthraxx(a)archlinux.org> Date: Thu Nov 28 21:50:15 2019 +0100 completion: add makerepropkg zsh completion commit 74313db9ee243b30b48d355f88b3c8971b90161f Author: Levente Polyak <anthraxx(a)archlinux.org> Date: Thu Nov 28 21:49:43 2019 +0100 completion: reflect new -U mkarchchroot option commit 2c611d20bdd04feae6ab32a7ef8947aeb4118604 Author: Ivy Foster <escondida(a)iff.ink> Date: Thu Nov 21 18:08:25 2019 -0600 lib/common.sh: do not use colors when running on a dumb terminal commit ca4d348c86de0a466d48e6d99ac390729707c317 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Nov 17 21:24:02 2019 -0500 doc: add manpage for the new makerepropkg tool Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> commit 2fb1cc2dd2c2171bd2c078a37f871de45b0fe118 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed Feb 13 17:14:00 2019 -0500 makerepropkg: add new program to try to reproducibly build a package This attempts to recreate a package that was probably created using makechrootpkg, and see if it conforms to the https://reproducible-builds.org/ specification. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> commit bcba56640536406b860fa7364357659b51d0aea5 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Sep 3 18:40:00 2019 -0400 mkarchroot: support wrapping pacstrap -U Needed to support reproducible builds. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> commit f8f2f0202804a7c6001a98295ec35d43ec5f809c Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sat Nov 9 22:13:00 2019 -0500 archbuild: use better umask In commit 40a90e2cab479cc64903a62b42eb617a8a7e5842 we tried to protect against system umasks resulting in unreadable chroots. However, we tried to do this in a targeted manner due to not wanting to fiddle with permissions for user-owned files. Unfortuantely, mkdir -p -m755 does not actually work that way -- the parent directory is created with broken permissions. We need umask. Run umask and mkdir in a subshell to prevent leakage. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> commit 68f0bff172f77390dfad798f12e4a56e0c1f35d4 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Fri Nov 8 09:40:09 2019 -0500 commitpkg: clearly delineate the commit message template and the rationale In commit 75d23eec942e7160108ee194894b6b83ed3045d5 we moved to include commitpkg arguments as the first line of the svn commit message, but we simply dumped the result after the version number without separating the two, increasing the cognitive burden of parsing the rationale. Since the whole point of the change was to make it easier to see what happened when using git log --oneline (reducing the cognitive burden of parsing 'pretty' output with author/date info), it makes sense to also delineate the reason correctly. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> commit f85a58a0a630d44285532693b61d4b8a58dee495 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed Oct 2 11:21:33 2019 -0400 arch-nspawn: rely on deduplication to avoid making multiple host_mirror mounts Instead of comparing exact mirror urls to see if they are in host_mirrors in order to "skip" the official mirrors Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> commit 20eec484fadd7212367749ee7cd37d3aa18e8c4e Author: Levente Polyak <anthraxx(a)archlinux.org> Date: Thu Nov 7 22:28:17 2019 +0100 offload-build: remove empty src dir when SRCDEST is set Right now there is a bug in makepkg that leaves back an empty src directory if SRCDEST is set. This is purely cosmetic, but lets just politely try to rmdir it and fail silently if its empty or non-existent. Signed-off-by: Levente Polyak <anthraxx(a)archlinux.org> commit 6fffbfbc8af6b1194b977582fe3cb308b550f864 Author: Levente Polyak <anthraxx(a)archlinux.org> Date: Thu Nov 7 22:19:12 2019 +0100 offload-build: catch more signals to be sure SRCPKGDEST gets cleaned It may be not enough to just listen on EXIT depending on the shell used so lets make sure we clean up SRCPKGDEST by listening to more sigs. Signed-off-by: Levente Polyak <anthraxx(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: .gitignore | 1 + Makefile | 4 +- arch-nspawn.in | 16 ++-- archbuild.in | 2 +- commitpkg.in | 2 +- doc/makerepropkg.1.asciidoc | 38 +++++++++ doc/mkarchroot.1.asciidoc | 3 + lib/common.sh | 2 +- makechrootpkg.in | 18 +++-- makerepropkg.in | 190 ++++++++++++++++++++++++++++++++++++++++++++ mkarchroot.in | 13 ++- offload-build | 6 +- zsh_completion.in | 10 ++- 13 files changed, 280 insertions(+), 25 deletions(-) create mode 100644 doc/makerepropkg.1.asciidoc create mode 100755 makerepropkg.in hooks/post-receive -- The official devtools repository

2 1

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20191130-1-g8d99df6
by Levente Polyak 30 Nov '19

30 Nov '19

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official devtools repository". The branch, master has been updated via 8d99df602d6e5fc377a37f67d0e5ce74c8facecd (commit) from 4c803b9db8f6395c610c96bd090d1ba2ced82a9c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8d99df602d6e5fc377a37f67d0e5ce74c8facecd Author: Levente Polyak <anthraxx(a)archlinux.org> Date: Sat Nov 30 13:44:02 2019 +0100 makechrootpkg: double quote array expansions for checkpkg locations Avoid re-splitting remotepkg elements used for checkpkg conditions. ----------------------------------------------------------------------- Summary of changes: makechrootpkg.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools] [GIT] The official devtools repository annotated tag 20191130 created. 20191130
by Levente Polyak 30 Nov '19

30 Nov '19

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official devtools repository". The annotated tag, 20191130 has been created at fca044cc8898ae7f901274bab2da62338f6fcdc1 (tag) tagging 4c803b9db8f6395c610c96bd090d1ba2ced82a9c (commit) replaces 20191016 tagged by Levente Polyak on Sat Nov 30 13:30:39 2019 +0100 - Log ----------------------------------------------------------------- Version 20191130 -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEE4kC1fixGMLp2ji8m/BtUfI2BcsgFAl3iYO8ACgkQ/BtUfI2B csg/ww/9Gt6xBhcvMgLduBbiriw+E2lpkR8Mrhv9VT/LnzMrUArvv8sTEE2aeO9P 8WqyrCzGgwTcgryinOy3KuVBxWjllh2tT6GsHp2Mn70Te7rkO2TybigPogTlyVRJ bLvGDuSdjdHUYIL680x6oOMH1vHajZfFo27KoFF1Qu09MnF/Qx6tsNxZ63MQc4oN ZxkmarQTK4/HggfmJdmWCpOyno4tUT56PVeTrS2FKSlthu1iv1+reTgh0y3Ocf7o Yl0eQED3c7bnI3+nqcJmawWTWEVn0aLX5rbWhBBGoA2ih3QZ6fEN5dsY7EjMKca4 C5lipD9ByYSHqDuWiwieHFA6eY9+E9fixCK+hsjGHTU0dhD+WOyusFj6dBhwQSyL 3pbuh84ZfLp2QISiV6VpmIQ9AgX75fIA9FxkEI8RGPGCPF70weTg2u5EJS8W7jbE YJvFmrIaC/0j5+UaYGMx4flPYuvwai6sLDpXjv0xZr5eSXq6OlXlxkZuVUQCsw0R gk1JjvT36j8KKsE0FqLuaVIvg0V8OHu0+EBwJY7DWWcnci7KuyVd9RJRlMbchPvo E5izF+u3ALTWHp/lPP1/C/7bJhYH/iOQFYnF6y2cxw503bcExinUymchIA6cCRFY gt+so+lOUTQKr3k5DJ4LoTummtlSXTJIRCDoeoyEBxGPcboYZmU= =lHvd -----END PGP SIGNATURE----- Daniel M. Capella (2): conf: Sync with pacman 5.2.0-2 commitpkg: Include commit msg arg in first line Eli Schwartz (10): arch-nspawn: restore cachedir handling for host_mirrors arch-nspawn: simplify cachedir/host_mirror parsing use libmakepkg to find and use variables in makepkg.conf Makefile: sort program names arch-nspawn: rely on deduplication to avoid making multiple host_mirror mounts commitpkg: clearly delineate the commit message template and the rationale archbuild: use better umask mkarchroot: support wrapping pacstrap -U makerepropkg: add new program to try to reproducibly build a package doc: add manpage for the new makerepropkg tool Ivy Foster (1): lib/common.sh: do not use colors when running on a dumb terminal Levente Polyak (7): offload-build: catch more signals to be sure SRCPKGDEST gets cleaned offload-build: remove empty src dir when SRCDEST is set completion: reflect new -U mkarchchroot option completion: add makerepropkg zsh completion makechrootpkg: check local pkg versions before downloading for checkpkg makechrootpkg: sync database for checkpkg to avoid nonexistent targets Version 20191130 ----------------------------------------------------------------------- hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools] [PATCH 0/3] New tool,
by Eli Schwartz 21 Nov '19

21 Nov '19

I've finally finished up this thing for testing if a package can be rebuilt reproducibly. It uses makechrootpkg/mkarchroot under the hood, and requires arch-install-scripts >= 23. This, and other commits recently submitted to the list, can be pulled directly from my repository at https://github.com/eli-schwartz/devtools/commits/arch-projects-review Eli Schwartz (3): mkarchroot: support wrapping pacstrap -U makerepropkg: add new program to try to reproducibly build a package doc: add manpage for the new makerepropkg tool Makefile | 2 + doc/makerepropkg.1.asciidoc | 38 ++++++++ doc/mkarchroot.1.asciidoc | 3 + makerepropkg.in | 186 ++++++++++++++++++++++++++++++++++++ mkarchroot.in | 13 ++- 5 files changed, 238 insertions(+), 4 deletions(-) create mode 100644 doc/makerepropkg.1.asciidoc create mode 100755 makerepropkg.in -- 2.24.0

3 7

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20191016-6-g0017263
by Levente Polyak 07 Nov '19

07 Nov '19

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official devtools repository". The branch, master has been updated via 001726337972f35e1907f6460831c3c3c9d656e4 (commit) via 751093eff2cbd0df422b69810787b4fcf3d33208 (commit) via f43a86ee8a3a3bfbdc32c2d70516d945afcd8515 (commit) via 00671765296ad598f392df7a542dbfca48a6e7b7 (commit) via 75d23eec942e7160108ee194894b6b83ed3045d5 (commit) from 6679c28625b1e48bc115290b7c41941366d44a05 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 001726337972f35e1907f6460831c3c3c9d656e4 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Fri Aug 9 14:26:57 2019 -0400 Makefile: sort program names Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Levente Polyak <anthraxx(a)archlinux.org> commit 751093eff2cbd0df422b69810787b4fcf3d33208 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Fri Aug 9 14:31:53 2019 -0400 use libmakepkg to find and use variables in makepkg.conf - drop homebrew function in makechrootpkg - use better mock to find invoking user's $HOME - make offload-build respect makepkg.conf to determine where to sync files, matching the behavior of makechrootpkg Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Levente Polyak <anthraxx(a)archlinux.org> commit f43a86ee8a3a3bfbdc32c2d70516d945afcd8515 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed Oct 2 10:49:32 2019 -0400 arch-nspawn: simplify cachedir/host_mirror parsing consolidate logic flows in the same area for parsing and building arrays. Don't bother having a special function just to build the mount_args array, since we now use the same handling for adding any cachedir (including host mirrors) to the mount arguments, this becomes a trivial for loop -- and it really did not need to be delayed until after the sanity check, anyway. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Levente Polyak <anthraxx(a)archlinux.org> commit 00671765296ad598f392df7a542dbfca48a6e7b7 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed Oct 2 10:36:53 2019 -0400 arch-nspawn: restore cachedir handling for host_mirrors In commit 27ff286ee78eb2faac803e3ef67f3171ddfa0098, we moved from sourcing the primary cachedir via /etc/pacman.conf, to using the pacman.conf in the workdir. One unanticipated side effect of this was breaking the special host mirrors magic we used to turn a host mirror into a cachedir. It was still processed as a server, but we relied on it being in the host's cachedirs in order to be persisted, and this no longer occurred. Solve this by explicitly adding each host mirror root as a cachedir. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Levente Polyak <anthraxx(a)archlinux.org> commit 75d23eec942e7160108ee194894b6b83ed3045d5 Author: Daniel M. Capella <polyzen(a)archlinux.org> Date: Fri Sep 27 18:55:45 2019 -0400 commitpkg: Include commit msg arg in first line Commit messages belong on the first line, with optional "explanatory text" starting after a blank line: https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html Referencing commit ee970f0bde3c90a0dff909c366d4ab1a1bff9b9d Signed-off-by: Daniel M. Capella <polyzen(a)archlinux.org> Signed-off-by: Levente Polyak <anthraxx(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile | 12 ++++++------ arch-nspawn.in | 31 ++++++++++++++----------------- commitpkg.in | 4 ++-- makechrootpkg.in | 34 ++++++---------------------------- offload-build | 9 ++++++++- 5 files changed, 36 insertions(+), 54 deletions(-) hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools] [PATCH] arch-nspawn: rely on deduplication to avoid making multiple host_mirror mounts
by Eli Schwartz 06 Nov '19

06 Nov '19

Instead of comparing exact mirror urls to see if they are in host_mirrors in order to "skip" the official mirrors, simply trim the expected .../os/... pattern match. We already filter duplicate cachedirs. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- I wasn't sure of the precise utility of this, but in addition to being a bit simpler, it seems to work around the case of https://github.com/archlinux/devtools/issues/14 (Even though I don't really understand why anyone is using '$repo/os/$arch' for their own Server urls.) arch-nspawn.in | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/arch-nspawn.in b/arch-nspawn.in index 7aa6fd6..198d227 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -75,15 +75,13 @@ done while read -r line; do mapfile -t lines < <($pacconf_cmd --config "${pac_conf:-$working_dir/etc/pacman.conf}" \ - --repo $line Server | sed -r 's#(.*/)[^/]+/os/.+#\1$repo/os/$arch#') - if [[ ${lines[0]} != ${host_mirrors[0]} ]]; then - for line in "${lines[@]}"; do - if [[ $line = file://* ]]; then - line=${line#file://} - in_array "$line" "${cache_dirs[@]}" || cache_dirs+=("$line") - fi - done - fi + --repo $line Server | sed -r 's#(.*/)[^/]+/os/.+#\1#') + for line in "${lines[@]}"; do + if [[ $line = file://* ]]; then + line=${line#file://} + in_array "$line" "${cache_dirs[@]}" || cache_dirs+=("$line") + fi + done done < <($pacconf_cmd --config "${pac_conf:-$working_dir/etc/pacman.conf}" --repo-list) mount_args+=("--bind=${cache_dirs[0]//:/\\:}") -- 2.24.0

1 0

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20191016-1-g6679c28
by Levente Polyak 06 Nov '19

06 Nov '19

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official devtools repository". The branch, master has been updated via 6679c28625b1e48bc115290b7c41941366d44a05 (commit) from 2edee89b629f73c8437368b37efbcafd90429728 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6679c28625b1e48bc115290b7c41941366d44a05 Author: Daniel M. Capella <polyzen(a)archlinux.org> Date: Sat Oct 26 18:02:33 2019 -0400 conf: Sync with pacman 5.2.0-2 Signed-off-by: Daniel M. Capella <polyzen(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: makepkg-x86_64.conf | 6 +++--- pacman-extra.conf | 4 +--- pacman-gnome-unstable.conf | 4 +--- pacman-kde-unstable.conf | 4 +--- pacman-multilib-staging.conf | 4 +--- pacman-multilib-testing.conf | 4 +--- pacman-multilib.conf | 4 +--- pacman-staging.conf | 4 +--- pacman-testing.conf | 4 +--- 9 files changed, 11 insertions(+), 27 deletions(-) hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools] [PATCH 1/4] arch-nspawn: restore cachedir handling for host_mirrors
by Eli Schwartz 05 Nov '19

05 Nov '19

In commit 27ff286ee78eb2faac803e3ef67f3171ddfa0098, we moved from sourcing the primary cachedir via /etc/pacman.conf, to using the pacman.conf in the workdir. One unanticipated side effect of this was breaking the special host mirrors magic we used to turn a host mirror into a cachedir. It was still processed as a server, but we relied on it being in the host's cachedirs in order to be persisted, and this no longer occurred. Solve this by explicitly adding each host mirror root as a cachedir. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- arch-nspawn.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch-nspawn.in b/arch-nspawn.in index 5817143..90fe967 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -99,7 +99,14 @@ build_mount_args() { 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" + for host_mirror in "${host_mirrors[@]}"; do + if [[ $host_mirror == *file://* ]]; then + host_mirror=$(echo "$host_mirror" | sed -r 's#file://(/.*)/\$repo/os/\$arch#\1#g') + in_array "$host_mirror" "${cache_dirs[@]}" || cache_dirs+=("$host_mirror") + fi + done [[ -n $pac_conf ]] && cp "$pac_conf" "$working_dir/etc/pacman.conf" [[ -n $makepkg_conf ]] && cp "$makepkg_conf" "$working_dir/etc/makepkg.conf" -- 2.24.0

1 4

[arch-projects] [devtools] [PATCH 1/4] arch-nspawn: simplify cachedir/host_mirror parsing
by Eli Schwartz 05 Nov '19

05 Nov '19

consolidate logic flows in the same area for parsing and building arrays. Don't bother having a special function just to build the mount_args array, since we now use the same handling for adding any cachedir (including host mirrors) to the mount arguments, this becomes a trivial for loop -- and it really did not need to be delayed until after the sanity check, anyway. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- arch-nspawn.in | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/arch-nspawn.in b/arch-nspawn.in index 90fe967..7aa6fd6 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -20,6 +20,7 @@ umask 0022 working_dir='' files=() +mount_args=() usage() { echo "Usage: ${0##*/} [options] working-dir [systemd-nspawn arguments]" @@ -65,6 +66,13 @@ fi # shellcheck disable=2016 host_mirrors=($($pacconf_cmd --repo extra Server 2> /dev/null | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#')) +for host_mirror in "${host_mirrors[@]}"; do + if [[ $host_mirror == *file://* ]]; then + host_mirror=$(echo "$host_mirror" | sed -r 's#file://(/.*)/\$repo/os/\$arch#\1#g') + in_array "$host_mirror" "${cache_dirs[@]}" || cache_dirs+=("$host_mirror") + fi +done + while read -r line; do mapfile -t lines < <($pacconf_cmd --config "${pac_conf:-$working_dir/etc/pacman.conf}" \ --repo $line Server | sed -r 's#(.*/)[^/]+/os/.+#\1$repo/os/$arch#') @@ -78,35 +86,18 @@ while read -r line; do fi done < <($pacconf_cmd --config "${pac_conf:-$working_dir/etc/pacman.conf}" --repo-list) -# {{{ functions -build_mount_args() { - declare -g mount_args=() - - for host_mirror in "${host_mirrors[@]}"; do - if [[ $host_mirror == *file://* ]]; then - host_mirror_path=$(echo "$host_mirror" | sed -r 's#file://(/.*)/\$repo/os/\$arch#\1#g') - mount_args+=("--bind-ro=${host_mirror_path//:/\\:}") - fi - done - - mount_args+=("--bind=${cache_dirs[0]//:/\\:}") +mount_args+=("--bind=${cache_dirs[0]//:/\\:}") - for cache_dir in "${cache_dirs[@]:1}"; do - mount_args+=("--bind-ro=${cache_dir//:/\\:}") - done -} +for cache_dir in "${cache_dirs[@]:1}"; do + mount_args+=("--bind-ro=${cache_dir//:/\\:}") +done +# {{{ functions 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" - for host_mirror in "${host_mirrors[@]}"; do - if [[ $host_mirror == *file://* ]]; then - host_mirror=$(echo "$host_mirror" | sed -r 's#file://(/.*)/\$repo/os/\$arch#\1#g') - in_array "$host_mirror" "${cache_dirs[@]}" || cache_dirs+=("$host_mirror") - fi - done [[ -n $pac_conf ]] && cp "$pac_conf" "$working_dir/etc/pacman.conf" [[ -n $makepkg_conf ]] && cp "$makepkg_conf" "$working_dir/etc/makepkg.conf" @@ -130,7 +121,6 @@ elif [[ $(cat "$working_dir/.arch-chroot") != "$CHROOT_VERSION" ]]; then die "chroot '%s' is not at version %s. Please rebuild." "$working_dir" "$CHROOT_VERSION" fi -build_mount_args copy_hostconf eval "$(grep -a '^CARCH=' "$working_dir/etc/makepkg.conf")" -- 2.24.0

1 4