- Pacman-dev - lists.archlinux.org

[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

[pacman-dev] pacman-disowned
by Jeremy Heiner 06 Oct '13

06 Oct '13

Greetings, everyone! My name is Jeremy. Pleased to make your acquaintance. The "Pacman Tips" wiki page provides a pacman-disowned shell script and suggests running it periodically. I completely agree: I have found it both helpful and educational. I've played around with the script, trying to squeeze more information into its output. Just so you can get a sense of what direction my exploration lead me, I've attached my scala implementation. To be clear: I am *not* suggesting this scala program as a replacement for pacman-disowned. I can't even guarantee that my scala program does anything useful, and I eschew any liability should you ever run it :). I've only included it in case you're wondering where my head is at. What do I mean by "squeeze more info in"? Well, it would be fairly easy to tweak the shell script to list missing files (even though you can get that info using "-Qk"). So my scala program outputs a line for each file that indicates if it is missing or if it is not owned by a package: it combines the info from both "-Qk" and pacman-disowned. Anyway, I've been thinking about what it would take to bake this functionality into pacman itself. Now I'm certain many of you are already objecting: "it's better to layer this on top than to bake it in". And I concede that is a powerful objection. Still, I can't see any harm in exploring the idea. I'm benefiting by learning about the insides of pacman, even if my code is not adopted. I must also admit that I have not got to the point of implementing my scala stuff in C yet. I do have five-ish patches ready to post here, but they are all about preparing for eventually adding that functionality. It is possible that I might never post a patch that attains my end goal, but still some of these preliminary patches might prove useful. The first clump of patches I will post add unit tests for "-Qk". My ideas will (eventually) require big changes to check.c, and I wouldn't want to break anything there. This involved adding a new "hook" mechanism to the test framework, so that a package could be installed, then mangled by removing items, all in the generation phase so that the "-Qk" output could be verified in the test phase. Thanks in advance for your time evaluating my offerings, and for any feedback you have, Jeremy

9 28

[pacman-dev] [PATCH 0/3] unit tests for -Qk and -Qkk
by Jeremy Heiner 05 Oct '13

05 Oct '13

The hooks mechanism created here could potentially be used to write unit tests for other scenarios... For example: reinstalling to repair damaged files. The genhook would do the install (so the snapshot would match the desired final state), the snaphook would damage a file or two, and the reinstall-from-local-db would be the test action proper. Jeremy Heiner (3): Add pmtest.rootjoin() and clean up some duplicate joins. Simplify pmtest.generate and .run API (removed pacman parameter). Added tests for -Q --check (both fast(files) and full(mtree)). test/pacman/pmdb.py | 2 +- test/pacman/pmenv.py | 28 ++++++- test/pacman/pmpkg.py | 49 +++++++++++- test/pacman/pmrule.py | 10 +-- test/pacman/pmtest.py | 150 ++++++++++++++++++++++--------------- test/pacman/tests/querycheck001.py | 18 +++++ test/pacman/tests/querycheck002.py | 24 ++++++ test/pacman/tests/querycheck003.py | 24 ++++++ test/pacman/tests/querycheck004.py | 27 +++++++ test/pacman/tests/querycheck005.py | 33 ++++++++ test/pacman/tests/querycheck006.py | 20 +++++ test/pacman/tests/querycheck007.py | 20 +++++ test/pacman/tests/querycheck008.py | 33 ++++++++ test/pacman/tests/querycheck009.py | 30 ++++++++ test/pacman/tests/querycheck010.py | 27 +++++++ test/pacman/util.py | 10 +-- 16 files changed, 431 insertions(+), 74 deletions(-) create mode 100644 test/pacman/tests/querycheck001.py create mode 100644 test/pacman/tests/querycheck002.py create mode 100644 test/pacman/tests/querycheck003.py create mode 100644 test/pacman/tests/querycheck004.py create mode 100644 test/pacman/tests/querycheck005.py create mode 100644 test/pacman/tests/querycheck006.py create mode 100644 test/pacman/tests/querycheck007.py create mode 100644 test/pacman/tests/querycheck008.py create mode 100644 test/pacman/tests/querycheck009.py create mode 100644 test/pacman/tests/querycheck010.py -- 1.8.4

3 10

[pacman-dev] [PATCH] Add a --clearsource option to clear the source directory before build.
by Lukáš Jirkovský 04 Oct '13

04 Oct '13

Implements FS#17175. --- doc/makepkg.8.txt | 3 +++ scripts/makepkg.sh.in | 11 ++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index fcafb08..b2d5dbe 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -147,6 +147,9 @@ Options *-V, \--version*:: Display version information. +*\--clearsource*:: + 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..891461f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -63,6 +63,7 @@ ASROOT=0 CLEANUP=0 DEP_BIN=0 FORCE=0 +CLEARSRC=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 " --clearsource 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" @@ -2553,7 +2555,7 @@ ARGLIST=("$@") # Parse Command Line Options. OPT_SHORT="AcdefFghiLmop:rRsSV" -OPT_LONG=('allsource' 'asroot' 'check' 'clean' 'config:' 'force' 'geninteg' +OPT_LONG=('allsource' 'asroot' 'check' 'clean' 'clearsource' '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 ;; + --clearsource) CLEARSRC=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 (( CLEARSRC )); then + msg "$(gettext "Removing content of existing %s directory...")" "src/" + rm -rf "$srcdir/*" + fi + extract_sources if (( PREPAREFUNC )); then run_prepare -- 1.8.4

5 6

[pacman-dev] [PATCH 1/2] makepkg: allow make-style environment vars to override BUILDSCRIPT vars
by Techlive Zheng 03 Oct '13

03 Oct '13

This allows for VAR=value and VAR+=value variable declarations in command line to override variables in BUILDSCRIPT. --- scripts/makepkg.sh.in | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 1ef2af2..f6d884f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2712,11 +2712,6 @@ if [[ ! -w $BUILDDIR ]]; then exit 1 fi -# override settings from extra variables on commandline, if any -if (( ${#extra_environment[*]} )); then - export "${extra_environment[@]}" -fi - PKGDEST=${_PKGDEST:-$PKGDEST} PKGDEST=${PKGDEST:-$startdir} #default to $startdir if undefined if (( ! (NOBUILD || GENINTEG) )) && [[ ! -w $PKGDEST ]]; then @@ -2810,7 +2805,11 @@ if [[ $BUILDDIR = "$startdir" ]]; then else srcdir="$BUILDDIR/$pkgbase/src" pkgdirbase="$BUILDDIR/$pkgbase/pkg" +fi +# override settings from extra variables on commandline, if any +if (( ${#extra_environment[*]} )); then + export "${extra_environment[@]}" fi # set pkgdir to something "sensible" for (not recommended) use during build() -- 1.8.4

4 9

[pacman-dev] [PATCH] Make 'SRCDEST', 'PKGDEST' and 'PKGSRCDEST' respect the 'BUILDDIR'
by Techlive Zheng 03 Oct '13

03 Oct '13

--- A task has also been added to the bugtracker: https://bugs.archlinux.org/task/35498 scripts/makepkg.sh.in | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b85b87e..c27c74d 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2790,7 +2790,15 @@ if [[ $BUILDDIR = "$startdir" ]]; then else srcdir="$BUILDDIR/$pkgbase/src" pkgdirbase="$BUILDDIR/$pkgbase/pkg" - + if [[ $SRCDEST = "$startdir" ]]; then + SRCDEST="$BUILDDIR/$pkgbase" + fi + if [[ $PKGDEST = "$startdir" ]]; then + PKGDEST="$BUILDDIR/$pkgbase" + fi + if [[ $SRCPKGDEST = "$startdir" ]]; then + SRCPKGDEST="$BUILDDIR/$pkgbase" + fi fi # set pkgdir to something "sensible" for (not recommended) use during build() -- 1.8.2.3

3 8

[pacman-dev] [PATCH] Remove makepkg license check
by Allan McRae 03 Oct '13

03 Oct '13

There is little reason for this field to be checked over all other fields. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 666ad59..30a162e 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1782,15 +1782,6 @@ find_libprovides() { printf '%s\n' "${libprovides[@]}" } -check_license() { - # TODO maybe remove this at some point - # warn if license array is not present or empty - if [[ -z $license ]]; then - warning "$(gettext "Please add a license line to your %s!")" "$BUILDSCRIPT" - plain "$(gettext "Example for GPL\'ed software: %s.")" "license=('GPL')" - fi -} - write_pkginfo() { local builddate=$(date -u "+%s") if [[ -n $PACKAGER ]]; then @@ -1842,8 +1833,6 @@ write_pkginfo() { ;; esac done - - check_license } create_package() { @@ -1987,8 +1976,6 @@ create_srcpackage() { local srclinks="$(mktemp -d "$startdir"/srclinks.XXXXXXXXX)" mkdir "${srclinks}"/${pkgbase} - check_license - msg2 "$(gettext "Adding %s...")" "$BUILDSCRIPT" ln -s "${BUILDFILE}" "${srclinks}/${pkgbase}/${BUILDSCRIPT}" -- 1.8.4

1 0

[pacman-dev] [PATCH 1/2] Clarify --repackage description
by Allan McRae 03 Oct '13

03 Oct '13

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/makepkg.8.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index fcafb08..ceb7b91 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -129,8 +129,8 @@ Options *-R, \--repackage*:: Repackage contents of the package without rebuilding the package. This - is useful if you forgot a depend or install file in your PKGBUILD and - the build itself will not change. + is useful if you forgot (e.g.) a dependency or install file in your + PKGBUILD and the build itself will not change. *-s, \--syncdeps*:: Install missing dependencies using pacman. When build-time or run-time -- 1.8.4

1 1