- Arch-projects - lists.archlinux.org

[arch-projects] [devtools] [PATCH] add ccache support
by Dominik Heidler 09 Aug '13

09 Aug '13

Users can set a ccache directory (which must be writeable by the user nobody) to be mapped to /build/.ccache (which is the directory, that ccache will use in the chroot) Signed-off-by: Dominik Heidler <dheidler(a)gmail.com> --- makechrootpkg.in | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/makechrootpkg.in b/makechrootpkg.in index 1cd08fb..8770378 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -21,6 +21,7 @@ run_namcap=false temp_chroot=false chrootdir= passeddir= +ccachedir= declare -a install_pkgs declare -i ret=0 @@ -58,10 +59,11 @@ usage() { echo " Default: $copy" echo '-n Run namcap on the package' echo '-T Build in a temporary directory' + echo '-C <dir> The ccache directory to use' exit 1 } -while getopts 'hcur:I:l:nT' arg; do +while getopts 'hcur:I:l:C:nT' arg; do case "$arg" in h) usage ;; c) clean_first=true ;; @@ -71,6 +73,7 @@ while getopts 'hcur:I:l:nT' arg; do l) copy="$OPTARG" ;; n) run_namcap=true; makepkg_args="$makepkg_args -i" ;; T) temp_chroot=true; copy+="-$$" ;; + C) ccachedir="$OPTARG" ;; *) makepkg_args="$makepkg_args -$arg $OPTARG" ;; esac done @@ -84,6 +87,11 @@ chrootdir=$(readlink -e "$passeddir") [[ ! -d $chrootdir ]] && die "No chroot dir defined, or invalid path '%s'" "$passeddir" [[ ! -d $chrootdir/root ]] && die "Missing chroot dir root directory. Try using: mkarchroot %s/root base-devel" "$chrootdir" +# Canonicalize ccachedir, getting rid of trailing / +if [[ "$ccachedir" != "" ]]; then + [[ ! -d $ccachedir ]] && die "Invalid path '%s' given for ccache directory" "$ccachedir" +fi + # Detect chrootdir filesystem type chroottype=$(stat -f -c %T "$chrootdir") @@ -349,6 +357,7 @@ download_sources if arch-nspawn "$copydir" \ --bind-ro="$PWD:/startdir_host" \ --bind-ro="$SRCDEST:/srcdest_host" \ + ${ccachedir:+"--bind=$ccachedir:/build/.ccache"} \ /chrootbuild then move_products -- 1.8.3.4

2 2

[arch-projects] [devtools] [GIT] The official devtools repository annotated tag 20130808 created. 20130808
by pierre＠archlinux.org 08 Aug '13

08 Aug '13

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, 20130808 has been created at 09664c15744e932e2ae4649eec85f6efad1bfc87 (tag) tagging 8dbb02de4f50aeb05c5df2ef8d9c8cf394b4f9ac (commit) replaces 20130525 tagged by Pierre Schmitz on Thu Aug 8 22:51:23 2013 +0200 - Log ----------------------------------------------------------------- tagging -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) iQEcBAABAgAGBQJSBATWAAoJEH8tQ0uXQeis648H/3or2EDJ3zR4UUIo5iFlBxV8 dwj1nDKXMb7Wu8sU8JwNtehAVmXgQJdpTpJn4LKyBIuX/q3d6iCgHovj7/ga9OZw DMm33uVfw4EiCSLwRtYputUlJTD2nYUWrWPvAZ6ZR4UBVt7ICdXAdbIKYH5wM91r D9nO+lTS587YIuTkjosrt66zkc9UsQM+jwsfak1z5d/FhHgyyjr6IxsmFBSw2ZXK wNZfzcrbgVXS5pU3u4BvkzzG+g5QNjRRPAUMBVgO8jmg4U+sL/rV/1I1utFzARYX 836DQBe0MONHkwS/MhmDpdBYmiDB/PpH1IWAJoK6SnKO8CPqMKBoCvGEizVCDDw= =8V2B -----END PGP SIGNATURE----- Dave Reisner (3): common: Properly forward arguments from die to error avoid injecting code into the format string Makefile: validate generated files as part of build Florian Pritz (1): arch-nspawn: remove leading - from the machine name/hostname Pierre Schmitz (2): Update makepkg.conf from pacman 4.1.2 Prepare release ----------------------------------------------------------------------- hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20130525-6-g8dbb02d
by pierre＠archlinux.org 08 Aug '13

08 Aug '13

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 8dbb02de4f50aeb05c5df2ef8d9c8cf394b4f9ac (commit) via b12d5eaf85ae970e37fce961cdb6393e3a22e9d3 (commit) from 0fa2536957dfd24ee676cc8b621bcdf166317635 (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 8dbb02de4f50aeb05c5df2ef8d9c8cf394b4f9ac Author: Pierre Schmitz <pierre(a)archlinux.de> Date: Thu Aug 8 22:51:14 2013 +0200 Prepare release commit b12d5eaf85ae970e37fce961cdb6393e3a22e9d3 Author: Pierre Schmitz <pierre(a)archlinux.de> Date: Thu Aug 8 22:50:19 2013 +0200 Update makepkg.conf from pacman 4.1.2 ----------------------------------------------------------------------- Summary of changes: Makefile | 2 +- makepkg-i686.conf | 2 ++ makepkg-x86_64.conf | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20130525-4-g0fa2536
by pierre＠archlinux.org 08 Aug '13

08 Aug '13

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 0fa2536957dfd24ee676cc8b621bcdf166317635 (commit) via be3c71fa81e6d35a1fae0612a8b7b4b613d7d2f6 (commit) via fb30cabe61862f640f0e99f214dc2777a8ec1b35 (commit) via 29e62278a7379336e5972df5bad751c973872039 (commit) from 8c4553f68cb1c01b24f4883db0032f646b2e77dd (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 0fa2536957dfd24ee676cc8b621bcdf166317635 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Jul 30 15:24:49 2013 -0400 Makefile: validate generated files as part of build For example... $ make GEN checkpkg GEN commitpkg GEN archco archco: line 179: unexpected EOF while looking for matching `"' archco: line 181: syntax error: unexpected end of file make: *** [archco] Error 2 Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> commit be3c71fa81e6d35a1fae0612a8b7b4b613d7d2f6 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Jul 30 15:24:48 2013 -0400 avoid injecting code into the format string Now that die() properly forwards arguments to error(), we can expect that the first arg is a format string and not the entirety of the output. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> commit fb30cabe61862f640f0e99f214dc2777a8ec1b35 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Jul 30 11:00:54 2013 -0400 common: Properly forward arguments from die to error Also allow this function to be called without arguments, in which case, don't call error at all. Some uses of this function wrongly assumed that this was already allowed. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> commit 29e62278a7379336e5972df5bad751c973872039 Author: Florian Pritz <bluewind(a)xinu.at> Date: Mon Jun 17 11:02:45 2013 +0200 arch-nspawn: remove leading - from the machine name/hostname Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> ----------------------------------------------------------------------- Summary of changes: Makefile | 1 + arch-nspawn.in | 9 ++++++--- archco.in | 2 +- archrelease.in | 6 +++--- checkpkg.in | 4 ++-- commitpkg.in | 10 +++++----- crossrepomove.in | 2 +- find-libdeps.in | 2 +- lib/common.sh | 2 +- makechrootpkg.in | 14 +++++++------- mkarchroot.in | 4 ++-- 11 files changed, 30 insertions(+), 26 deletions(-) hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [netctl] [GIT] Network control utility based on systemd annotated tag 1.3 created. 1.3
by jouke＠archlinux.org 06 Aug '13

06 Aug '13

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 "Network control utility based on systemd". The annotated tag, 1.3 has been created at 74d5d415c979dc3e69f7c5449c8e94129203f293 (tag) tagging 127976c75b294865571c3367f3d8e2e25262f2e7 (commit) replaces 1.2 tagged by Jouke Witteveen on Tue Aug 6 10:38:35 2013 +0200 - Log ----------------------------------------------------------------- Release 1.3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) iQEcBAABAgAGBQJSALYZAAoJEFa2H7+CSSwVpjYH/j1gi7WlBREoqfXHY7or4Lzd eotDSpvH7JIgVt60DGebxm3zN40pcKNVZTfa7Ui3AJ40tgFgZZJG5QSYPX0aWYu2 uyPt30Zs/rtkxaZqN8dslQnH/ON3fHKYKYhA9elCFhdLyY1EdpwHHmQZH4EtoBMl k/E5L4sc2C7jwcTSIJ1Q+FmpKjyq5MbbY6JfCxzrfxBvdysW5ecmc/nqEEoKeBZS b2VLe4pmKHwn2GErDvTyoS2eEZnB63Bx1TnEcCGMyWfVOtPEL+j4hIhB5WSSefnL EnOcLjkQ75kajM/jdQIcS/1qI0+01xbpKoyhss6j+CD17AwU05Lv/l/eJmZ43oQ= =TO0E -----END PGP SIGNATURE----- Florian Pritz (1): PKGBUILD: Add systemd to depends Jouke Witteveen (5): Introduce sed Use iproute2 for bridging (FS#36165) Merge branch 'master' of git://github.com/gandro/netctl into gandro-master Make netctl-auto more hook friendly 1.3 release updates Justin (1): Fix Typo Sebastian Wicki (6): Add wpa_unquote function Rewrite of netctl-auto Add man page for netctl-auto(1) More consistent quoting in netctl-auto Rework some lines in netctl-auto Fix references related to netctl-auto(1) ----------------------------------------------------------------------- hooks/post-receive -- Network control utility based on systemd

1 0

[arch-projects] [netctl] [GIT] Network control utility based on systemd branch master updated. 1.2-13-g127976c
by jouke＠archlinux.org 06 Aug '13

06 Aug '13

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 "Network control utility based on systemd". The branch, master has been updated via 127976c75b294865571c3367f3d8e2e25262f2e7 (commit) from daf195028b34b72190abf7189ac84d4495c3a722 (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 127976c75b294865571c3367f3d8e2e25262f2e7 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Tue Aug 6 10:38:08 2013 +0200 1.3 release updates ----------------------------------------------------------------------- Summary of changes: COPYING | 674 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 2 +- NEWS | 4 + 3 files changed, 679 insertions(+), 1 deletion(-) create mode 100644 COPYING hooks/post-receive -- Network control utility based on systemd

1 0

[arch-projects] [pyalpm][PATCH] Add RemoteFileSigLevel to available pacman options
by tlatsas2000＠gmail.com 04 Aug '13

04 Aug '13

Signed-off-by: Tasos Latsas <tlatsas(a)gmx.com> --- pycman/config.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pycman/config.py b/pycman/config.py index 577092d..6dc9fca 100644 --- a/pycman/config.py +++ b/pycman/config.py @@ -66,7 +66,8 @@ SINGLE_OPTIONS = ( 'XferCommand', 'CleanMethod', 'SigLevel', - 'LocalFileSigLevel' + 'LocalFileSigLevel', + 'RemoteFileSigLevel' ) BOOLEAN_OPTIONS = ( -- 1.8.3.4

2 1

[arch-projects] [archweb] [RFCv2] Add releng netboot to archweb
by Thomas Bächler 02 Aug '13

02 Aug '13

This is the second WIP patch series to add the netboot environment to archweb. I improved a few minor issues compared to the last version. - I have no idea if django properly caches this page, or if this requires extra configuration, as regenerating it every time seems like overkill. - All files that iPXE needs to access must be served without SSL as far as I know. To test it, set your archweb test environment to run on http://localhost:8000/ Download ipxe.lkrn from https://paste.xinu.at/OX7oU8/ and execute qemu-system-x86_64 -enable-kvm -kernel bin/ipxe.lkrn or qemu-system-x86_64 -enable-kvm -kernel bin/ipxe.lkrn -cpu kvm32 (I hope this still works, cannot test right now)

1 5

[arch-projects] [devtools] [PATCH 1/2] avoid injecting code into the format string
by Dave Reisner 30 Jul '13

30 Jul '13

Now that die() properly forwards arguments to error(), we can expect that the first arg is a format string and not the entirety of the output. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Resend of another patch by the same name arch-nspawn.in | 4 ++-- archco.in | 2 +- archrelease.in | 6 +++--- checkpkg.in | 4 ++-- commitpkg.in | 10 +++++----- crossrepomove.in | 2 +- find-libdeps.in | 2 +- makechrootpkg.in | 14 +++++++------- mkarchroot.in | 4 ++-- 9 files changed, 24 insertions(+), 24 deletions(-) diff --git a/arch-nspawn.in b/arch-nspawn.in index 8ef39ed..f52afe9 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -88,9 +88,9 @@ umask 0022 # Sanity check if [[ ! -f "$working_dir/.arch-chroot" ]]; then - die "'$working_dir' does not appear to be a Arch chroot." + die "'%s' does not appear to be a Arch chroot." "$working_dir" elif [[ $(cat "$working_dir/.arch-chroot") != $CHROOT_VERSION ]]; then - die "chroot '$working_dir' is not at version $CHROOT_VERSION. Please rebuild." + die "chroot '%s' is not at version %s. Please rebuild." "$working_dir" "$CHROOT_VERSION" fi build_mount_args diff --git a/archco.in b/archco.in index 1ee977e..5bdc4e6 100644 --- a/archco.in +++ b/archco.in @@ -15,7 +15,7 @@ case $scriptname in communityco) SVNURL="svn+ssh://svn-community@nymeria.archlinux.org/srv/repos/svn-community/svn";; *) - die "Couldn't find svn url for $scriptname" + die "Couldn't find svn url for %s" "$scriptname" ;; esac diff --git a/archrelease.in b/archrelease.in index 2e742c2..6f52dbc 100644 --- a/archrelease.in +++ b/archrelease.in @@ -8,8 +8,8 @@ FORCE= while getopts ':f' flag; do case $flag in f) FORCE=1 ;; - :) die "Option requires an argument -- '$OPTARG'" ;; - \?) die "Invalid option -- '$OPTARG'" ;; + :) die "Option requires an argument -- '%s'" "$OPTARG" ;; + \?) die "Invalid option -- '%s'" "$OPTARG" ;; esac done shift $(( OPTIND - 1 )) @@ -23,7 +23,7 @@ fi if [[ -z $FORCE ]]; then for tag in "$@"; do if ! in_array "$tag" "${_tags[@]}"; then - die 'archrelease: Invalid tag: "'$tag'" (use -f to force release)' + die "archrelease: Invalid tag: '%s' (use -f to force release)" "$tag" fi done fi diff --git a/checkpkg.in b/checkpkg.in index 95bf049..8e0f574 100644 --- a/checkpkg.in +++ b/checkpkg.in @@ -41,13 +41,13 @@ for _pkgname in "${pkgname[@]}"; do pkgurl=$(pacman -Spdd --print-format '%l' --noconfirm "$_pkgname") if [[ $? -ne 0 ]]; then - die "Couldn't download previous package for $_pkgname." + die "Couldn't download previous package for %s." "$_pkgname" fi oldpkg=${pkgurl##*://*/} if [[ ${oldpkg##*/} = ${pkgfile##*/} ]]; then - die "The built package ($_pkgname) is the one in the repo right now!" + die "The built package (%s) is the one in the repo right now!" "$_pkgname" fi if [[ ! -f $oldpkg ]]; then diff --git a/commitpkg.in b/commitpkg.in index db78517..ad1005b 100644 --- a/commitpkg.in +++ b/commitpkg.in @@ -58,7 +58,7 @@ esac # check if all local source files are under version control for s in "${source[@]}"; do if [[ $s != *://* ]] && ! svn status -v "$s@" | grep -q '^[ AMRX~]'; then - die "$s is not under version control" + die "%s is not under version control" "$s" fi done @@ -68,7 +68,7 @@ for i in 'changelog' 'install'; do # evaluate any bash variables used eval file=\"$(sed 's/^$['\''"]$$.*$\1$/\2/' <<< "$file")\" if ! svn status -v "${file}" | grep -q '^[ AMRX~]'; then - die "${file} is not under version control" + die "%s is not under version control" "$file" fi done < <(sed -n "s/^[[:space:]]*$i=//p" PKGBUILD) done @@ -81,8 +81,8 @@ while getopts ':l:a:s:f' flag; do s) server=$OPTARG ;; l) rsyncopts+=("--bwlimit=$OPTARG") ;; a) commit_arch=$OPTARG ;; - :) die "Option requires an argument -- '$OPTARG'" ;; - \?) die "Invalid option -- '$OPTARG'" ;; + :) die "Option requires an argument -- '%s'" "$OPTARG" ;; + \?) die "Invalid option -- '%s'" "$OPTARG" ;; esac done shift $(( OPTIND - 1 )) @@ -164,7 +164,7 @@ for _arch in ${arch[@]}; do gpg --detach-sign --use-agent ${SIGNWITHKEY} "${pkgfile}" || die fi if ! gpg --verify "$sigfile" >/dev/null 2>&1; then - die "Signature ${pkgfile}.sig is incorrect!" + die "Signature %s.sig is incorrect!" "$pkgfile" fi uploads+=("$sigfile") done diff --git a/crossrepomove.in b/crossrepomove.in index 1d4ae6c..912504f 100644 --- a/crossrepomove.in +++ b/crossrepomove.in @@ -25,7 +25,7 @@ case $scriptname in target_repo='extra' ;; *) - die "Couldn't find configuration for $scriptname" + die "Couldn't find configuration for %s" "$scriptname" ;; esac diff --git a/find-libdeps.in b/find-libdeps.in index 36e2c43..c9b451e 100644 --- a/find-libdeps.in +++ b/find-libdeps.in @@ -16,7 +16,7 @@ script_mode=${0##*/find-lib} case $script_mode in deps|provides) true;; - *) die "Unknown mode $script_mode" ;; + *) die "Unknown mode %s" "$script_mode" ;; esac if [[ -z $1 ]]; then diff --git a/makechrootpkg.in b/makechrootpkg.in index d7d3ecf..1cd08fb 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -81,8 +81,8 @@ done # Canonicalize chrootdir, getting rid of trailing / chrootdir=$(readlink -e "$passeddir") -[[ ! -d $chrootdir ]] && die "No chroot dir defined, or invalid path '$passeddir'" -[[ ! -d $chrootdir/root ]] && die "Missing chroot dir root directory. Try using: mkarchroot $chrootdir/root base-devel" +[[ ! -d $chrootdir ]] && die "No chroot dir defined, or invalid path '%s'" "$passeddir" +[[ ! -d $chrootdir/root ]] && die "Missing chroot dir root directory. Try using: mkarchroot %s/root base-devel" "$chrootdir" # Detect chrootdir filesystem type chroottype=$(stat -f -c %T "$chrootdir") @@ -136,10 +136,10 @@ create_chroot() { if [[ "$chroottype" == btrfs ]]; then if [[ -d $copydir ]]; then btrfs subvolume delete "$copydir" >/dev/null || - die "Unable to delete subvolume $copydir" + die "Unable to delete subvolume %s" "$copydir" fi btrfs subvolume snapshot "$chrootdir/root" "$copydir" >/dev/null || - die "Unable to create subvolume $copydir" + die "Unable to create subvolume %s" "$copydir" else mkdir -p "$copydir" rsync -a --delete -q -W -x "$chrootdir/root/" "$copydir" @@ -155,11 +155,11 @@ clean_temporary() { stat_busy "Removing temporary copy [$copy]" if [[ "$chroottype" == btrfs ]]; then btrfs subvolume delete "$copydir" >/dev/null || - die "Unable to delete subvolume $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 $copydir" + die "Unable to delete %s" "$copydir" fi # remove lock file @@ -362,7 +362,7 @@ if (( ret != 0 )); then if $temp_chroot; then die "Build failed" else - die "Build failed, check $copydir/build" + die "Build failed, check %s/build" "$copydir" fi else true diff --git a/mkarchroot.in b/mkarchroot.in index 970bbb9..7cdb274 100644 --- a/mkarchroot.in +++ b/mkarchroot.in @@ -51,7 +51,7 @@ fi umask 0022 -[[ -e $working_dir ]] && die "Working directory '$working_dir' already exists" +[[ -e $working_dir ]] && die "Working directory '%s' already exists" "$working_dir" mkdir -p "$working_dir" @@ -60,7 +60,7 @@ lock 9 "${working_dir}.lock" "Locking chroot" if [[ $(stat -f -c %T "$working_dir") == btrfs ]]; then rmdir "$working_dir" if ! btrfs subvolume create "$working_dir"; then - die "Couldn't create subvolume for '$working_dir'" + die "Couldn't create subvolume for '%s'" "$working_dir" fi chmod 0755 "$working_dir" fi -- 1.8.3.4

1 1

[arch-projects] [devtools] [PATCH 1/2] common: Properly forward arguments from die to error
by Dave Reisner 30 Jul '13

30 Jul '13

Also allow this function to be called without arguments, in which case, don't call error at all. Some uses of this function wrongly assumed that this was already allowed. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- It's possible that we just want to fix the die callsites that abuse this. Feedback welcome. lib/common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/common.sh b/lib/common.sh index 9446ff5..3ec26ff 100644 --- a/lib/common.sh +++ b/lib/common.sh @@ -82,7 +82,7 @@ trap_exit() { } die() { - error "$*" + (( $# )) && error "$@" cleanup 1 } -- 1.8.3.4

3 3