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

[arch-projects] [namcap] [PATCH] Remove all trailing whitespace
by James Harvey 27 May '19

27 May '19

1 0

Re: [arch-projects] [netctl][PATCH] Move away from using wpa_actiond
by Emil Velikov 16 May '19

16 May '19

Hi team, On Sat, 9 Feb 2019 at 09:19, Thomas Bächler <thomas.baechler(a)gmx.de> wrote: > > Am 8. Februar 2019 20:17:52 MEZ schrieb Jouke Witteveen <j.witteveen(a)gmail.com>: > >On Fri, Feb 8, 2019 at 3:36 PM Emil Velikov <emil.l.velikov(a)gmail.com> > >wrote: > >> > >> On Thu, 7 Feb 2019 at 14:50, Jouke Witteveen via arch-projects > >> <arch-projects(a)archlinux.org> wrote: > >> > > >> > The same functionality is provided by wpa_supplicant, so we do not > >need > >> > an extra and Arch Linux specific dependency. > >> > >> The introduction of wpa_actiond [1] hints there are issues with > >wpa_cli. Namely: > >> - partial or missing logging capabilities > >> - race conditions > >> > >> Sadly I don't know much more about this. It'll be great if can use > >> wpa_cli, while not introducing new issues. > >> > >> -Emil > >> > >> [1] > >https://git.archlinux.org/wpa_actiond.git/commit/?id=c5c587771403d31ab4538e… > > > >Thanks! This detective work is highly appreciated! For some reason I > >had assumed wpa_cli would have gained this functionality only after > >wpa_actiond came into existence. This couldn't really explain why both > >use the same parameter names though... > >I wonder if the issues with wpa_cli have been taken upstream. In my > >experience, the maintainer of wpa_supplicant is very pleasant to work > >with. > > > >autowifi and, later, wpa_actiond are important parts of the history of > >netctl, but I tend to give over 10 years of development in > >wpa_supplicant the benefit of the doubt. This means I would like to > >try to move away from wpa_actiond anyway. Currently, except from those > >using wpa_actiond directly, I think netctl is the only user of > >wpa_actiond. > > > >@Thomas: do you have an oppinion in these matters? > > > >Thanks, > >- Jouke > > I honestly don't remember why wpa_cli was insufficient at the time and why I wrote wpa_actiond. That must have been way over 10 years ago. I just remember that my first attempt used wpa_cli, and something obvious was missing. After a bit of debugging I've noticed the move to wpa_cli broke my setup. Namely: wpa_cli does not reliably detect when the laptop resumes into another wireless network. Issue happens fairly intermittently - from once a week to multiple times a day - yet I have not seen it even once in the years of using wpa_actiond. Should I file a archlinux bug report, any suggestions how to proceed? Thanks Emil

2 2

[arch-projects] [devtools] [PATCH] Revert "makechrootpkg: sync_chroot: Make more general."
by Eli Schwartz 10 May '19

10 May '19

This reverts commit 6d1992909cc46e293027ff488ae2632047603e66. It has never worked. In commit c86823a2d4a4152c71faa1c3bab227756232996f it was noted that it compared the device numbers for [[ $1 = $1 ]] which was a useless check and always returned true, for *any* btrfs filesystem. Now that the function is corrected to compare [[ $1 = $2 ]] the check is still useless, but this time because it always returns false -- btrfs subvolumes on the same filesystem do *not* share device numbers. So let's go back to the original working implementation that only matters in terms of makechrootpkg, and just checks if makechrootpkg's root working directory is btrfs (in which case we know it will be a subvolume because mkarchroot will create it that way). This restores our special support for the btrfs filesystem. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- lib/archroot.sh | 8 -------- makechrootpkg.in | 32 +++++++++++++------------------- 2 files changed, 13 insertions(+), 27 deletions(-) diff --git a/lib/archroot.sh b/lib/archroot.sh index 2c03c82..06d4519 100644 --- a/lib/archroot.sh +++ b/lib/archroot.sh @@ -37,14 +37,6 @@ is_subvolume() { [[ -e "$1" && "$(stat -f -c %T "$1")" == btrfs && "$(stat -c %i "$1")" == 256 ]] } -## -# usage : is_same_fs( $path_a, $path_b ) -# return : whether $path_a and $path_b are on the same filesystem -## -is_same_fs() { - [[ "$(stat -c %d "$1")" == "$(stat -c %d "$2")" ]] -} - ## # usage : subvolume_delete_recursive( $path ) # diff --git a/makechrootpkg.in b/makechrootpkg.in index dc647b3..52e834b 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -75,37 +75,31 @@ load_vars() { return 0 } -# Usage: sync_chroot $rootdir $copydir [$copy] +# Usage: sync_chroot $chrootdir $copydir [$copy] sync_chroot() { - local rootdir=$1 + local chrootdir=$1 local copydir=$2 local copy=${3:-$2} - if [[ "$rootdir" -ef "$copydir" ]]; then + if [[ "$chrootdir/root" -ef "$copydir" ]]; then error 'Cannot sync copy with itself: %s' "$copydir" return 1 fi # Get a read lock on the root chroot to make # sure we don't clone a half-updated chroot - slock 8 "$rootdir.lock" \ - "Locking clean chroot [%s]" "$rootdir" - - stat_busy "Synchronizing chroot copy [%s] -> [%s]" "$rootdir" "$copy" - if is_subvolume "$rootdir" && is_same_fs "$rootdir" "$(dirname -- "$copydir")" && ! mountpoint -q "$copydir"; then - if is_subvolume "$copydir"; then - subvolume_delete_recursive "$copydir" || - die "Unable to delete subvolume %s" "$copydir" - else - # avoid change of filesystem in case of an umount failure - rm --recursive --force --one-file-system "$copydir" || - die "Unable to delete %s" "$copydir" - fi - btrfs subvolume snapshot "$rootdir" "$copydir" >/dev/null || + slock 8 "$chrootdir/root.lock" \ + "Locking clean chroot [%s]" "$chrootdir/root" + + stat_busy "Synchronizing chroot copy [%s] -> [%s]" "$chrootdir/root" "$copy" + if is_btrfs "$chrootdir" && ! mountpoint -q "$copydir"; then + subvolume_delete_recursive "$copydir" || + die "Unable to delete subvolume %s" "$copydir" + btrfs subvolume snapshot "$chrootdir/root" "$copydir" >/dev/null || die "Unable to create subvolume %s" "$copydir" else mkdir -p "$copydir" - rsync -a --delete -q -W -x "$rootdir/" "$copydir" + rsync -a --delete -q -W -x "$chrootdir/root/" "$copydir" fi stat_done @@ -388,7 +382,7 @@ main() { lock 9 "$copydir.lock" "Locking chroot copy [%s]" "$copy" if [[ ! -d $copydir ]] || $clean_first; then - sync_chroot "$chrootdir/root" "$copydir" "$copy" + sync_chroot "$chrootdir" "$copydir" "$copy" fi $update_first && arch-nspawn "$copydir" \ -- 2.21.0

1 0

[arch-projects] [devtools] [PATCH] Remove finddeps tool
by Jelle van der Waa 06 May '19

06 May '19

From: Jelle van der Waa <jelle(a)vdwaa.nl> finddeps depends on a no longer existing ABS tree. This data can also be queried via archweb. --- .gitignore | 1 - Makefile | 1 - finddeps.in | 41 ----------------------------------------- zsh_completion.in | 6 +----- 4 files changed, 1 insertion(+), 48 deletions(-) delete mode 100644 finddeps.in diff --git a/.gitignore b/.gitignore index b63587b..49afce6 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,6 @@ archrelease bash_completion checkpkg commitpkg -finddeps lddd makechrootpkg mkarchroot diff --git a/Makefile b/Makefile index ba2d3e4..15c2786 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,6 @@ IN_PROGS = \ archrelease \ archbuild \ lddd \ - finddeps \ rebuildpkgs \ find-libdeps \ crossrepomove\ diff --git a/finddeps.in b/finddeps.in deleted file mode 100644 index 2a085e5..0000000 --- a/finddeps.in +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash -# -# finddeps - find packages that depend on a given depname -# -# License: Unspecified - -m4_include(lib/common.sh) - -match=$1 - -if [[ -z $match ]]; then - echo 'Usage: finddeps <depname>' - echo '' - echo 'Find packages that depend on a given depname.' - echo 'Run this script from the top-level directory of your ABS tree.' - echo '' - exit 1 -fi - -find . -type d | while read -r d; do - if [[ -f "$d/PKGBUILD" ]]; then - pkgname=() depends=() makedepends=() optdepends=() - # shellcheck source=PKGBUILD.proto - . "$d/PKGBUILD" - for dep in "${depends[@]}"; do - # lose the version comparator, if any - depname=${dep%%[<>=]*} - [[ $depname = "$match" ]] && echo "$d (depends)" - done - for dep in "${makedepends[@]}"; do - # lose the version comparator, if any - depname=${dep%%[<>=]*} - [[ $depname = "$match" ]] && echo "$d (makedepends)" - done - for dep in "${optdepends[@]/:*}"; do - # lose the version comaparator, if any - depname=${dep%%[<>=]*} - [[ $depname = "$match" ]] && echo "$d (optdepends)" - done - fi -done diff --git a/zsh_completion.in b/zsh_completion.in index 45429bd..5f2111f 100644 --- a/zsh_completion.in +++ b/zsh_completion.in @@ -1,4 +1,4 @@ -#compdef archbuild archco arch-nspawn archrelease commitpkg finddeps makechrootpkg mkarchroot rebuildpkgs extrapkg=commitpkg corepkg=commitpkg testingpkg=commitpkg stagingpkg=commitpkg communitypkg=commitpkg community-testingpkg=commitpkg community-stagingpkg=commitpkg multilibpkg=commitpkg multilib-testingpkg=commitpkg extra-x86_64-build=archbuild testing-x86_64-build=archbuild staging-x86_64-build=archbuild multilib-build=archbuild multilib-testing-build=archbuild multilib-staging-build=archbuild kde-unstable-x86_64-build=archbuild gnome-unstable-x86_64-build=archbuild communityco=archco +#compdef archbuild archco arch-nspawn archrelease commitpkg makechrootpkg mkarchroot rebuildpkgs extrapkg=commitpkg corepkg=commitpkg testingpkg=commitpkg stagingpkg=commitpkg communitypkg=commitpkg community-testingpkg=commitpkg community-stagingpkg=commitpkg multilibpkg=commitpkg multilib-testingpkg=commitpkg extra-x86_64-build=archbuild testing-x86_64-build=archbuild staging-x86_64-build=archbuild multilib-build=archbuild multilib-testing-build=archbuild multilib-staging-build=archbuild kde-unstable-x86_64-build=archbuild gnome-unstable-x86_64-build=archbuild communityco=archco # License: Unspecified m4_include(lib/valid-tags.sh) @@ -29,10 +29,6 @@ _commitpkg_args=( '1:commit_msg' ) -_finddeps_args=( - '1:packages:_devtools_completions_all_packages' -) - _makechrootpkg_args=( '-I[Install a package into the working copy]:target:_files -g "*.pkg.tar.*(.)"' '-c[Clean the chroot before building]' -- 2.21.0

3 4