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

[arch-projects] [devtools] [PATCH 1/1] arch-nspawn: get all mirrors from host
by Christian Hesse 22 Mar '19

22 Mar '19

From: Christian Hesse <mail(a)eworm.de> Now that pacconf gives us all mirrors we can use them, instead of just the first one. Signed-off-by: Christian Hesse <mail(a)eworm.de> --- arch-nspawn.in | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/arch-nspawn.in b/arch-nspawn.in index b9c846e..661bbbd 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -60,17 +60,19 @@ fi pacconf_cmd=$(command -v pacman-conf || command -v pacconf) # shellcheck disable=2016 -host_mirror=$($pacconf_cmd --repo extra Server 2> /dev/null | head -1 | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#') +host_mirrors=($($pacconf_cmd --repo extra Server 2> /dev/null | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#')) # shellcheck disable=2016 -[[ $host_mirror == *file://* ]] && host_mirror_path=$(echo "$host_mirror" | sed -r 's#file://(/.*)/\$repo/os/\$arch#\1#g') # {{{ functions build_mount_args() { declare -g mount_args=() - if [[ -n $host_mirror_path ]]; then - mount_args+=("--bind-ro=$host_mirror_path") - fi + 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]}") @@ -81,7 +83,10 @@ build_mount_args() { copy_hostconf () { cp -a /etc/pacman.d/gnupg "$working_dir/etc/pacman.d" - echo "Server = $host_mirror" >"$working_dir/etc/pacman.d/mirrorlist" + + for host_mirror in "${host_mirrors[@]}"; do + echo "Server = $host_mirror" + done >"$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"

1 1

[arch-projects] [netctl] [PATCH] Makefile: specify the correct shell to use
by Eli Schwartz 27 Jan '19

27 Jan '19

The Makefile commands in use include bash-specific features like brace expansion, and thus cannot run under the default /bin/sh shell as that may or may not be GNU bash (bash supports brace expansion even in posix mode). Consequently, the Makefile failed to execute correctly when the system /bin/sh was a different sh implementation, such as dash or busybox ash. Fix this by declaring the SHELL which will be used when running all commands. --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 716bb15..60af032 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,8 @@ export VERSION = 1.19 PKG_CONFIG ?= pkg-config +SHELL=/bin/bash + sd_var = $(shell $(PKG_CONFIG) --variable=systemd$(1) systemd) systemdsystemconfdir = $(call sd_var,systemconfdir) systemdsystemunitdir = $(call sd_var,systemunitdir) @@ -64,4 +66,3 @@ upload: netctl-$(VERSION).tar.xz clean: $(MAKE) -C docs clean -@rm -vf netctl-*.tar.xz{,.sig} PKGBUILD netctl.install - -- 2.20.1

2 1

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20180531-7-g65b50da
by Levente Polyak 22 Jan '19

22 Jan '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 discards 450e6af53b9e429b894a4b04b03d45ddae1a9786 (commit) via 65b50dac40fff6032e8e6a28a2b7bf0a6482bf2e (commit) via 799376904de77c2fb862fc559c60489b37e72232 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (450e6af53b9e429b894a4b04b03d45ddae1a9786) \ N -- N -- N (65b50dac40fff6032e8e6a28a2b7bf0a6482bf2e) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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 65b50dac40fff6032e8e6a28a2b7bf0a6482bf2e Author: Levente Polyak <anthraxx(a)archlinux.org> Date: Tue Jan 22 02:17:56 2019 +0100 ci: adding travis support for basic check commit 799376904de77c2fb862fc559c60489b37e72232 Author: Levente Polyak <anthraxx(a)archlinux.org> Date: Tue Jan 22 03:10:08 2019 +0100 find-libdeps: in functions use return instead of continue to abort Even if continue would work, it does exactly the same as a return in the way this function is being used. ----------------------------------------------------------------------- Summary of changes: .travis.yml | 6 ++++-- find-libdeps.in | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20180531-6-g450e6af
by Levente Polyak 22 Jan '19

22 Jan '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 450e6af53b9e429b894a4b04b03d45ddae1a9786 (commit) from 8310abb3485bdf63fc3557e3020a43f9f9e03927 (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 450e6af53b9e429b894a4b04b03d45ddae1a9786 Author: Levente Polyak <anthraxx(a)archlinux.org> Date: Tue Jan 22 02:17:56 2019 +0100 ci: adding travis support for basic check ----------------------------------------------------------------------- Summary of changes: .travis.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .travis.yml hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20180531-5-g8310abb
by Levente Polyak 22 Jan '19

22 Jan '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 8310abb3485bdf63fc3557e3020a43f9f9e03927 (commit) from 7b095250030dd85684226a6191d739d2f04424a3 (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 8310abb3485bdf63fc3557e3020a43f9f9e03927 Author: Erich Eckner <git(a)eckner.net> Date: Wed Jun 27 09:05:43 2018 +0200 remove empty tree if "--verifysource" failed makechrootpkg's download_sources() leaves a stray directory if "makepkg --verifysource" failed. We use "setup_workdir" instead of "mktemp -d", because this ensures the correct garbage collection. Signed-off-by: Erich Eckner <git(a)eckner.net> ----------------------------------------------------------------------- Summary of changes: makechrootpkg.in | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20180531-4-g7b09525
by Levente Polyak 22 Jan '19

22 Jan '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 7b095250030dd85684226a6191d739d2f04424a3 (commit) from e9102b2ad84964cd826a63e0de605828e0528261 (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 7b095250030dd85684226a6191d739d2f04424a3 Author: Morten Linderud <foxboron(a)archlinux.org> Date: Fri Dec 21 23:06:18 2018 +0100 Expand check_root keepenv variables Les us source makepkg.conf settings from the environemnt. This also includes `GNUPGHOME` which is present in `makechrootpkg`, but not included in archbuild. Signed-off-by: Morten Linderud <foxboron(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: archbuild.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 branch master updated. 20180531-3-ge9102b2
by Levente Polyak 22 Jan '19

22 Jan '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 e9102b2ad84964cd826a63e0de605828e0528261 (commit) via 99969c67a9ef5ff0a49de5f4fa7a358d35518b1c (commit) via 05c81038e5d01962221e5fe2901813dbfba0f864 (commit) from 6364b3c9b9fae2b43bf3e02b9e84c814fc3f502f (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 e9102b2ad84964cd826a63e0de605828e0528261 Author: Jelle van der Waa <jelle(a)vdwaa.nl> Date: Sun Sep 9 21:02:45 2018 +0200 doc: add find-libprovides man page commit 99969c67a9ef5ff0a49de5f4fa7a358d35518b1c Author: Jelle van der Waa <jelle(a)vdwaa.nl> Date: Sun Sep 9 21:02:44 2018 +0200 doc: Add checkpkg man page commit 05c81038e5d01962221e5fe2901813dbfba0f864 Author: Jelle van der Waa <jelle(a)vdwaa.nl> Date: Sun Sep 9 21:02:43 2018 +0200 doc: Add lddd man page ----------------------------------------------------------------------- Summary of changes: .gitignore | 1 + Makefile | 23 +++++++++++++++++++++-- doc/asciidoc.conf | 37 +++++++++++++++++++++++++++++++++++++ doc/checkpkg.1.asciidoc | 27 +++++++++++++++++++++++++++ doc/find-libprovides.1.asciidoc | 24 ++++++++++++++++++++++++ doc/footer.asciidoc | 28 ++++++++++++++++++++++++++++ doc/lddd.1.asciidoc | 25 +++++++++++++++++++++++++ 7 files changed, 163 insertions(+), 2 deletions(-) create mode 100644 doc/asciidoc.conf create mode 100644 doc/checkpkg.1.asciidoc create mode 100644 doc/find-libprovides.1.asciidoc create mode 100644 doc/footer.asciidoc create mode 100644 doc/lddd.1.asciidoc hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [pyalpm] [PATCH] Rename function to match renamed name in pacman master
by Eli Schwartz 18 Jan '19

18 Jan '19

alpm_sync_newversion becomes alpm_sync_get_new_version and changes behavior slightly. See for details: https://git.archlinux.org/pacman.git/commit/?id=e9d91a688d1a2ebe58e8a895853… --- DO NOT MERGE THIS until after pacman 5.2 or 6 is released. pacman does not have any good preprocessor check for this -- the only way to handle both methods would be to implement some sort of test in setup.py and create a DEFINE based on that. Posted here in order to be prepared, though I wouldn't mind having it exist in the pyalpm repo in a "pacman-git" branch. ;) src/db.c | 4 ++-- src/db.h | 2 +- src/pyalpm.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/db.c b/src/db.c index 3015d61..f6c5da4 100644 --- a/src/db.c +++ b/src/db.c @@ -304,7 +304,7 @@ PyObject* pyalpm_find_grp_pkgs(PyObject* self, PyObject *args) { } /** Finds an available upgrade for a package in a list of databases */ -PyObject* pyalpm_sync_newversion(PyObject *self, PyObject* args) { +PyObject* pyalpm_sync_get_new_version(PyObject *self, PyObject* args) { PyObject *pkg; PyObject *dbs; alpm_list_t *db_list; @@ -320,7 +320,7 @@ PyObject* pyalpm_sync_newversion(PyObject *self, PyObject* args) { { alpm_pkg_t *rawpkg = pmpkg_from_pyalpm_pkg(pkg); if (rawpkg) { - result = alpm_sync_newversion(rawpkg, db_list); + result = alpm_sync_get_new_version(rawpkg, db_list); } alpm_list_free(db_list); } diff --git a/src/db.h b/src/db.h index 4ed02e6..be35b78 100644 --- a/src/db.h +++ b/src/db.h @@ -29,6 +29,6 @@ PyObject *pyalpm_db_from_pmdb(void* data); int pylist_db_to_alpmlist(PyObject *list, alpm_list_t **result); PyObject* pyalpm_find_grp_pkgs(PyObject* self, PyObject* args); -PyObject* pyalpm_sync_newversion(PyObject *self, PyObject* args); +PyObject* pyalpm_sync_get_new_version(PyObject *self, PyObject* args); #endif diff --git a/src/pyalpm.c b/src/pyalpm.c index 56c9639..7391191 100644 --- a/src/pyalpm.c +++ b/src/pyalpm.c @@ -87,7 +87,7 @@ static PyMethodDef methods[] = { "args: a list of packages, a dependency string\n" "returns: a Package object or None" }, - {"sync_newversion", pyalpm_sync_newversion, METH_VARARGS, + {"sync_newversion", pyalpm_sync_get_new_version, METH_VARARGS, "finds an available upgrade for a package in a list of databases\n" "args: a package, a list of databases\n" "returns: an upgrade candidate or None" }, -- 2.20.1

2 2

[arch-projects] [devtools] [PATCH 1/2] arch-nspawn, mkarchroot: Allow not sharing the cache directories.
by Maarten de Vries 17 Jan '19

17 Jan '19

These patches make it possible to build withouth a shared pacman cache using makechrootpkg. I need this myself because I'm building packages for different repositories where some of them contain packages with the same name, but different compile time configuration. It also allows building packages for different Arch based distros on the same host more easily. The first patch changes arch-nspawn and mkarchroot to accept `-c -` to disable bind mounting the host pacman cache in the container. The container will simply use whatever is configured in the container instead. The second patch allows the user set the pacman cache for makechrootpkg. Sadly -c was already taken, so here it's -C. The end result is that a user can run the following to build without a shared pacman cache: `makechrootpkg -C - -r $chroot` I considered a more generic -N ... to pass arguments to arch-nspawn, but arch-nspawn doesn't have that many options and it would get quite ugly: makechrootpkg -N -c -N - -r $chroot Signed-off-by: Maarten de Vries <maarten(a)de-vri.es> --- arch-nspawn.in | 12 +++++++++--- mkarchroot.in | 4 +++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/arch-nspawn.in b/arch-nspawn.in index b9c846e..c6cc3a4 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -52,7 +52,9 @@ shift 1 [[ -z $working_dir ]] && die 'Please specify a working directory.' -if [[ -z $cache_dir ]]; then +if [[ $cache_dir = '-' ]]; then + cache_dirs=() +elif [[ -z $cache_dir ]]; then cache_dirs=($(pacman -v 2>&1 | grep '^Cache Dirs:' | sed 's/Cache Dirs:\s*//g')) else cache_dirs=("$cache_dir") @@ -72,7 +74,9 @@ build_mount_args() { mount_args+=("--bind-ro=$host_mirror_path") fi - mount_args+=("--bind=${cache_dirs[0]}") + if [[ ${#cache_dirs[@]} -ge 1 ]]; then + mount_args+=("--bind=${cache_dirs[0]}") + fi for cache_dir in "${cache_dirs[@]:1}"; do mount_args+=("--bind-ro=$cache_dir") @@ -92,7 +96,9 @@ copy_hostconf () { cp -T "$file" "$working_dir$file" done - sed -r "s|^#?\\s*CacheDir.+|CacheDir = ${cache_dirs[*]}|g" -i "$working_dir/etc/pacman.conf" + if [[ ${#cache_dirs[@]} -ge 1 ]]; then + sed -r "s|^#?\\s*CacheDir.+|CacheDir = ${cache_dirs[*]}|g" -i "$working_dir/etc/pacman.conf" + fi } # }}} diff --git a/mkarchroot.in b/mkarchroot.in index 52e363f..81bc58a 100644 --- a/mkarchroot.in +++ b/mkarchroot.in @@ -51,7 +51,9 @@ shift 1 [[ -z $working_dir ]] && die 'Please specify a working directory.' -if [[ -z $cache_dir ]]; then +if [[ $cache_dir = '-' ]]; then + cache_dirs=() +elif [[ -z $cache_dir ]]; then cache_dirs=($(pacman -v "$cache_conf" 2>&1 | grep '^Cache Dirs:' | sed 's/Cache Dirs:\s*//g')) else cache_dirs=(${cache_dir}) -- 2.20.1

3 9

[arch-projects] [dbscripts] [GIT] Official repo DB scripts annotated tag 20190113 created. 20190113
by eschwartz＠archlinux.org 13 Jan '19

13 Jan '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 "Official repo DB scripts". The annotated tag, 20190113 has been created at 7aa40fa976c8f51c03095619782a905e992f1157 (tag) tagging f2e8d57e7fde40fd5a3e80e1f152ae850ac3c369 (commit) replaces 20190111-2 tagged by Eli Schwartz on Sun Jan 13 18:08:38 2019 -0500 - Log ----------------------------------------------------------------- The other release which also fixed brokenness. -----BEGIN PGP SIGNATURE----- iQJMBAABCgA2FiEEYEETBMCdNmKDQO7/zrFn77VyK9YFAlw7xUMYHGVzY2h3YXJ0 ekBhcmNobGludXgub3JnAAoJEM6xZ++1civWSXEP/AwFXhbNLxkBNIQ0oLQ+VZ1s C4UgPOhQLgnbXeiWm/pP8EsjDVBi7rK4s/0HiVeB6nxzHV29GZSP7Sb89GZ3zFTv URvpC3YskjTJzrbY5/GtskuuxQflw7TPWgQuyl+zX0elrHn+ciLilhQn4KyWFWON NslXI/PQz06IkpyP1LFrHJwbsG2yP49kQNFU8ovPv1DruiUOpqwVn8j5SF+NK3uC wiu6L2LFgSIJ5f7s42VvTY8aEsocDQexfJl9MKr0q5tk3qNKPODxNZDBqr/WFZGY cWMgXTElq7qwtygnmSH3EKbadzyaj1Lm8wPvciE8ruIRa9Sq8ajPG11aO9AFo4ra U5RAuDgpnHMcmihUPd/7XdWxvK7pV85e8VlzBkR3fROaxpSJNQdB8o9yanH/l2pW JC1DjtN62AAAy2wd+qzBrwlp9jXimC+eV7YdBBnp5TojF6j9ARO4gnN18q6JCWzL 9rOdkMuqO53GZGSIlHkfnvHjrq7+2Nsep1+I+Jy4kJnei5TDvwyIvBcLGBTIxJh/ ThGmPtPHh2nDYiap5tC7OM3n44FfBRe4hTjNlWNbyCbzNzXxld0iATBXtw6cApD/ EykpdwB5lfjo6GakB5r2gT8Z+CkqBwhqgAZGmk7ZFDB0gDQNmm4Dkuo1mNR77yhX 5tBH+sg8AJ/igJUlSMFj =ss0k -----END PGP SIGNATURE----- Eli Schwartz (1): Handle split packages properly in staging repos check. ----------------------------------------------------------------------- hooks/post-receive -- Official repo DB scripts

1 0