October 2013 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] submitting-patches: address common mistakes
by Andrew Gregory 12 Oct '13

12 Oct '13

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- doc/submitting-patches.txt | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/doc/submitting-patches.txt b/doc/submitting-patches.txt index d542265..3ff707c 100644 --- a/doc/submitting-patches.txt +++ b/doc/submitting-patches.txt @@ -27,7 +27,7 @@ Creating your patch ------------------- -- -* use `git commit -s` for creating a commit of your changes. +* Use `git commit -s` for creating a commit of your changes. The -s allows you to credit yourself by adding a "Signed Off By" line to indicate who has "signed" the patch - who has approved it. @@ -46,7 +46,11 @@ was actually done, and allows better feedback. * Use `git format-patch` to create patches. Your commit message will be shown above the patch by default when you will use -`git-format-patch`, including the signoff line. +`git format-patch`, including the signoff line. Sets of multiple patches that +need extra explanation beyond the commit messages may include additional notes +in a cover letter. Individual patches may include additional notes between the +"---" following the commit message and the beginning of the diff. + -- Submitting your patch @@ -66,7 +70,9 @@ it allows easier review "at a glance", and most importantly, it allows people to comment on exact lines of the patch in reply emails. `git send-email` allows you to send git formatted patches in plain text easily -and is the preferred method for submission to the mailing list. +and is the preferred method for submission to the mailing list. Mail clients, +including gmail's web interface, have a tendency to break patches by wrapping +lines and/or adjusting whitespace and should be avoided. -- @@ -89,7 +95,8 @@ When you do get feedback, it usually merits a response, whether this be a resubmit of the patch with corrections or a follow-up email asking for clarifications. When neither of these occurs, don't expect your patch to see further review. The all-volunteer staff don't have time to fix up patches that -aren't their own. +aren't their own. When resubmitting patches update the subject line to reflect +the version number ('[PATCHv2]') and send it as a reply to the original thread. -- -- 1.8.4

2 1

[pacman-dev] [PATCH] remove executable bit on paclog-pkglist.sh.in
by Andrew Gregory 12 Oct '13

12 Oct '13

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- contrib/paclog-pkglist.sh.in | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 contrib/paclog-pkglist.sh.in diff --git a/contrib/paclog-pkglist.sh.in b/contrib/paclog-pkglist.sh.in old mode 100755 new mode 100644 -- 1.8.4

1 0

[pacman-dev] [PATCH] Makefile.am: remove old targets from .PHONY
by Andrew Gregory 12 Oct '13

12 Oct '13

These targets were part of the old test suite and no longer exist. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index f81fd79..1e5f9a5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -54,6 +54,6 @@ update-po: $(MAKE) -C scripts/po update-po $(MAKE) -C src/pacman/po update-po -.PHONY: test-pacman test-pacsort test-vercmp test-parseopts update-po +.PHONY: update-po # vim:set ts=2 sw=2 noet: -- 1.8.4

1 0

[pacman-dev] [PATCH] Add a -C, --cleanbuild option to clear the source directory before building a package.
by Lukáš Jirkovský 10 Oct '13

10 Oct '13

Implements FS#17175. --- doc/makepkg.8.txt | 3 +++ scripts/makepkg.sh.in | 13 +++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index fcafb08..fd3573c 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -147,6 +147,9 @@ Options *-V, \--version*:: Display version information. +*-C, \--cleanbuild*:: + Remove the $srcdir before building the package. + *\--allsource*:: Do not actually build the package, but build a source-only tarball that includes all sources, including those that are normally download via diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 67ec240..04c309f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -63,6 +63,7 @@ ASROOT=0 CLEANUP=0 DEP_BIN=0 FORCE=0 +CLEANBUILD=0 INFAKEROOT=0 GENINTEG=0 HOLDVER=0 @@ -2504,6 +2505,7 @@ usage() { printf -- "$(gettext " -s, --syncdeps Install missing dependencies with %s")\n" "pacman" printf -- "$(gettext " -S, --source Generate a source-only tarball without downloaded sources")\n" printf -- "$(gettext " -V, --version Show version information and exit")\n" + printf -- "$(gettext " -C, --cleanbuild Remove %s dir before building the package")\n" "src/" printf -- "$(gettext " --allsource Generate a source-only tarball including downloaded sources")\n" printf -- "$(gettext " --verifysource Download source files (if needed) and perform integrity checks")\n" printf -- "$(gettext " --asroot Allow %s to run as root user")\n" "makepkg" @@ -2552,8 +2554,8 @@ fi ARGLIST=("$@") # Parse Command Line Options. -OPT_SHORT="AcdefFghiLmop:rRsSV" -OPT_LONG=('allsource' 'asroot' 'check' 'clean' 'config:' 'force' 'geninteg' +OPT_SHORT="AcCdefFghiLmop:rRsSV" +OPT_LONG=('allsource' 'asroot' 'check' 'clean' 'cleanbuild' 'config:' 'force' 'geninteg' 'help' 'holdver' 'ignorearch' 'install' 'key:' 'log' 'nobuild' 'nocolor' 'nocheck' 'nodeps' 'noextract' 'noprepare' 'nosign' 'pkg:' 'repackage' 'rmdeps' 'sign' 'skipchecksums' 'skipinteg' 'skippgpcheck' 'source' 'syncdeps' @@ -2581,6 +2583,7 @@ while true; do --asroot) ASROOT=1 ;; -A|--ignorearch) IGNOREARCH=1 ;; -c|--clean) CLEANUP=1 ;; + -C|--cleanbuild) CLEANBUILD=1 ;; --check) RUN_CHECK='y' ;; --config) shift; MAKEPKG_CONF=$1 ;; -d|--nodeps) NODEPS=1 ;; @@ -2990,6 +2993,12 @@ elif (( !REPKG )); then download_sources check_source_integrity (( VERIFYSOURCE )) && exit 0 # $E_OK + + if (( CLEANBUILD )); then + msg "$(gettext "Removing content of existing %s directory...")" "src/" + rm -rf "$srcdir/*" + fi + extract_sources if (( PREPAREFUNC )); then run_prepare -- 1.8.4

3 9

[pacman-dev] [PATCH] Link non-vcs sources into $srcdir during extraction
by Allan McRae 10 Oct '13

10 Oct '13

The separation between downloading and extracting for non-vsc sources was incomplete due to symlinks being made in $srcdir during the download stage. Have download_{local,file} just ensure the presence of the files in $startdir or $SRCDEST (downloading if needed) and then have extract_file symlink these files into $srcdir. Also replace "continue" with "return" in extract_file to make it clearer what is happening. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 1a8f02f..2b01c46 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -323,8 +323,6 @@ download_local() { if [[ -n "$filepath" ]]; then msg2 "$(gettext "Found %s")" "${filepath##*/}" - rm -f "$srcdir/${filepath##*/}" - ln -s "$filepath" "$srcdir/" else local filename=$(get_filename "$netfile") error "$(gettext "%s was not found in the build directory and is not a URL.")" "$filename" @@ -338,8 +336,6 @@ download_file() { local filepath=$(get_filepath "$netfile") if [[ -n "$filepath" ]]; then msg2 "$(gettext "Found %s")" "${filepath##*/}" - rm -f "$srcdir/${filepath##*/}" - ln -s "$filepath" "$srcdir/" return fi @@ -387,13 +383,15 @@ download_file() { if [[ $dlfile != "$filename" ]]; then mv -f "$SRCDEST/$dlfile" "$SRCDEST/$filename" fi - - rm -f "$srcdir/$filename" - ln -s "$SRCDEST/$filename" "$srcdir/" } extract_file() { local file=$1 + + local filepath=$(get_filepath "$file") + rm -f "$srcdir/${file}" + ln -s "$filepath" "$srcdir/" + # do not rely on extension for file type local file_type=$(file -bizL "$file") local ext=${file##*.} @@ -404,24 +402,24 @@ extract_file() { *application/x-gzip*) case "$ext" in gz|z|Z) cmd="gzip" ;; - *) continue;; + *) return;; esac ;; *application/x-bzip*) case "$ext" in bz2|bz) cmd="bzip2" ;; - *) continue;; + *) return;; esac ;; *application/x-xz*) case "$ext" in xz) cmd="xz" ;; - *) continue;; + *) return;; esac ;; *) # See if bsdtar can recognize the file if bsdtar -tf "$file" -q '*' &>/dev/null; then cmd="bsdtar" else - continue + return fi ;; esac -- 1.8.4

1 0

[pacman-dev] [PATCH] Ignore failure to patch during autogen.sh
by Allan McRae 10 Oct '13

10 Oct '13

patch -N ignores the previously applied patch but still returns 1. This causes a git build with a reused source directory to fail. --- autogen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autogen.sh b/autogen.sh index d11badc..588e63d 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,4 +1,4 @@ #!/bin/sh -xu autoreconf -i -(cd build-aux && patch -Np0 -i ltmain-asneeded.patch) +(cd build-aux && (patch -Np0 -i ltmain-asneeded.patch || true)) -- 1.8.4

1 0

[pacman-dev] [PATCH] A very tiny tweak to the unit test framework.
by Jeremy Heiner <ScalaProtractor at gmail.com> 09 Oct '13

09 Oct '13

Debugging unit test specifications is made more difficult when the framework cuts the rules short in its test run output. Of course, once debugged there is no interest in seeing the complete rules. Fortunately there is a "-v" option for situations just like this. This is also partially a test of my git-send-email configuration. So thanks, once again, to everyone who helped me with that. I've still got one slightly weird thing: the From line has two <> clauses, one the obscured " at gmail.com", one unobscured. I'm hoping that the listserv will not be too confused... Jeremy Heiner (1): Don't truncate display of rules when unit tests are run with "-v". test/pacman/pmrule.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.8.4

6 10

[pacman-dev] [PATCH] With VCS sources, only update sources in $srcdir.
by Lukáš Jirkovský 09 Oct '13

09 Oct '13

Previously, the sources in $srcdir were always removed prior building. After this change the sources are only updated. This makes incremental builds possible. Also this goes in line with the current behaviour for other types of sources, where the sources are just being overwritten without being removed first. --- scripts/makepkg.sh.in | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 67ec240..90df60c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -516,9 +516,11 @@ extract_bzr() { msg2 "$(gettext "Creating working copy of %s %s repo...")" "${repo}" "bzr" pushd "$srcdir" &>/dev/null - rm -rf "${dir##*/}" - if ! { bzr checkout "$dir" "${revision[@]}" --lightweight && + if [[ -d "${dir##*/}" ]]; then + cd_safe "${dir##*/}" + bzr update + elif ! { bzr checkout "$dir" "${revision[@]}" --lightweight && ( cd "$repo" && bzr pull "$dir" -q --overwrite "${revision[@]}" ); }; then error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "bzr" plain "$(gettext "Aborting...")" @@ -580,9 +582,12 @@ extract_git() { msg2 "$(gettext "Creating working copy of %s %s repo...")" "${repo}" "git" pushd "$srcdir" &>/dev/null - rm -rf "${dir##*/}" - - if ! git clone "$dir"; then + if [[ -d "${dir##*/}" ]]; then + pushd `pwd` &>/dev/null + cd_safe "${dir##*/}" + git pull + popd &>/dev/null + elif ! git clone "$dir"; then error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "git" plain "$(gettext "Aborting...")" exit 1 @@ -607,7 +612,7 @@ extract_git() { fi if [[ -n $ref ]]; then - if ! git checkout -b makepkg $ref; then + if ! git checkout -B makepkg $ref; then error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "git" plain "$(gettext "Aborting...")" exit 1 @@ -662,7 +667,6 @@ extract_hg() { msg2 "$(gettext "Creating working copy of %s %s repo...")" "${repo}" "hg" pushd "$srcdir" &>/dev/null - rm -rf "${dir##*/}" local ref if [[ -n $fragment ]]; then @@ -677,7 +681,10 @@ extract_hg() { esac fi - if ! hg clone "${ref[@]}" "$dir" "${dir##*/}"; then + if [[ -d "${dir##*/}" ]]; then + cd_safe "${dir##*/}" + hg pull -u + elif ! hg clone "${ref[@]}" "$dir" "${dir##*/}"; then error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "hg" plain "$(gettext "Aborting...")" exit 1 @@ -739,7 +746,6 @@ extract_svn() { msg2 "$(gettext "Creating working copy of %s %s repo...")" "${repo}" "svn" pushd "$srcdir" &>/dev/null - rm -rf "${dir##*/}" local ref if [[ -n $fragment ]]; then @@ -754,16 +760,20 @@ extract_svn() { esac fi - cp -a "$dir" . - if [[ -n ${ref} ]]; then - cd_safe "$(get_filename "$netfile")" + cd_safe "$dir" if ! svn update -r ${ref}; then error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "svn" plain "$(gettext "Aborting...")" fi fi + if [[ -d "${dir##*/}" ]]; then + cp -au "$dir" "$srcdir" + else + cp -a "$dir" . + fi + popd &>/dev/null } -- 1.8.4

3 6

[pacman-dev] A makepkg test suite
by Ashley Whetter 09 Oct '13

09 Oct '13

I've recently come across issue FS#15645 ([makepkg] needs a test suite) and I'd like to have a bash at implementing it. It seems like a good idea to get peoples ideas and thoughts first so what do you think? My first reaction is to do something similar to the pacman tests and just write a custom framework in python. Also have the output the same as the pacman tests. I think keeping the idea an environment (like in the pacman tests) seems a bit heavy handed because the only configuration done is in makepkg.conf and we can probably fake a pacman environment using a stub pacman. Or maybe we could utilise the pacman test environments! Unit testing should be easy enough because we can just call specific functions in makepkg and check the output. For functional testing I'm not really sure. As for acceptance testing we can just put different flag combinations in different test environments, and check the return code. Check the .PKGINFO. Maybe that files were put where they should be in pkg and src, as well as in the package itself. Have some PKGBUILDs that fail for various reasons like syntax, a dependency package doesn't exist. Make sure missing {,make,check}dependencies are installed. Any suggestions or ideas? Ashley

8 39

[pacman-dev] [PATCH 1/2] makepkg: do not refer to src/ or pkg/
by Allan McRae 09 Oct '13

09 Oct '13

Use $srcdir and $pkgdir instead. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 89d40a7..92f31de 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1838,7 +1838,7 @@ write_pkginfo() { create_package() { if [[ ! -d $pkgdir ]]; then - error "$(gettext "Missing %s directory.")" "pkg/" + error "$(gettext "Missing %s directory.")" "\$pkgdir/" plain "$(gettext "Aborting...")" exit 1 # $E_MISSING_PKGDIR fi @@ -2975,14 +2975,14 @@ chmod a-s "$srcdir" cd_safe "$srcdir" if (( NOEXTRACT && ! VERIFYSOURCE )); then - warning "$(gettext "Using existing %s tree")" "src/" + warning "$(gettext "Using existing %s tree")" "\$srcdir/" elif (( !REPKG )); then download_sources check_source_integrity (( VERIFYSOURCE )) && exit 0 # $E_OK if (( CLEANBUILD )); then - msg "$(gettext "Removing existing %s directory...")" "src/" + msg "$(gettext "Removing existing %s directory...")" "\$srcdir/" rm -rf "$srcdir/*" fi @@ -2998,7 +2998,7 @@ if (( NOBUILD )); then else # clean existing pkg directory if [[ -d $pkgdirbase ]]; then - msg "$(gettext "Removing existing %s directory...")" "pkg/" + msg "$(gettext "Removing existing %s directory...")" "\$pkgdir/" rm -rf "$pkgdirbase" fi mkdir -p "$pkgdirbase" -- 1.8.4

1 1