October 2014 - Arch-projects - lists.archlinux.org

[arch-projects] [mkinitcpio] [PATCH] Add sd-resume hook.
by Ivan Shapovalov 31 Oct '14

31 Oct '14

This depends on the systemd hook. It adds systemd-hibernate-resume@.service and systemd-hibernate-resume-generator which perform userspace parsing of resume= kernel parameter, allowing to specify the resume device by its persistent path ("resume=/dev/disk/by-foo/bar") or fstab-like specifier ("resume=FOO=bar"), just like the root= parameter. --- Given that relevant functionality has just landed in systemd git, it makes sense to pipeline things a bit (even if actual applying will be delayed until systemd-217). Also, does this need to be a separate hook or can be merged into 'systemd' hook itself? install/sd-resume | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 install/sd-resume diff --git a/install/sd-resume b/install/sd-resume new file mode 100644 index 0000000..2995a8e --- /dev/null +++ b/install/sd-resume @@ -0,0 +1,22 @@ +#!/bin/bash + +build() { + map add_binary \ + /usr/lib/systemd/systemd-hibernate-resume \ + /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator + + map add_systemd_unit \ + systemd-hibernate-resume@.service \ + local-fs-pre.target +} + +help() { + cat <<HELPEOF +This hook adds builtin systemd facility for resuming from disk. It allows to +specify the resume device by its persistent path (resume=/dev/disk/by-foo/bar) +or in fstab-like way (resume=FOO=bar), just like it's possible with the root= +parameter. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: -- 2.1.0

3 7

[arch-projects] [devtools] [PATCH 1/2] find-libdeps: cleanup some quoting/array concerns
by Dave Reisner 25 Oct '14

25 Oct '14

--- find-libdeps.in | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/find-libdeps.in b/find-libdeps.in index c9b451e..b40f794 100644 --- a/find-libdeps.in +++ b/find-libdeps.in @@ -32,11 +32,11 @@ else setup_workdir case ${script_mode} in - deps) bsdtar -C $WORKDIR -xf "$1";; - provides) bsdtar -C $WORKDIR -xf "$1" --include="*.so*";; + deps) bsdtar -C "$WORKDIR" -xf "$1";; + provides) bsdtar -C "$WORKDIR" -xf "$1" --include="*.so*";; esac - pushd $WORKDIR >/dev/null + pushd "$WORKDIR" >/dev/null fi process_sofile() { @@ -50,16 +50,16 @@ process_sofile() { if ! in_array "${soname}=${soversion}-${soarch}" ${soobjects[@]}; then # libfoo.so=1-64 echo "${soname}=${soversion}-${soarch}" - soobjects=(${soobjects[@]} "${soname}=${soversion}-${soarch}") + soobjects+=("${soname}=${soversion}-${soarch}") fi } case $script_mode in - deps) find_args="-perm -u+x";; - provides) find_args="-name *.so*";; + deps) find_args=(-perm -u+x);; + provides) find_args=(-name '*.so*');; esac -find . -type f $find_args | while read filename; do +find . -type f "${find_args[@]}" | while read filename; do if [[ $script_mode = "provides" ]]; then # ignore if we don't have a shared object if ! LC_ALL=C readelf -h "$filename" 2>/dev/null | grep -q '.*Type:.*DYN (Shared object file).*'; then -- 2.1.2

1 1

[arch-projects] [devtools] [GIT] The official devtools repository annotated tag 20141024 created. 20141024
by dreisner＠archlinux.org 24 Oct '14

24 Oct '14

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, 20141024 has been created at df8235ae703215cc324eb8fdfb366083433cd288 (tag) tagging 98166e3454139918304b3e0a314e41628dd0c61c (commit) replaces 20140510 tagged by Dave Reisner on Fri Oct 24 09:19:36 2014 -0400 - Log ----------------------------------------------------------------- tag as 20141024 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAABAgAGBQJUSlHrAAoJEB6yY4/1bAxT7bwIAIZT5TrivNAIjYHj8lwYBRcp 6fYD6X1FHYj+EOPfuUHybfVhn9KFtK9KBuYPAHdrptzYAexW0oFehiAKNPW2is9m TPwN7UJ2JpZSHfm4QD86hPmbmFXDLmHWfb/Qin33rANEmQcJZ7Id87xo6V/LHDkK XdSxZBKHG93c9r1uioYi6j9PpqXAE9XA9eHNDlw35TYyp6jXl5JLlrLtajvuRlda FUnWfOxVZgOaVG1feJBVGKsBNYpT15hI9b32FZDhcEuCPitqEpFh/ILvkwpYs6Df hu7Lc0QIT5Yb+Ro/rvLEdadhlYwBJY/i7/y+4E19Uvwk1QYjALUad5FmcXo81bI= =/aUz -----END PGP SIGNATURE----- Dave Reisner (11): common.sh: propagate error through trap_exit nspawn: skip machine registration makechrootpkg: use a simpler/safer expression with eval common: remove unreachable statement makechrootpkg: build as same UID as invoker makechrootpkg: make running namcap a "compile time" choice save and reuse original argv when auto-elevating makechroot: die if we encounter an unexpected option makechrootpkg: don't run namcap if makepkg fails makechrootpkg: treat makepkg_args as array prepare release 20141024 Doug Newgard (1): checkpkg: improve soname checking Luke Shumaker (4): arch-nspawn: Fix a grammar mistake (a/an) in an error message. archbuild: Fix a variable name mistake. ($copydir -> $copy) mkarchroot: Correct "Usage:" text. makechrootpkg: Use the btrfs mountpoint/subvolume check consistently. ----------------------------------------------------------------------- hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20140510-16-g98166e3
by dreisner＠archlinux.org 24 Oct '14

24 Oct '14

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 98166e3454139918304b3e0a314e41628dd0c61c (commit) from 273d5a7a4325b830fc0038abdc7fc8a1bb55bfd9 (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 98166e3454139918304b3e0a314e41628dd0c61c Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Oct 24 09:19:17 2014 -0400 prepare release 20141024 ----------------------------------------------------------------------- Summary of changes: Makefile | 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. 20140510-15-g273d5a7
by dreisner＠archlinux.org 24 Oct '14

24 Oct '14

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 273d5a7a4325b830fc0038abdc7fc8a1bb55bfd9 (commit) via e5fe74102dee0dc1b7343666f3b9d41446e7cf86 (commit) via 28140068ce22cc15fc155570f33e0bdaae22de9c (commit) via bf7dc83bab4f002a29866fd30b1574b6fbca36aa (commit) from cae954ddb5d35877eaaea588b84f932863714568 (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 273d5a7a4325b830fc0038abdc7fc8a1bb55bfd9 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Oct 19 19:49:02 2014 -0400 makechrootpkg: treat makepkg_args as array commit e5fe74102dee0dc1b7343666f3b9d41446e7cf86 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Oct 20 19:13:57 2014 -0400 makechrootpkg: don't run namcap if makepkg fails Fixes a regression introduced by 285a4e94cd, which made namcap a "compile time" option. commit 28140068ce22cc15fc155570f33e0bdaae22de9c Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Oct 19 16:43:13 2014 -0400 makechroot: die if we encounter an unexpected option commit bf7dc83bab4f002a29866fd30b1574b6fbca36aa Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Oct 19 16:06:31 2014 -0400 save and reuse original argv when auto-elevating Fixes FS#42277. ----------------------------------------------------------------------- Summary of changes: arch-nspawn.in | 4 +++- archbuild.in | 6 ++++-- makechrootpkg.in | 27 ++++++++++++++++----------- mkarchroot.in | 4 +++- 4 files changed, 26 insertions(+), 15 deletions(-) hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools] [PATCH 0/4] Resend of 10/19 patchset
by Dave Reisner 23 Oct '14

23 Oct '14

This is a resend of an earlier patch set from 10/19. It's changed in shape and size a bit, but it's all been running locally and building packages for Arch without any problems... Dave Reisner (4): save and reuse original argv when auto-elevating makechroot: die if we encounter an unexpected option makechrootpkg: don't run namcap if makepkg fails makechrootpkg: treat makepkg_args as array arch-nspawn.in | 4 +++- archbuild.in | 6 ++++-- makechrootpkg.in | 27 ++++++++++++++++----------- mkarchroot.in | 4 +++- 4 files changed, 26 insertions(+), 15 deletions(-) -- 2.1.2

1 4

[arch-projects] [devtools] [PATCH 1/2] save and reuse original argv when auto-elevating
by Dave Reisner 19 Oct '14

19 Oct '14

Fixes: https://bugs.archlinux.org/task/42277 --- I'm rejecting the prior patch to fix this [1]. That particular fix comes with the downside that you can no longer even get the usage for these programs without being root. [1] https://lists.archlinux.org/pipermail/arch-projects/2014-May/004159.html arch-nspawn.in | 4 +++- archbuild.in | 6 ++++-- makechrootpkg.in | 6 ++++-- mkarchroot.in | 4 +++- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/arch-nspawn.in b/arch-nspawn.in index b85d360..19f1410 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -26,6 +26,8 @@ usage() { exit 1 } +orig_argv=("$@") + while getopts 'hC:M:c:' arg; do case "$arg" in C) pac_conf="$OPTARG" ;; @@ -38,7 +40,7 @@ done shift $(($OPTIND - 1)) (( $# < 1 )) && die 'You must specify a directory.' -check_root "$0" "$@" +check_root "$0" "${orig_argv[@]}" working_dir=$(readlink -f "$1") shift 1 diff --git a/archbuild.in b/archbuild.in index dc45c7f..9c5d706 100644 --- a/archbuild.in +++ b/archbuild.in @@ -29,6 +29,8 @@ usage() { exit 1 } +orig_argv=("$@") + while getopts 'hcr:' arg; do case "${arg}" in c) clean_first=true ;; @@ -37,11 +39,11 @@ while getopts 'hcr:' arg; do esac done +check_root "$0" "${orig_argv[@]}" + # Pass all arguments after -- right to makepkg makechrootpkg_args+=("${@:$OPTIND}") -check_root "$0" "$@" - if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then msg "Creating chroot for [${repo}] (${arch})..." diff --git a/makechrootpkg.in b/makechrootpkg.in index a340116..8957974 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -66,6 +66,8 @@ usage() { exit 1 } +orig_argv=("$@") + while getopts 'hcur:I:l:nTD:d:' arg; do case "$arg" in h) usage ;; @@ -81,10 +83,10 @@ while getopts 'hcur:I:l:nTD:d:' arg; do esac done -check_root "$0" "$@" - [[ ! -f PKGBUILD && -z "${install_pkgs[*]}" ]] && die 'This must be run in a directory containing a PKGBUILD.' +check_root "$0" "${orig_argv[@]}" + # Canonicalize chrootdir, getting rid of trailing / chrootdir=$(readlink -e "$passeddir") [[ ! -d $chrootdir ]] && die "No chroot dir defined, or invalid path '%s'" "$passeddir" diff --git a/mkarchroot.in b/mkarchroot.in index 5f3d6fe..78384da 100644 --- a/mkarchroot.in +++ b/mkarchroot.in @@ -24,6 +24,8 @@ usage() { exit 1 } +orig_argv=("$@") + while getopts 'hC:M:c:' arg; do case "$arg" in C) pac_conf="$OPTARG" ;; @@ -37,7 +39,7 @@ shift $(($OPTIND - 1)) (( $# < 2 )) && die 'You must specify a directory and one or more packages.' -check_root "$0" "$@" +check_root "$0" "${orig_argv[@]}" working_dir="$(readlink -f $1)" shift 1 -- 2.1.2

2 2

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20140510-11-gcae954d
by dreisner＠archlinux.org 02 Oct '14

02 Oct '14

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 cae954ddb5d35877eaaea588b84f932863714568 (commit) via 285a4e94cdee62cae155abcec4daeeffd709e900 (commit) via a78bdb841dbe7839c8afd7184d821ed42dd334cc (commit) from 12a1300694272928e70408f4ce2fe85bacd19eb4 (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 cae954ddb5d35877eaaea588b84f932863714568 Author: Doug Newgard <scimmia(a)archlinux.info> Date: Sun Sep 21 16:21:18 2014 -0500 checkpkg: improve soname checking This makes soname checking much more robust and is explicit when a soname change is found. commit 285a4e94cdee62cae155abcec4daeeffd709e900 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Sep 23 07:57:43 2014 -0400 makechrootpkg: make running namcap a "compile time" choice We don't need to pass _chrootbuild this information at runtime -- we can just generate the build script to do exactly what we want. commit a78bdb841dbe7839c8afd7184d821ed42dd334cc Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Sep 21 15:03:28 2014 -0400 makechrootpkg: build as same UID as invoker Changing UID to that of 'nobody' is arbitrary at best, and an information leak at worst. Let's just drop back to the same UID of the invoker. ----------------------------------------------------------------------- Summary of changes: checkpkg.in | 11 +++++------ makechrootpkg.in | 48 +++++++++++++++++++++++++++--------------------- 2 files changed, 32 insertions(+), 27 deletions(-) hooks/post-receive -- The official devtools repository

1 0