December 2010 - Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.2-5-g6ddc115
by dan＠archlinux.org 30 Dec '10

30 Dec '10

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 pacman repository". The branch, maint has been updated via 6ddc115c7f52d6d172ca3879f96cc782bb526313 (commit) via df360b791da6d4ce8bc5813d9031ce44e32fcc55 (commit) via 58ee249c86d0f4ac1dfef9ca242d44d89044cb88 (commit) via e0d327462c460329b8d0f65f1324551accff939c (commit) from c002567d965bea56f740c46b35467446c276cd42 (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 6ddc115c7f52d6d172ca3879f96cc782bb526313 Author: Jakob Gruber <jakob.gruber(a)gmail.com> Date: Sat Oct 2 20:51:37 2010 +0200 Respect Ignore{Pkg,Group} for group members Fixes FS#19854. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit df360b791da6d4ce8bc5813d9031ce44e32fcc55 Author: Jakob Gruber <jakob.gruber(a)gmail.com> Date: Sat Oct 2 20:41:13 2010 +0200 Move group code to separate function This makes the following commits more readable. No logic was changed in this commit. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 58ee249c86d0f4ac1dfef9ca242d44d89044cb88 Author: Jakob Gruber <jakob.gruber(a)gmail.com> Date: Fri Sep 24 14:22:35 2010 +0200 Tests: Sync group which includes ignored pkgs * FS#19854 (--ignore is ignored with groups) * http://www.archlinux.org/pipermail/pacman-dev/2009-June/008847.html (operation aborts when a package from a group is ignored/and user chooses not to install it) If a group member is ignored, we expect a) a question whether to install b) after saying 'no' to a), the ignored member not to be installed c) all other group members to be installed d) pacman to execute successfully Signed-off-by: Dan McGee <dan(a)archlinux.org> (cherry picked from commit 9d0b33fd3327ae6d2b15f50870c0885a2068d492) commit e0d327462c460329b8d0f65f1324551accff939c Author: Dan McGee <dan(a)archlinux.org> Date: Wed Dec 29 20:06:40 2010 -0600 doc: add website zip to clean files Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/Makefile.am | 2 +- lib/libalpm/sync.c | 50 ++++++++++++++++++++++++++++------------ test/pacman/tests/ignore007.py | 21 ++++++++++++++++ 3 files changed, 57 insertions(+), 16 deletions(-) create mode 100644 test/pacman/tests/ignore007.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.2-206-g619c165
by dan＠archlinux.org 30 Dec '10

30 Dec '10

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 pacman repository". The branch, master has been updated via 619c165d36c2d89732c2658abaa61bf50ec1ac8e (commit) via 2052f29cdb2248ffbdc2d10b815ac50ad7494e01 (commit) via 0c29eb431a26467fc5ec14742cfcdc7ce3558334 (commit) via d22777146446ecaf8b4b9c0afd593d23c5c9766e (commit) via 81dd9d3ebc3eca04fade4df4689c53d1d11c5f19 (commit) via fcc09bd7e35766a5f025282491501824ee11cf27 (commit) via c002567d965bea56f740c46b35467446c276cd42 (commit) from bd98b93a6e161c436c22f6c39d2d6293f420cbcc (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 619c165d36c2d89732c2658abaa61bf50ec1ac8e Merge: 2052f29 c002567 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Dec 29 19:28:46 2010 -0600 Merge branch 'maint' commit 2052f29cdb2248ffbdc2d10b815ac50ad7494e01 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Dec 25 15:43:06 2010 +1000 makepkg: add option to clear buildflags Add the "buildflags" option, which is useful in its negative form for disabling CFLAGS, CXXFLAGS and LDFLAGS when building a package. This is useful when determining of one of these flags is causing an issue with a package. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0c29eb431a26467fc5ec14742cfcdc7ce3558334 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Dec 16 00:06:43 2010 +1000 makepkg: Add check() function for running test suites A PKGBUILD can have an option check() function for running test suites between the build() and package() stages. This function is run by default but can be disabled globally in with "!check" in BUILDENV in makepkg.conf. This setting can be controlled on an individual package basis using makepkg's --check and --nocheck flags. Addition dependencies needed for running the test suite can be specified in the checkdepends array and are only checked when running the check() function. Original-work-by: Jeff C <jeff(a)kcaccess.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d22777146446ecaf8b4b9c0afd593d23c5c9766e Author: Allan McRae <allan(a)archlinux.org> Date: Sat Dec 18 05:11:29 2010 +1000 Use limits.h for PATH_MAX We use PATH_MAX everywhere by including limits.h so there is no point in doing a check for it in a different header when dealing with FreeBSD's libfetch. Also, remove autoconf check for strings.h header as it is not used anywhere. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 81dd9d3ebc3eca04fade4df4689c53d1d11c5f19 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Dec 18 04:48:09 2010 +1000 Detect undefined PATH_MAX POSIX does not require PATH_MAX be defined when there is not actual limit to its value. This affects HURD based systems. Work around this by defining PATH_MAX to 4096 (as on Linux) when this is not defined. Also, clean up inclusions of limits.h and remove autoconf check for this header as we do not use macro shields for its inclusion anyway. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fcc09bd7e35766a5f025282491501824ee11cf27 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Dec 30 11:11:54 2010 +1000 Correct type for hash value storage Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 2 ++ PKGBUILD-split.proto | 6 ++++++ PKGBUILD.proto | 8 ++++++-- acinclude.m4 | 16 ++++++++++++++++ configure.ac | 5 +++-- contrib/PKGBUILD.vim | 2 +- doc/PKGBUILD.5.txt | 22 +++++++++++++++++++++- doc/index.txt | 31 +++++++++++++++++-------------- doc/makepkg.8.txt | 7 +++++++ doc/makepkg.conf.5.txt | 5 +++++ etc/makepkg.conf.in | 5 +++-- lib/libalpm/be_sync.c | 1 + lib/libalpm/db.h | 1 - lib/libalpm/deps.h | 2 +- lib/libalpm/dload.c | 7 ++----- lib/libalpm/error.c | 7 ++----- lib/libalpm/package.c | 1 - lib/libalpm/sync.c | 1 + lib/libalpm/trans.c | 1 + scripts/makepkg.sh.in | 40 ++++++++++++++++++++++++++++++++++++---- src/util/cleanupdelta.c | 2 ++ src/util/testdb.c | 2 ++ 22 files changed, 135 insertions(+), 39 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.2-1-gc002567
by dan＠archlinux.org 30 Dec '10

30 Dec '10

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 pacman repository". The branch, maint has been updated via c002567d965bea56f740c46b35467446c276cd42 (commit) from ba45cb459084a0746e0005345b8c5483834d1ba2 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: NEWS | 2 ++ doc/index.txt | 31 +++++++++++++++++-------------- 2 files changed, 19 insertions(+), 14 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Correct type for hash value storage
by Allan McRae 30 Dec '10

30 Dec '10

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/deps.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/deps.h b/lib/libalpm/deps.h index b720b36..34e09f6 100644 --- a/lib/libalpm/deps.h +++ b/lib/libalpm/deps.h @@ -31,7 +31,7 @@ struct __pmdepend_t { char *name; char *version; - long name_hash; + unsigned long name_hash; pmdepmod_t mod; }; -- 1.7.3.4

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.1-220-gbd98b93
by dan＠archlinux.org 30 Dec '10

30 Dec '10

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 pacman repository". The branch, master has been updated via bd98b93a6e161c436c22f6c39d2d6293f420cbcc (commit) via eb93955477c411eaf914c2f1650ce37d02d8b56e (commit) via a7972625e3ef98348b8a0957217aa2991501a07b (commit) via a58083459b096e935693d94b9cb51a447b3a1abd (commit) via 735a197fc29b6b85a64cae5a6fa95e1209552c3b (commit) via 34a78d935ac44fc73becc8bba213cdf0268bb5e0 (commit) via e3c19569cfe7cd77674490b30624e71512417e0b (commit) via fbcc42775492e5ba3df1b3235a23f23ad7faa241 (commit) via f2dff0860053f45c91e4ee301fda091a6b3d7361 (commit) via 126f50ab0b5ee3ed46c5a6ecae241e8af49b0fe2 (commit) from c78a808c49f1df12254ff9ae5ce32bd450e14df8 (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 bd98b93a6e161c436c22f6c39d2d6293f420cbcc Author: Dave Reisner <d(a)falconindy.com> Date: Sun Dec 26 19:12:55 2010 -0500 makepkg: escape closing bash array paren for awk The closing parenthesis of bash arrays needs to be escaped in the ending address of awk expressions in order to play nicely with implementations of awk other than gawk. This change provides compatibility with gawk, nawk and mawk. Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit eb93955477c411eaf914c2f1650ce37d02d8b56e Author: Allan McRae <allan(a)archlinux.org> Date: Sat Dec 25 13:14:55 2010 +1000 makepkg: allow pkgname usage in split package functions Currently, using $pkgname in a split package package_*() function always returns the first value in the pkgname array rather than the name of tha package being packaged. Fix this so $pkgname gives the expected value. Fixes FS#22174 Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a7972625e3ef98348b8a0957217aa2991501a07b Merge: a580834 735a197 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Dec 29 18:43:47 2010 -0600 Merge branch 'depcmp-perf' commit a58083459b096e935693d94b9cb51a447b3a1abd Merge: 126f50a e3c1956 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Dec 29 18:43:44 2010 -0600 Merge branch 'fgets-perf' commit 735a197fc29b6b85a64cae5a6fa95e1209552c3b Author: Dan McGee <dan(a)archlinux.org> Date: Tue Dec 21 15:40:04 2010 -0600 Use name hashes in depends to avoid strcmp calls Just like we did for package name comparsions, if we add a depend name_hash field on depend struct initialization, we can use it instead of doing a string name comparison, saving us a lot of checks in the depcmp code. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 34a78d935ac44fc73becc8bba213cdf0268bb5e0 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 20 19:58:15 2010 -0600 Remove need for memory allocation in _alpm_depcmp Noticed when tweaking testdb, when we run _alpm_depcmp in loops and call it seven million times, the strdup()/free() combo can add up. Remove the need for any string duplication by some pointer manipulation and use of strncmp instead of strcmp. Also kill the function logger and add an escape so we don't needlessly retrieve the list of provides. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e3c19569cfe7cd77674490b30624e71512417e0b Author: Dan McGee <dan(a)archlinux.org> Date: Tue Dec 21 12:20:09 2010 -0600 Add pactest to test long archive reads This creates two packages with extremely long description lines (500KB and 600 KB), causing our archive read code to perform reallocation to store the whole contents. One of the packages will successfully read while the other will fail for the time being. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fbcc42775492e5ba3df1b3235a23f23ad7faa241 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Dec 21 12:19:26 2010 -0600 pactest: allow testing of package description And modify the code to not print the full rule string if it is more than 40 characters long; truncate it instead. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f2dff0860053f45c91e4ee301fda091a6b3d7361 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Dec 14 22:26:23 2010 -0600 Overhaul archive fgets function The old function was written in a time before we relied on it for nearly every operation. Since then, we have switched to the archive backend and now fast parsing is a big deal. The former function made a per-character call to the libarchive archive_read_data() function, which resulted in some 21 million calls in a typical "load all sync dbs" operation. If we instead do some buffering of our own and read the blocks directly, and then find our newlines from there, we can cut out the multiple layers of overhead and go from archive to parsed data much quicker. Both users of the former function are switched over to the new signature, made easier by the macros now in place in the sync backend parsing code. Performance: for a `pacman -Su` (no upgrades available), _alpm_archive_fgets() goes from being 29% of the total time to 12% The time spent on the libarchive function being called dropped from 24% to 6%. This pushes _alpm_pkg_find back to the title of slowest low-level function. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 126f50ab0b5ee3ed46c5a6ecae241e8af49b0fe2 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 20 19:54:33 2010 -0600 testdb: update for new database format Sync DB's no longer have an extracted directory, so remove the files check for those. Local databases no longer have a 'depends' file, so kill that check as well. Finally, do a little other cleanup and remove the need for PATH_MAX. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/be_package.c | 13 ++++-- lib/libalpm/be_sync.c | 15 ++++-- lib/libalpm/deps.c | 41 +++++++++++------ lib/libalpm/deps.h | 3 +- lib/libalpm/util.c | 100 ++++++++++++++++++++++++++++++++--------- lib/libalpm/util.h | 18 +++++++- scripts/makepkg.sh.in | 18 ++++--- src/util/testdb.c | 54 +++++++++------------- test/pacman/pmrule.py | 10 +++-- test/pacman/pmtest.py | 7 +--- test/pacman/tests/smoke002.py | 19 ++++++++ 11 files changed, 200 insertions(+), 98 deletions(-) create mode 100644 test/pacman/tests/smoke002.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: escape closing bash array paren for awk
by Dave Reisner 27 Dec '10

27 Dec '10

The closing parenthesis of bash arrays needs to be escaped in the ending address of awk expressions in order to play nicely with implementations of awk other than gawk. This change provides compatibility with gawk, nawk and mawk. Signed-off-by: Dave Reisner <d(a)falconindy.com> --- scripts/makepkg.sh.in | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 1996dd4..d9d8aa8 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1223,7 +1223,7 @@ check_sanity() { fi local provides_list - eval $(awk '/^[[:space:]]*provides=/,/)/' "$BUILDFILE" | sed "s/provides=/provides_list+=/") + eval $(awk '/^[[:space:]]*provides=/,/\)/' "$BUILDFILE" | sed "s/provides=/provides_list+=/") for i in ${provides_list[@]}; do if [[ $i != ${i//</} || $i != ${i//>/} ]]; then error "$(gettext "Provides array cannot contain comparison (< or >) operators.")" @@ -1232,7 +1232,7 @@ check_sanity() { done local backup_list - eval $(awk '/^[[:space:]]*backup=/,/)/' "$BUILDFILE" | sed "s/backup=/backup_list+=/") + eval $(awk '/^[[:space:]]*backup=/,/\)/' "$BUILDFILE" | sed "s/backup=/backup_list+=/") for i in "${backup_list[@]}"; do if [[ ${i:0:1} = "/" ]]; then error "$(gettext "Backup entry should not contain leading slash : %s")" "$i" @@ -1241,7 +1241,7 @@ check_sanity() { done local optdepends_list - eval $(awk '/^[[:space:]]*optdepends=/,/)/' "$BUILDFILE" | sed "s/optdepends=/optdepends_list+=/") + eval $(awk '/^[[:space:]]*optdepends=/,/\)/' "$BUILDFILE" | sed "s/optdepends=/optdepends_list+=/") for i in "${optdepends_list[@]}"; do local pkg=${i%%:*} if [[ ! $pkg =~ ^[[:alnum:]\>\<\=\.\+\_\-]+$ ]]; then @@ -1264,7 +1264,7 @@ check_sanity() { local valid_options=1 local known kopt options_list - eval $(awk '/^[[:space:]]*options=/,/)/' "$BUILDFILE" | sed "s/options=/options_list+=/") + eval $(awk '/^[[:space:]]*options=/,/\)/' "$BUILDFILE" | sed "s/options=/options_list+=/") for i in ${options_list[@]}; do known=0 # check if option matches a known option or its inverse -- 1.7.3.4

1 0

[pacman-dev] makepkg and (n)awk
by Nezmer 26 Dec '10

26 Dec '10

Hi, In commit ef977865, awk was added as an external tool needed by makepkg. As you know, there is different awk implementations out there. nawk is the implementation shipped by default in non-GNU systems As far as I know. Unfortunately, awk usage in makepkg is not nawk-compatible. Command: %gawk '/^[[:space:]]*provides=/,/)/' B | sed "s/provides=/provides_list+=/" Output: provides_list+=('p1' 'p2' '3') # comment Command: % awk '/^[[:space:]]*provides=/,/)/' B | sed "s/provides=/provides_list+=/" Output: awk: illegal primary in regular expression ) at source line number 1 context is >>> /^[[:space:]]*provides=/,/)/ <<< ====================== Anyway, what is awk doing here? Is it the same as: egrep '^\s*provides=$.*$'

3 3

[pacman-dev] [PATCH] makepkg: add option to clear buildflags
by Allan McRae 25 Dec '10

25 Dec '10

Add the "buildflags" option, which is useful in its negative form for disabling CFLAGS, CXXFLAGS and LDFLAGS when building a package. This is useful when determining of one of these flags is causing an issue with a package. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- I doubt this option would ever be used in a "final" PKGBUILD, but it is very useful when trying to figure out build issues. contrib/PKGBUILD.vim | 2 +- doc/PKGBUILD.5.txt | 6 ++++++ scripts/makepkg.sh.in | 9 ++++++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/contrib/PKGBUILD.vim b/contrib/PKGBUILD.vim index a50ca12..f627a5e 100644 --- a/contrib/PKGBUILD.vim +++ b/contrib/PKGBUILD.vim @@ -172,7 +172,7 @@ hi def link pbValidSha1sums Number " options syn keyword pb_k_options options contained -syn match pbOptions /$no$\?$strip\|docs\|libtool\|emptydirs\|zipman\|ccache\|distcc\|makeflags$/ contained +syn match pbOptions /$no$\?$strip\|docs\|libtool\|emptydirs\|zipman\|ccache\|distcc\|makeflags\|buildflags$/ contained syn match pbOptionsNeg /\!/ contained syn match pbOptionsDeprec /no/ contained syn region pbOptionsGroup start=/^options=(/ end=/)/ contains=pb_k_options,pbOptions,pbOptionsNeg,pbOptionsDeprec,pbIllegalOption,shDoubleQuote,shSingleQuote diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 2ccf0b2..e6c4a1f 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -233,6 +233,12 @@ name. The syntax is: `source=('filename::url')`. form `!distcc` with select packages that have problems building with distcc. + *buildflags*;; + Allow the use of user-specific buildflags (CFLAGS, CXXFLAGS, LDFLAGS) + during build as specified in linkman:makepkg.conf[5]. More useful in + its negative form `!buildflags` with select packages that have problems + building with custom buildflags. + *makeflags*;; Allow the use of user-specific makeflags during build as specified in linkman:makepkg.conf[5]. More useful in its negative form diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c8f128c..4e60b62 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -45,7 +45,7 @@ srcdir="$startdir/src" pkgdir="$startdir/pkg" packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'purge') -other_options=('ccache' 'distcc' 'makeflags') +other_options=('ccache' 'distcc' 'buildflags' 'makeflags') splitpkg_overrides=('pkgver' 'pkgrel' 'pkgdesc' 'arch' 'license' 'groups' \ 'depends' 'optdepends' 'provides' 'conflicts' 'replaces' \ 'backup' 'options' 'install' 'changelog') @@ -739,6 +739,13 @@ run_function() { fi local pkgfunc="$1" + # clear user-specified buildflags if requested + if [[ $(check_option buildflags) = "n" ]]; then + CFLAGS="" + CXXFLAGS="" + LDFLAGS="" + fi + # clear user-specified makeflags if requested if [[ $(check_option makeflags) = "n" ]]; then MAKEFLAGS="" -- 1.7.3.4

1 0

[pacman-dev] [PATCH] makepkg: Add check() function for running test suites
by Allan McRae 25 Dec '10

25 Dec '10

A PKGBUILD can have an option check() function for running test suites between the build() and package() stages. This function is run by default but can be disabled globally in with "!check" in BUILDENV in makepkg.conf. This setting can be controlled on an individual package basis using makepkg's --check and --nocheck flags. Addition dependencies needed for running the test suite can be specified in the checkdepends array and are only checked when running the check() function. Original-work-by: Jeff C <jeff(a)kcaccess.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This adds the --check option to force the running of the check() function when using !check in makepkg.conf. PKGBUILD-split.proto | 6 ++++++ PKGBUILD.proto | 8 ++++++-- doc/PKGBUILD.5.txt | 16 +++++++++++++++- doc/makepkg.8.txt | 7 +++++++ doc/makepkg.conf.5.txt | 5 +++++ etc/makepkg.conf.in | 5 +++-- scripts/makepkg.sh.in | 31 ++++++++++++++++++++++++++++--- 7 files changed, 70 insertions(+), 8 deletions(-) diff --git a/PKGBUILD-split.proto b/PKGBUILD-split.proto index f5114ab..52aacc5 100644 --- a/PKGBUILD-split.proto +++ b/PKGBUILD-split.proto @@ -16,6 +16,7 @@ license=('GPL') groups=() depends=() makedepends=() +checkdepends=() provides=() conflicts=() replaces=() @@ -33,6 +34,11 @@ build() { make } +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + package_pkg1() { # options and directives that can be overridden pkgver= diff --git a/PKGBUILD.proto b/PKGBUILD.proto index 71dbc14..98172d8 100644 --- a/PKGBUILD.proto +++ b/PKGBUILD.proto @@ -15,6 +15,7 @@ license=('GPL') groups=() depends=() makedepends=() +checkdepends=() optdepends=() provides=() conflicts=() @@ -29,14 +30,17 @@ md5sums=() #generate with 'makepkg -g' build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr make } -package() { +check() { cd "$srcdir/$pkgname-$pkgver" + make -k check +} +package() { + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir/" install } diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 3d3909a..2ccf0b2 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -156,6 +156,12 @@ name. The syntax is: `source=('filename::url')`. needed at runtime. Packages in this list follow the same format as depends. +*checkdepends (array)*:: + An array of packages that this package depends on to run its test suite, + but are not needed at runtime. Packages in this list follow the same + format as depends. These dependencies are only considered when the + check() function is present and is to be run by makepkg. + *optdepends (array)*:: An array of packages (and accompanying reasons) that are not essential for base functionality, but may be necessary to make full use of the contents @@ -263,10 +269,18 @@ If you create any variables of your own in the build function, it is recommended to use the bash `local` keyword to scope the variable to inside the build function. +check() Function +---------------- +An optional check() function can be specified in which a packages test-suite +may be run. This function is run between the build() and package() functions. +The function is run in `bash -e` mode, meaning any command that exits with a +non-zero status will cause the function to exit. Be sure any exotic commands +used are covered by `checkdepends`. + package() Function ------------------ An optional package() function can be specified in addition to the build() -function. This function is run immediately after the build() function. The +function. This function is run after the build() and check() functions. The function is run in `bash -e` mode, meaning any command that exits with a non-zero status will cause the function to exit. When specified in combination with the fakeroot BUILDENV option in linkman:makepkg.conf[5], fakeroot usage diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index ff0f2b6..3b83015 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -153,6 +153,13 @@ Options Only build listed packages from a split package. The use of quotes is necessary when specifying multiple packages. e.g. `--pkg "pkg1 pkg3"` +*\--check*:: + Run the check() function in the PKGBUILD, overriding the setting in + linkman:makepkg.conf[5]. + +*\--nocheck*:: + Do not run the check() function in the PKGBUILD or handle the checkdepends. + *\--noconfirm*:: (Passed to pacman) Prevent pacman from waiting for user input before proceeding with operations. diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 86ea6a3..020804c 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -93,6 +93,11 @@ Options be disabled for individual packages by placing `!ccache` in the PKGBUILD options array. + *check*;; + Run the check() function if present in the PKGBUILD. This can be + enabled or disabled for individual packages through the use of + makepkg's `--check` and `--nocheck` options respectively. + **DISTCC_HOSTS=**"host1 ...":: If using DistCC, this is used to specify a space-delimited list of hosts running in the DistCC cluster. In addition, you will want to modify your diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index c795432..81a11b1 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -39,15 +39,16 @@ CXXFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe" # BUILD ENVIRONMENT ######################################################################### # -# Defaults: BUILDENV=(fakeroot !distcc color !ccache) +# Defaults: BUILDENV=(fakeroot !distcc color !ccache check) # A negated environment option will do the opposite of the comments below. # #-- fakeroot: Allow building packages as a non-root user #-- distcc: Use the Distributed C/C++/ObjC compiler #-- color: Colorize output messages #-- ccache: Use ccache to cache compilation +#-- check: Run the check() function if present in the PKGBUILD # -BUILDENV=(fakeroot !distcc color !ccache) +BUILDENV=(fakeroot !distcc color !ccache check) # #-- If using DistCC, your MAKEFLAGS will also need modification. In addition, #-- specify a space-delimited list of hosts running in the DistCC cluster. diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 79b307a..c8f128c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -71,6 +71,7 @@ SOURCEONLY=0 IGNOREARCH=0 HOLDVER=0 BUILDFUNC=0 +CHECKFUNC=0 PKGFUNC=0 SPLITPKG=0 PKGLIST=() @@ -145,6 +146,9 @@ clean_up() { if (( BUILDFUNC )); then rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-build.log"* fi + if (( CHECKFUNC )); then + rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-check.log"* + fi if (( PKGFUNC )); then rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-package.log"* elif (( SPLITPKG )); then @@ -805,6 +809,10 @@ run_build() { run_function "build" } +run_check() { + run_function "check" +} + run_package() { local pkgfunc if [[ -z $1 ]]; then @@ -1547,8 +1555,10 @@ usage() { echo "$(gettext " -s, --syncdeps Install missing dependencies with pacman")" echo "$(gettext " --allsource Generate a source-only tarball including downloaded sources")" echo "$(gettext " --asroot Allow makepkg to run as root user")" + printf "$(gettext " --check Run the check() function in the %s")\n" "$BUILDSCRIPT" printf "$(gettext " --config <file> Use an alternate config file (instead of '%s')")\n" "$confdir/makepkg.conf" printf "$(gettext " --holdver Prevent automatic version bumping for development %ss")\n" "$BUILDSCRIPT" + printf "$(gettext " --nocheck Do not run the check() function in the %s")\n" "$BUILDSCRIPT" echo "$(gettext " --pkg <list> Only build listed packages from a split package")" echo "$(gettext " --skipinteg Do not fail when integrity checks are missing")" echo "$(gettext " --source Generate a source-only tarball without downloaded sources")" @@ -1584,10 +1594,10 @@ ARGLIST=("$@") # Parse Command Line Options. OPT_SHORT="AcCdefFghiLmop:rRsV" -OPT_LONG="allsource,asroot,ignorearch,clean,cleancache,nodeps" +OPT_LONG="allsource,asroot,ignorearch,check,clean,cleancache,nodeps" OPT_LONG+=",noextract,force,forcever:,geninteg,help,holdver" -OPT_LONG+=",install,log,nocolor,nobuild,pkg:,rmdeps,repackage,skipinteg" -OPT_LONG+=",source,syncdeps,version,config:" +OPT_LONG+=",install,log,nocolor,nobuild,nocheck,pkg:,rmdeps" +OPT_LONG+=",repackage,skipinteg,source,syncdeps,version,config:" # Pacman Options OPT_LONG+=",noconfirm,noprogressbar" OPT_TEMP="$(parse_options $OPT_SHORT $OPT_LONG "$@" || echo 'PARSE_OPTIONS FAILED')" @@ -1610,6 +1620,7 @@ while true; do -A|--ignorearch) IGNOREARCH=1 ;; -c|--clean) CLEANUP=1 ;; -C|--cleancache) CLEANCACHE=1 ;; + --check) RUN_CHECK='y' ;; --config) shift; MAKEPKG_CONF=$1 ;; -d|--nodeps) NODEPS=1 ;; -e|--noextract) NOEXTRACT=1 ;; @@ -1622,6 +1633,7 @@ while true; do -i|--install) INSTALL=1 ;; -L|--log) LOGGING=1 ;; -m|--nocolor) USE_COLOR='n' ;; + --nocheck) RUN_CHECK='n' ;; -o|--nobuild) NOBUILD=1 ;; -p) shift; BUILDFILE=$1 ;; --pkg) shift; PKGLIST=($1) ;; @@ -1837,6 +1849,12 @@ fi if declare -f build >/dev/null; then BUILDFUNC=1 fi +if declare -f check >/dev/null; then + # "Hide" check() function if not going to be run + if [[ $RUN_CHECK = 'y' || (! $(check_buildenv check) = "n" && ! $RUN_CHECK = "n") ]]; then + CHECKFUNC=1 + fi +fi if declare -f package >/dev/null; then PKGFUNC=1 elif [[ $SPLITPKG -eq 0 ]] && declare -f package_${pkgname} >/dev/null; then @@ -1900,6 +1918,7 @@ if (( INFAKEROOT )); then if (( ! REPKG )); then if (( BUILDFUNC )); then run_build + (( CHECKFUNC )) && run_check tidy_install fi else @@ -1950,6 +1969,10 @@ elif type -p "${PACMAN%% *}" >/dev/null; then msg "$(gettext "Checking buildtime dependencies...")" resolve_deps ${makedepends[@]} || deperr=1 + if (( CHECKFUNC )); then + resolve_deps ${checkdepends[@]} || deperr=1 + fi + if (( RMDEPS )); then current_pkglist=($(run_pacman -Qq)) # required by remove_deps fi @@ -2015,6 +2038,7 @@ else if (( ! REPKG )); then devel_update (( BUILDFUNC )) && run_build + (( CHECKFUNC )) && run_check fi if (( ! SPLITPKG )); then if (( PKGFUNC )); then @@ -2036,6 +2060,7 @@ else if (( ! REPKG && ( PKGFUNC || SPLITPKG ) )); then devel_update (( BUILDFUNC )) && run_build + (( CHECKFUNC )) && run_check cd "$startdir" fi -- 1.7.3.4

1 0

[pacman-dev] [PATCH] makepkg: allow pkgname usage in split package functions
by Allan McRae 25 Dec '10

25 Dec '10

Currently, using $pkgname in a split package package_*() function always returns the first value in the pkgname array rather than the name of tha package being packaged. Fix this so $pkgname gives the expected value. Fixes FS#22174 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 7042e76..5ac71ed 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1414,17 +1414,19 @@ restore_package_variables() { } run_split_packaging() { - for pkg in ${pkgname[@]}; do - pkgdir="$pkgdir/$pkg" + local pkgname_backup=${pkgname[@]} + for pkgname in ${pkgname_backup[@]}; do + pkgdir="$pkgdir/$pkgname" mkdir -p "$pkgdir" chmod a-s "$pkgdir" backup_package_variables - run_package $pkg + run_package $pkgname tidy_install - create_package $pkg + create_package $pkgname restore_package_variables pkgdir="${pkgdir%/*}" done + pkgname=${pkgname_backup[@]} } # Canonicalize a directory path if it exists -- 1.7.3.4

1 0