- Arch-projects - lists.archlinux.org

[arch-projects] [devtools] [PATCH] Makefile: Add common library to build dependencies
by Lukas Fleischer 02 Nov '11

02 Nov '11

Add "lib/common.sh" to the build dependencies of our scripts to ensure everything gets rebuilt when we modify a common function. Also, add "Makefile" itself to enforce a rebuild if the edit command changes. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 86b1fcd..37be15a 100644 --- a/Makefile +++ b/Makefile @@ -52,7 +52,7 @@ all: $(BINPROGS) $(SBINPROGS) bash_completion zsh_completion edit = sed -e "s|@pkgdatadir[@]|$(DESTDIR)$(PREFIX)/share/devtools|g" -%: %.in +%: %.in Makefile lib/common.sh @echo "GEN $@" @m4 -P $@.in | $(edit) >$@ @chmod a-w "$@" -- 1.7.7.2

1 0

[arch-projects] [devtools] [PATCH 1/2] lib/common.sh: Use double brackets
by Lukas Fleischer 02 Nov '11

02 Nov '11

Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- lib/common.sh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/common.sh b/lib/common.sh index feb5080..e826e97 100644 --- a/lib/common.sh +++ b/lib/common.sh @@ -58,14 +58,14 @@ stat_done() { } setup_workdir() { - [ -z "$WORKDIR" ] && WORKDIR=$(mktemp -d /tmp/$(basename $0).XXXXXXXXXX) + [[ -z $WORKDIR ]] && WORKDIR=$(mktemp -d /tmp/$(basename $0).XXXXXXXXXX) } cleanup() { trap - EXIT INT QUIT TERM - [ -n "$WORKDIR" ] && rm -rf "$WORKDIR" - [ "$1" ] && exit $1 + [[ -n $WORKDIR ]] && rm -rf "$WORKDIR" + [[ $1 ]] && exit $1 } abort() { -- 1.7.7.2

1 1

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository branch master updated. 0.7.5-2-g7eb9355
by dreisner＠archlinux.org 02 Nov '11

02 Nov '11

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 mkinitcpio repository". The branch, master has been updated via 7eb9355b98ffb5e47b0b1cdc524ff4679cd77327 (commit) from cb67917fbfaf268316f3c56c804dacb0bd272fd7 (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 7eb9355b98ffb5e47b0b1cdc524ff4679cd77327 Author: Tom Gundersen <teg(a)jklm.no> Date: Sat Oct 29 14:04:30 2011 +0200 add_symlink: fix argument ordering and add_dir call Two bugs: operands were swapped in call to _add_symlink, and missing operand in call to _add_dir. Signed-off-by: Tom Gundersen <teg(a)jklm.no> ----------------------------------------------------------------------- Summary of changes: functions | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- The official mkinitcpio repository

1 0

[arch-projects] [devtools][PATCH] Capitalize output messages
by Eric Bélanger 02 Nov '11

02 Nov '11

Some of the output/error messages were capitalized, some were not. This patch capitalize everything for consistency sake. Other minor changes were done to the messages like removing the superfluous "error:" from die messages and adding a final period to messages that were complete sentences as appropriate. Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- archco.in | 2 +- archrelease.in | 4 ++-- commitpkg.in | 22 +++++++++++----------- find-libdeps.in | 2 +- makechrootpkg.in | 6 +++--- mkarchroot.in | 16 ++++++++-------- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/archco.in b/archco.in index a1e5f96..be026b1 100644 --- a/archco.in +++ b/archco.in @@ -15,7 +15,7 @@ case $scriptname in communityco) SVNURL="svn+ssh://aur.archlinux.org/srv/svn-packages";; *) - die "error: couldn't find svn url for $scriptname" + die "Couldn't find svn url for $scriptname" ;; esac diff --git a/archrelease.in b/archrelease.in index 6fccfc9..40b6c09 100644 --- a/archrelease.in +++ b/archrelease.in @@ -36,7 +36,7 @@ for file in "${known_files[@]}"; do done for tag in "$@"; do - stat_busy "copying ${trunk} to ${tag}" + stat_busy "Copying ${trunk} to ${tag}" if [[ -d repos/$tag ]]; then declare -a trash @@ -56,7 +56,7 @@ for tag in "$@"; do stat_done done -stat_busy "releasing package" +stat_busy "Releasing package" printf -v tag_list ", %s" "$@"; tag_list="${tag_list#, }" svn commit -q -m "archrelease: copy ${trunk} to $tag_list" || abort stat_done diff --git a/commitpkg.in b/commitpkg.in index d7f7513..2dc9f19 100644 --- a/commitpkg.in +++ b/commitpkg.in @@ -4,9 +4,9 @@ m4_include(lib/common.sh) getpkgfile() { if [[ ${#} -ne 1 ]]; then - die 'ERROR: No canonical package found!' + die 'No canonical package found!' elif [ ! -f "${1}" ]; then - die "ERROR: Package ${1} not found!" + die "Package ${1} not found!" fi echo ${1} @@ -83,15 +83,15 @@ while getopts ':l:a:' flag; do case $flag in l) rsyncopts+=("--bwlimit=$2") ;; a) commit_arch=$2 ;; - :) die "option requires an argument -- '$OPTARG'" ;; - \?) die "invalid option -- '$OPTARG'" ;; + :) die "Option requires an argument -- '$OPTARG'" ;; + \?) die "Invalid option -- '$OPTARG'" ;; esac done shift $(( OPTIND - 1 )) if [ -n "$(svn status -q)" ]; then if [ -n "$1" ]; then - stat_busy 'committing changes to trunk' + stat_busy 'Committing changes to trunk' svn commit -q -m "${msgtemplate}${1}" || die stat_done else @@ -108,7 +108,7 @@ if [ -n "$(svn status -q)" ]; then vi "$msgfile" fi [ -s "$msgfile" ] || die - stat_busy 'committing changes to trunk' + stat_busy 'Committing changes to trunk' svn commit -q -F "$msgfile" || die unlink "$msgfile" stat_done @@ -164,26 +164,26 @@ else fi if [[ ${#uploads[*]} -gt 0 ]]; then - msg 'uploading all package and signature files' + msg 'Uploading all package and signature files' rsync "${rsyncopts[@]}" "${uploads[@]}" "$server:staging/$repo/" || die fi if [ "${arch[*]}" == 'any' ]; then if [ -d ../repos/$repo-i686 -a -d ../repos/$repo-x86_64 ]; then pushd ../repos/ >/dev/null - stat_busy "removing $repo-i686 and $repo-x86_64" + stat_busy "Removing $repo-i686 and $repo-x86_64" svn rm $repo-i686 svn rm $repo-x86_64 - svn commit -q -m "removed $repo-i686 and $repo-x86_64 for $pkgname" + svn commit -q -m "Removed $repo-i686 and $repo-x86_64 for $pkgname" stat_done popd >/dev/null fi else if [ -d ../repos/$repo-any ]; then pushd ../repos/ >/dev/null - stat_busy "removing $repo-any" + stat_busy "Removing $repo-any" svn rm $repo-any - svn commit -q -m "removed $repo-any for $pkgname" + svn commit -q -m "Removed $repo-any for $pkgname" stat_done popd >/dev/null fi diff --git a/find-libdeps.in b/find-libdeps.in index 3f44903..efd9bf3 100644 --- a/find-libdeps.in +++ b/find-libdeps.in @@ -15,7 +15,7 @@ script_mode=${0##*/find-lib} case $script_mode in deps|provides) true;; - *) die "unknown mode $script_mode" ;; + *) die "Unknown mode $script_mode" ;; esac if [[ -z $1 ]]; then diff --git a/makechrootpkg.in b/makechrootpkg.in index ed71c1c..d128ff4 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -114,7 +114,7 @@ umask 0022 # Note this is the same FD number as in mkarchroot exec 9>"$copydir.lock" if ! flock -n 9; then - stat_busy "locking chroot copy '$copy'" + stat_busy "Locking chroot copy '$copy'" flock 9 stat_done fi @@ -125,12 +125,12 @@ if [[ ! -d $copydir ]] || $clean_first; then exec 8>"$chrootdir/root.lock" if ! flock -sn 8; then - stat_busy "locking clean chroot" + stat_busy "Locking clean chroot" flock -s 8 stat_done fi - stat_busy 'creating clean working copy' + stat_busy 'Creating clean working copy' use_rsync=false if type -P btrfs >/dev/null; then [[ -d $copydir ]] && btrfs subvolume delete "$copydir" &>/dev/null diff --git a/mkarchroot.in b/mkarchroot.in index 9361bef..6238979 100644 --- a/mkarchroot.in +++ b/mkarchroot.in @@ -48,21 +48,21 @@ while getopts 'r:ufnhC:M:c:' arg; do done if [ "$EUID" != '0' ]; then - die 'this script must be run as root.' + die 'This script must be run as root.' fi shift $(($OPTIND - 1)) if [ "$RUN" = '' -a $# -lt 2 ]; then - die 'you must specify a directory and one or more packages' + die 'You must specify a directory and one or more packages.' elif [ $# -lt 1 ]; then - die 'you must specify a directory' + die 'You must specify a directory.' fi working_dir="$(readlink -f ${1})" shift 1 -[ "${working_dir}" = '' ] && die 'please specify a working directory' +[ "${working_dir}" = '' ] && die 'Please specify a working directory.' if [ -z "$cache_dir" ]; then cache_conf=${working_dir}/etc/pacman.conf @@ -149,7 +149,7 @@ chroot_lock () { # Lock the chroot. Take note of the FD number. if ! flock -n 9; then - stat_busy "locking chroot" + stat_busy "Locking chroot" flock 9 stat_done fi @@ -161,7 +161,7 @@ if [ "$RUN" != "" ]; then # run chroot {{{ #Sanity check if [ ! -f "${working_dir}/.arch-chroot" ]; then - die "'${working_dir}' does not appear to be a Arch chroot" + die "'${working_dir}' does not appear to be a Arch chroot." fi chroot_lock @@ -174,7 +174,7 @@ if [ "$RUN" != "" ]; then else # {{{ build chroot if [ -e "${working_dir}" -a "${FORCE}" = "n" ]; then - die "working dir '${working_dir}' already exists - try using -f" + die "Working directory '${working_dir}' already exists - try using -f" fi if { type -P btrfs && btrfs subvolume create "${working_dir}"; } &>/dev/null; then @@ -198,7 +198,7 @@ else op="${op}f" fi if ! pacman ${op} ${pacargs} $@; then - die 'failed to install all packages' + die 'Failed to install all packages' fi fi -- 1.7.7.1

1 0

[arch-projects] [PATCH] [dbscripts 1/2] db-*: always handle pkgname/pkgbase/pkgfile argument last
by Dan McGee 01 Nov '11

01 Nov '11

This matches what we do in db-update, and makes the most sense if we want to expand these commands to take multiple arguments at the same time. Especially in the case of db-repo-add and db-repo-remove, these wrapper commands should be no more limiting than repo-add and repo-remove which always allow multiple arguments and are more efficient that way. This patch simply reorders the arguments; a later patch will support multiple pkgname/pkgbase/pkgfile arguments on the command line. Although this does break backwards compatibility and requires some changing of muscle memory, I think it is a worthwhile change to make as the functionality of these commands becomes more powerful and the order of arguments becomes the same in all of them. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- db-remove | 8 ++++---- db-repo-add | 8 ++++---- db-repo-remove | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/db-remove b/db-remove index b44eb33..e7326c0 100755 --- a/db-remove +++ b/db-remove @@ -4,13 +4,13 @@ . "$(dirname $0)/config" if [ $# -ne 3 ]; then - msg "usage: $(basename $0) <pkgname|pkgbase> <repo> <arch>" + msg "usage: $(basename $0) <repo> <arch> <pkgname|pkgbase>" exit 1 fi -pkgbase="$1" -repo="$2" -arch="$3" +repo="$1" +arch="$2" +pkgbase="$3" ftppath="$FTP_BASE/$repo/os" svnrepo="$repo-$arch" diff --git a/db-repo-add b/db-repo-add index 53cfc84..8d4a56d 100755 --- a/db-repo-add +++ b/db-repo-add @@ -4,13 +4,13 @@ . "$(dirname $0)/config" if [ $# -ne 3 ]; then - msg "usage: $(basename $0) <pkgfile> <repo> <arch>" + msg "usage: $(basename $0) <repo> <arch> <pkgfile>" exit 1 fi -pkgfile="$1" -repo="$2" -arch="$3" +repo="$1" +arch="$2" +pkgfile="$3" ftppath="$FTP_BASE/$repo/os" diff --git a/db-repo-remove b/db-repo-remove index b01910f..e55cd07 100755 --- a/db-repo-remove +++ b/db-repo-remove @@ -4,13 +4,13 @@ . "$(dirname $0)/config" if [ $# -ne 3 ]; then - msg "usage: $(basename $0) <pkgname> <repo> <arch>" + msg "usage: $(basename $0) <repo> <arch> <pkgname>" exit 1 fi -pkgname="$1" -repo="$2" -arch="$3" +repo="$1" +arch="$2" +pkgname="$3" ftppath="$FTP_BASE/$repo/os" -- 1.7.7.1

1 1

[arch-projects] arch-projects@archlinux.org Rolex -95%
by ROLEX.COM 31 Oct '11

31 Oct '11

1 0

[arch-projects] Arch Linux initscripts (killall)
by C Anthony Risinger 30 Oct '11

30 Oct '11

On Oct 29, 2011 4:58 PM, "Tom Gundersen" <tomegun(a)archlinux.org> wrote: > > In principle, I'm worried that, with the right ammonut of bad luck, > we could fork off some process at exactly the wrong time which escapes > the killall logic. > > This, by the way, highlights the frailty of the killall stuff. Why not make use of the `name` cgroup in same way systemd does? Then you can simply: kill $(</path/to/cgroup/tasks) ... in a loop for a couple iterations as needed. C Anthony

1 0

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2011.10.2-6-g00070ec
by tomegun＠archlinux.org 29 Oct '11

29 Oct '11

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 "Arch Linux initscripts repository". The branch, master has been updated via 00070eca730dec9c6d587cc1639f6abaca83fa34 (commit) via fbff8c64e2be9cbb24bd7f824552842d0bd6442d (commit) via 1fdaa33f06786231da3b86e5d8b646b46f6ca1f9 (commit) via e46ee7e6c9fbbd8d21c306719170ae086cf12761 (commit) via 697aa90c7eede255635f9c6d2e7fe12338aa2886 (commit) via 559175f82d6320af8855c34b7e4b9b3cb4a3ad9a (commit) from 750db158fca0681273b65b354716469168e341c1 (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 00070eca730dec9c6d587cc1639f6abaca83fa34 Author: Tom Gundersen <teg(a)jklm.no> Date: Wed Oct 26 23:11:20 2011 +0200 minilogd: kill This is not very useful, is not maintained, has open serious bugs. Better to admit that it does not work and just remove it. Someone could easily make an AUR package with a hook, if they want it and can make it work as expected. The only case where this would be useful is in case lvm monitoring is in use and dmeventd sends out a message to syslog before syslog-ng is started (there is a very small window). However, not even this works atm (as far as I know) due to bugs in minilogd. Signed-off-by: Tom Gundersen <teg(a)jklm.no> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fbff8c64e2be9cbb24bd7f824552842d0bd6442d Author: Tom Gundersen <teg(a)jklm.no> Date: Mon Oct 24 21:34:14 2011 +0200 locale: fix locale.sh for zsh Uglier script, but should now work with zsh as well as bash. v2: only read rc.conf if LANG is not set in locale.conf, no functional change. Based on suggestion by Dave. Signed-off-by: Tom Gundersen <teg(a)jklm.no> commit 1fdaa33f06786231da3b86e5d8b646b46f6ca1f9 Author: Tom Gundersen <teg(a)jklm.no> Date: Sun Oct 23 21:03:46 2011 +0200 udev: binary moved, require 174 commit e46ee7e6c9fbbd8d21c306719170ae086cf12761 Author: Tom Gundersen <teg(a)jklm.no> Date: Sun Oct 23 18:02:20 2011 +0200 udev: exit on shutdown udev was receiving some events (due to e.g. swapoff) on shutdown that caused it to fork new processes. These then receivde TERM before they could finish, and complained on the console. In principle, I'm worried that, with the right ammonut of bad luck, we could fork off some process at exactly the wrong time which escapes the killall logic. This, by the way, highlights the frailty of the killall stuff. Signed-off-by: Tom Gundersen <teg(a)jklm.no> commit 697aa90c7eede255635f9c6d2e7fe12338aa2886 Author: Tom Gundersen <teg(a)jklm.no> Date: Sat Oct 22 14:21:48 2011 +0200 bits, bytes, who cares? Signed-off-by: Tom Gundersen <teg(a)jklm.no> commit 559175f82d6320af8855c34b7e4b9b3cb4a3ad9a Author: Tom Gundersen <teg(a)jklm.no> Date: Wed Oct 19 10:20:41 2011 +0200 config: add /etc/vconsole.conf support Read KEYMAP, CONSOLEFONT and CONSOLEMAP from vconsole.conf. If they are set they take precedence over the values in rc.conf. Signed-off-by: Tom Gundersen <teg(a)jklm.no> ----------------------------------------------------------------------- Summary of changes: .gitignore | 2 - Makefile | 10 +-- PKGBUILD | 4 +- functions | 2 +- locale.sh | 81 ++++++++++++++++++++++-- minilogd.c | 202 ----------------------------------------------------------- rc.shutdown | 3 + rc.sysinit | 13 +++- 8 files changed, 96 insertions(+), 221 deletions(-) delete mode 100644 minilogd.c hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [devtools][PATCH] makechrootpkg : Prevent erroring out on sources signatures check
by Eric Bélanger 29 Oct '11

29 Oct '11

Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- Ideally, this should be done in the chrootdir so we can keep the public keys in the chroot. At least with this patch, the package is built instead of just aborting. We can check the source signature on the main system and ignore the warning message about public keys not found when building in the chroot. --- makechrootpkg.in | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/makechrootpkg.in b/makechrootpkg.in index 9794132..67d3100 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -217,6 +217,9 @@ if [[ -n $PACKAGER ]]; then echo "PACKAGER='${PACKAGER}'" >> "$copydir/etc/makepkg.conf" fi +# Create directory to check the sources signatures +mkdir "$copydir/.gnupg" + # Set target CARCH as it might be used within the PKGBUILD to select correct sources eval $(grep '^CARCH=' "$copydir/etc/makepkg.conf") export CARCH @@ -245,7 +248,7 @@ cp PKGBUILD "$copydir/build/" done ) -chown -R nobody "$copydir"/{build,pkgdest,srcdest} +chown -R nobody "$copydir"/{build,pkgdest,srcdest,.gnupg} echo 'nobody ALL = NOPASSWD: /usr/bin/pacman' > "$copydir/etc/sudoers.d/nobody-pacman" chmod 440 "$copydir/etc/sudoers.d/nobody-pacman" -- 1.7.7

2 1

[arch-projects] [PATCH 1/7] config: add /etc/hostname support
by Tom Gundersen 29 Oct '11

29 Oct '11

If /etc/hostname is non-empty its contents is assumed to be the hostname. This takes precedence over HOSTNAME in rc.conf. Signed-off-by: Tom Gundersen <teg(a)jklm.no> --- rc.sysinit | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/rc.sysinit b/rc.sysinit index dffea4d..3e5fec9 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -232,6 +232,9 @@ RANDOM_SEED=/var/lib/misc/random-seed # Remove leftover files remove_leftover +if [[ -s /etc/hostname ]]; then + HOSTNAME=$(cat /etc/hostname) +fi if [[ $HOSTNAME ]]; then stat_busy "Setting Hostname: $HOSTNAME" echo "$HOSTNAME" >| /proc/sys/kernel/hostname && stat_done || stat_fail -- 1.7.7.1

6 30