- Pacman-dev - lists.archlinux.org

[pacman-dev] Warning to pacman-git users - database format change
by Allan McRae 21 Dec '10

21 Dec '10

Pacman's local database format changes with this commit being pushed to master: commit 21833d90e26635fdd2c6af247790a9bf374b4d80 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Oct 30 15:35:43 2010 +1000 Merge desc and depends files in local db If you want to run pacman-git you will need to upgrade your pacman database format using the conviently named "pacman-db-upgrade" script in the scripts/ directory. This is not a particularly reversible operation, so if you run this you are stuck with pacman-git until the 3.5 release. Note that various scripts rely on the old database format. That includes namcap (which Dan is already fixing!). Allan

4 6

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

21 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 c78a808c49f1df12254ff9ae5ce32bd450e14df8 (commit) via a611879318a4c39488f977308af8ee90f428995b (commit) via 5776090055642bc7651a07cd9d31cf056d0531dc (commit) via 8ac7f7e6e557fe32dc36fce173db000b83611559 (commit) from 45146dccbb94f14fb56df2999131851ff15e46b9 (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 c78a808c49f1df12254ff9ae5ce32bd450e14df8 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Dec 18 22:47:16 2010 +1000 Only check diskspace availability if needs more than zero The amount of diskspace needed for a transaction can be less than zero. Only test this against the available disk space if it is positive, which avoids a comparison being made between signed and unsigned types (-Wsign-compare). Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a611879318a4c39488f977308af8ee90f428995b Author: Allan McRae <allan(a)archlinux.org> Date: Sat Dec 18 22:26:04 2010 +1000 Always specify arguement type in function delcarations Always declare a function with (void) rather than () when we expect no arguements. Fixes all warnings with -Wstrict-prototypes. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5776090055642bc7651a07cd9d31cf056d0531dc Author: Allan McRae <allan(a)archlinux.org> Date: Thu Dec 16 00:42:23 2010 +1000 makepkg: remove last inappropriate PKGBUILD usage We should always use $BUILDSCRIPT instead of PKGBUILD. The only remaining uses of PKGBUILD in makekg are in comments. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8ac7f7e6e557fe32dc36fce173db000b83611559 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Dec 14 22:09:43 2010 -0600 Use macros in sync DB parsing This simplifies a lot of the repetative code and makes it obvious where the tricky or different ones are (e.g. depends, dates). It also makes it significantly easier to change the way this code works in the future. There should be no functional change with this patch. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/alpm.h | 44 +++++++------- lib/libalpm/be_package.c | 2 +- lib/libalpm/be_sync.c | 151 ++++++++++++++++------------------------------ lib/libalpm/diskspace.c | 3 +- lib/libalpm/handle.h | 2 +- lib/libalpm/util.h | 4 +- scripts/makepkg.sh.in | 2 +- src/pacman/sync.c | 2 +- src/util/pactree.c | 2 +- 9 files changed, 83 insertions(+), 129 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Always specify arguement type in function delcarations
by Allan McRae 19 Dec '10

19 Dec '10

Always declare a function with (void) rather than () when we expect no arguements. Fixes all warnings with -Wstrict-prototypes. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/alpm.h | 44 ++++++++++++++++++++++---------------------- lib/libalpm/be_package.c | 2 +- lib/libalpm/handle.h | 2 +- lib/libalpm/util.h | 4 ++-- src/pacman/sync.c | 2 +- src/util/pactree.c | 2 +- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 86212a4..e17300f 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -97,69 +97,69 @@ typedef int (*alpm_cb_fetch)(const char *url, const char *localpath, * Options */ -alpm_cb_log alpm_option_get_logcb(); +alpm_cb_log alpm_option_get_logcb(void); void alpm_option_set_logcb(alpm_cb_log cb); -alpm_cb_download alpm_option_get_dlcb(); +alpm_cb_download alpm_option_get_dlcb(void); void alpm_option_set_dlcb(alpm_cb_download cb); -alpm_cb_fetch alpm_option_get_fetchcb(); +alpm_cb_fetch alpm_option_get_fetchcb(void); void alpm_option_set_fetchcb(alpm_cb_fetch cb); -alpm_cb_totaldl alpm_option_get_totaldlcb(); +alpm_cb_totaldl alpm_option_get_totaldlcb(void); void alpm_option_set_totaldlcb(alpm_cb_totaldl cb); -const char *alpm_option_get_root(); +const char *alpm_option_get_root(void); int alpm_option_set_root(const char *root); -const char *alpm_option_get_dbpath(); +const char *alpm_option_get_dbpath(void); int alpm_option_set_dbpath(const char *dbpath); -alpm_list_t *alpm_option_get_cachedirs(); +alpm_list_t *alpm_option_get_cachedirs(void); int alpm_option_add_cachedir(const char *cachedir); void alpm_option_set_cachedirs(alpm_list_t *cachedirs); int alpm_option_remove_cachedir(const char *cachedir); -const char *alpm_option_get_logfile(); +const char *alpm_option_get_logfile(void); int alpm_option_set_logfile(const char *logfile); -const char *alpm_option_get_lockfile(); +const char *alpm_option_get_lockfile(void); /* no set_lockfile, path is determined from dbpath */ -int alpm_option_get_usesyslog(); +int alpm_option_get_usesyslog(void); void alpm_option_set_usesyslog(int usesyslog); -alpm_list_t *alpm_option_get_noupgrades(); +alpm_list_t *alpm_option_get_noupgrades(void); void alpm_option_add_noupgrade(const char *pkg); void alpm_option_set_noupgrades(alpm_list_t *noupgrade); int alpm_option_remove_noupgrade(const char *pkg); -alpm_list_t *alpm_option_get_noextracts(); +alpm_list_t *alpm_option_get_noextracts(void); void alpm_option_add_noextract(const char *pkg); void alpm_option_set_noextracts(alpm_list_t *noextract); int alpm_option_remove_noextract(const char *pkg); -alpm_list_t *alpm_option_get_ignorepkgs(); +alpm_list_t *alpm_option_get_ignorepkgs(void); void alpm_option_add_ignorepkg(const char *pkg); void alpm_option_set_ignorepkgs(alpm_list_t *ignorepkgs); int alpm_option_remove_ignorepkg(const char *pkg); -alpm_list_t *alpm_option_get_ignoregrps(); +alpm_list_t *alpm_option_get_ignoregrps(void); void alpm_option_add_ignoregrp(const char *grp); void alpm_option_set_ignoregrps(alpm_list_t *ignoregrps); int alpm_option_remove_ignoregrp(const char *grp); -const char *alpm_option_get_arch(); +const char *alpm_option_get_arch(void); void alpm_option_set_arch(const char *arch); -int alpm_option_get_usedelta(); +int alpm_option_get_usedelta(void); void alpm_option_set_usedelta(int usedelta); -int alpm_option_get_checkspace(); +int alpm_option_get_checkspace(void); void alpm_option_set_checkspace(int checkspace); -pmdb_t *alpm_option_get_localdb(); -alpm_list_t *alpm_option_get_syncdbs(); +pmdb_t *alpm_option_get_localdb(void); +alpm_list_t *alpm_option_get_syncdbs(void); /* * Install reasons -- ie, why the package was installed @@ -407,9 +407,9 @@ typedef void (*alpm_trans_cb_conv)(pmtransconv_t, void *, void *, /* Transaction Progress callback */ typedef void (*alpm_trans_cb_progress)(pmtransprog_t, const char *, int, size_t, size_t); -int alpm_trans_get_flags(); -alpm_list_t * alpm_trans_get_add(); -alpm_list_t * alpm_trans_get_remove(); +int alpm_trans_get_flags(void); +alpm_list_t * alpm_trans_get_add(void); +alpm_list_t * alpm_trans_get_remove(void); int alpm_trans_init(pmtransflag_t flags, alpm_trans_cb_event cb_event, alpm_trans_cb_conv conv, alpm_trans_cb_progress cb_progress); diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 2416dc8..6426fe9 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -131,7 +131,7 @@ int _package_changelog_close(const pmpkg_t *pkg, void *fp) * lets us only initialize an operations struct once which can always be * accessed by this method. */ -static struct pkg_operations *get_file_pkg_ops() +static struct pkg_operations *get_file_pkg_ops(void) { static struct pkg_operations *file_pkg_ops = NULL; /* determine whether our static file_pkg_ops struct has been initialized */ diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 46414b9..b471ea6 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -66,7 +66,7 @@ typedef struct _pmhandle_t { /* global handle variable */ extern pmhandle_t *handle; -pmhandle_t *_alpm_handle_new(); +pmhandle_t *_alpm_handle_new(void); void _alpm_handle_free(pmhandle_t *handle); #endif /* _ALPM_HANDLE_H */ diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index dfdc6a7..543643b 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -79,8 +79,8 @@ int _alpm_makepath(const char *path); int _alpm_makepath_mode(const char *path, mode_t mode); int _alpm_copyfile(const char *src, const char *dest); char *_alpm_strtrim(char *str); -int _alpm_lckmk(); -int _alpm_lckrm(); +int _alpm_lckmk(void); +int _alpm_lckrm(void); int _alpm_unpack_single(const char *archive, const char *prefix, const char *fn); int _alpm_unpack(const char *archive, const char *prefix, alpm_list_t *list, int breakfirst); int _alpm_rmrf(const char *path); diff --git a/src/pacman/sync.c b/src/pacman/sync.c index f9d12e4..6961f3c 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -571,7 +571,7 @@ static int sync_list(alpm_list_t *syncs, alpm_list_t *targets) return(0); } -static alpm_list_t *syncfirst() { +static alpm_list_t *syncfirst(void) { alpm_list_t *i, *res = NULL; for(i = config->syncfirst; i; i = alpm_list_next(i)) { diff --git a/src/util/pactree.c b/src/util/pactree.c index 5e86967..967f5c8 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -54,7 +54,7 @@ int reverse = 0; int unique = 0; char *dbpath = NULL; -static int alpm_local_init() +static int alpm_local_init(void) { int ret; -- 1.7.3.3

3 8

[pacman-dev] [PATCH] Use limits.h for PATH_MAX
by Allan McRae 19 Dec '10

19 Dec '10

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. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- configure.ac | 4 ++-- lib/libalpm/dload.c | 6 ++---- lib/libalpm/error.c | 6 ++---- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index 18e8996..e03a937 100644 --- a/configure.ac +++ b/configure.ac @@ -172,8 +172,8 @@ AS_IF([test "x$with_fetch" != "xno"], AM_CONDITIONAL([HAVE_LIBFETCH], [test "x$ac_cv_lib_fetch_fetchParseURL" = "xyes"]) # Checks for header files. -AC_CHECK_HEADERS([fcntl.h glob.h libintl.h limits.h locale.h mntent.h string.h strings.h \ - sys/ioctl.h sys/mount.h sys/param.h sys/statvfs.h sys/syslimits.h \ +AC_CHECK_HEADERS([fcntl.h glob.h libintl.h limits.h locale.h mntent.h string.h \ + strings.h sys/ioctl.h sys/mount.h sys/param.h sys/statvfs.h \ sys/time.h sys/types.h sys/ucred.h syslog.h wchar.h]) # Checks for typedefs, structures, and compiler characteristics. diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index ea7f557..09f716f 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -29,10 +29,8 @@ #include <sys/types.h> #include <sys/stat.h> #include <signal.h> -/* the following two are needed on BSD for libfetch */ -#if defined(HAVE_SYS_SYSLIMITS_H) -#include <sys/syslimits.h> /* PATH_MAX */ -#endif +/* the following two are needed for FreeBSD's libfetch */ +#include <limits.h> /* PATH_MAX */ #if defined(HAVE_SYS_PARAM_H) #include <sys/param.h> /* MAXHOSTNAMELEN */ #endif diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index d4c296f..3d05626 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -22,10 +22,8 @@ /* TODO: needed for the libfetch stuff, unfortunately- we should kill it */ #include <stdio.h> -/* the following two are needed on BSD for libfetch */ -#if defined(HAVE_SYS_SYSLIMITS_H) -#include <sys/syslimits.h> /* PATH_MAX */ -#endif +/* the following two are needed for FreeBSD's libfetch */ +#include <limits.h> /* PATH_MAX */ #if defined(HAVE_SYS_PARAM_H) #include <sys/param.h> /* MAXHOSTNAMELEN */ #endif -- 1.7.3.3

2 2

[pacman-dev] [PATCH] Detect undefined PATH_MAX
by Allan McRae 18 Dec '10

18 Dec '10

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 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- We do something like: #if !defined(PATH_MAX) #include <limits.h> #endif to only include limits.h when necessary, but given any decent compiler gets rid of unused stuff anyway, I do not think it necessary. acinclude.m4 | 16 ++++++++++++++++ configure.ac | 1 + lib/libalpm/be_sync.c | 1 + lib/libalpm/db.h | 1 - lib/libalpm/dload.c | 1 - lib/libalpm/error.c | 1 - lib/libalpm/package.c | 1 - lib/libalpm/sync.c | 1 + lib/libalpm/trans.c | 1 + src/util/cleanupdelta.c | 2 ++ src/util/testdb.c | 2 ++ 11 files changed, 24 insertions(+), 4 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 6693da4..7309d73 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -125,3 +125,19 @@ extern int getmntinfo (struct statfs **, int); [Defined as the filesystem stats type ('statvfs' or 'statfs')]) ]) +dnl Checks for PATH_MAX and defines it if not present +AC_DEFUN([PATH_MAX_DEFINED], + [AC_CACHE_CHECK([PATH_MAX defined], path_max_cv_defined, + [AC_EGREP_CPP(yes, [[ +#include <limits.h> +#if defined(PATH_MAX) +yes +#endif +]], + [path_max_cv_defined=yes], + [path_max_cv_defined=no])] + ) + if test $path_max_cv_defined = no; then + AC_DEFINE([PATH_MAX], 4096, [Define if PATH_MAX is undefined by limits.h.]) + fi +]) diff --git a/configure.ac b/configure.ac index 747c8b7..18e8996 100644 --- a/configure.ac +++ b/configure.ac @@ -185,6 +185,7 @@ AC_TYPE_SIZE_T AC_STRUCT_TM AC_TYPE_UID_T AC_STRUCT_DIRENT_D_TYPE +PATH_MAX_DEFINED # Checks for library functions. AC_FUNC_FORK diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index b201c00..d5d3a44 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -23,6 +23,7 @@ #include <errno.h> #include <ctype.h> #include <locale.h> +#include <limits.h> /* libarchive */ #include <archive.h> diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h index ace366d..10aa164 100644 --- a/lib/libalpm/db.h +++ b/lib/libalpm/db.h @@ -23,7 +23,6 @@ #define _ALPM_DB_H #include "alpm.h" -#include <limits.h> #include <time.h> /* libarchive */ diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 1cb24e6..ea7f557 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -29,7 +29,6 @@ #include <sys/types.h> #include <sys/stat.h> #include <signal.h> -#include <limits.h> /* the following two are needed on BSD for libfetch */ #if defined(HAVE_SYS_SYSLIMITS_H) #include <sys/syslimits.h> /* PATH_MAX */ diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index 78a7866..d4c296f 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -22,7 +22,6 @@ /* TODO: needed for the libfetch stuff, unfortunately- we should kill it */ #include <stdio.h> -#include <limits.h> /* the following two are needed on BSD for libfetch */ #if defined(HAVE_SYS_SYSLIMITS_H) #include <sys/syslimits.h> /* PATH_MAX */ diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 2ea5125..edfb7bd 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -25,7 +25,6 @@ #include <stdio.h> #include <stdlib.h> -#include <limits.h> #include <string.h> #include <ctype.h> #include <errno.h> diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 2d0a899..7a1e503 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -31,6 +31,7 @@ #include <stdint.h> /* intmax_t */ #include <unistd.h> #include <time.h> +#include <limits.h> /* libalpm */ #include "sync.h" diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 5bc2c91..5c13211 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -31,6 +31,7 @@ #include <sys/stat.h> #include <sys/statvfs.h> #include <errno.h> +#include <limits.h> /* libalpm */ #include "trans.h" diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index c1ef18c..2010282 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -17,6 +17,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include "config.h" + #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/src/util/testdb.c b/src/util/testdb.c index 28f2b2b..f77583a 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -17,6 +17,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include "config.h" + #include <unistd.h> #include <stdio.h> #include <stdlib.h> -- 1.7.3.3

1 1

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

15 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 and on an individual package basis using the --nocheck flag. 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> --- PKGBUILD-split.proto | 6 ++++++ PKGBUILD.proto | 8 ++++++-- doc/PKGBUILD.5.txt | 16 +++++++++++++++- doc/makepkg.8.txt | 3 +++ doc/makepkg.conf.5.txt | 5 +++++ etc/makepkg.conf.in | 5 +++-- scripts/makepkg.sh.in | 27 +++++++++++++++++++++++++-- 7 files changed, 63 insertions(+), 7 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..0087ddd 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -153,6 +153,9 @@ Options Only build listed packages from a split package. The use of quotes is necessary when specifying multiple packages. e.g. `--pkg "pkg1 pkg3"` +*\--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..2293a8d 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 + disabled for individual packages through the use of makepkg's + `--nocheck` option. + **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 ac10ad3..6707336 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,6 +1555,7 @@ usage() { echo "$(gettext " --asroot Allow makepkg to run as root user")" printf "$(gettext " --config <file> Use an alternate config file (instead of '%s')")\n" "$confdir/makepkg.conf" echo "$(gettext " --holdver Prevent automatic version bumping for development PKGBUILDs")" + echo "$(gettext " --nocheck Do not run the check() function in the '%s'")" "$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,8 +1593,8 @@ ARGLIST=("$@") OPT_SHORT="AcCdefFghiLmop:rRsV" OPT_LONG="allsource,asroot,ignorearch,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')" @@ -1620,6 +1629,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) ;; @@ -1835,6 +1845,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 [[ ! $(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 @@ -1898,6 +1914,7 @@ if (( INFAKEROOT )); then if (( ! REPKG )); then if (( BUILDFUNC )); then run_build + (( CHECKFUNC )) && run_check tidy_install fi else @@ -1948,6 +1965,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 @@ -2013,6 +2034,7 @@ else if (( ! REPKG )); then devel_update (( BUILDFUNC )) && run_build + (( CHECKFUNC )) && run_check fi if (( ! SPLITPKG )); then if (( PKGFUNC )); then @@ -2034,6 +2056,7 @@ else if (( ! REPKG && ( PKGFUNC || SPLITPKG ) )); then devel_update (( BUILDFUNC )) && run_build + (( CHECKFUNC )) && run_check cd "$startdir" fi -- 1.7.3.3

1 1

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

15 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 45146dccbb94f14fb56df2999131851ff15e46b9 (commit) via ab9c0814d291db840f60073b4e63d58f932e5e64 (commit) via 6605637b5317ad82f2177cc27c5a29450a8a1ef7 (commit) via c7d332a26ad59772de5f37e855858cab97e26bb4 (commit) via 919bb6c9e00820c3930067b5985a246a455bef57 (commit) via c2a73ba989fffb59c1b8ac7edb265a996dfc184d (commit) via dbf59a6b141213b0afc962c71347eb83f8bcab73 (commit) via d1d163c5a3627675e4d063d196ea2b2255507cc8 (commit) via ba45cb459084a0746e0005345b8c5483834d1ba2 (commit) via c5f6995aeb7f0622b63a736208850c9c86f38aad (commit) via a5e43b16052b5db0de285cb4abfbcd5dff58f7ad (commit) via 580fe21065896a1cc239db72e66107f7997b3039 (commit) via c00e05992e142219c30caf154d62d6166ae28338 (commit) via 94d3d665f0b0b4c934de73580afcb137fea9baa6 (commit) via 8f18798d10ab74c79dce3e0b11b5896104299d73 (commit) from 5f36523af9de20a8c74714da4125bb553b0fae2c (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 45146dccbb94f14fb56df2999131851ff15e46b9 Merge: ab9c081 ba45cb4 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Dec 15 00:41:59 2010 -0600 Merge branch 'maint' commit ab9c0814d291db840f60073b4e63d58f932e5e64 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Dec 15 00:14:25 2010 -0600 Add a cushion for diskspace checking It is the minimum of 5% of disk capacity or 20 MiB on a per-partition basis. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6605637b5317ad82f2177cc27c5a29450a8a1ef7 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Dec 13 15:44:21 2010 +1000 Document PKGEXT and SRCEXT Add some basic documentation for the PKGEXT and SRCEXT options in makepkg.conf. Fixes FS#21302. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c7d332a26ad59772de5f37e855858cab97e26bb4 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Dec 14 17:45:12 2010 -0600 Reorganize fields in package struct Saves a few bytes due to padding (256 -> 248 bytes), especially on x86_64, so we get the overhead of our new hash field right back. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 919bb6c9e00820c3930067b5985a246a455bef57 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Dec 14 12:36:02 2010 -0600 Used hashed package name in _alpm_pkg_find This results in huge gains to a lot of our codepaths since this is the most frequent method of random access to packages in a list. The gains are seen in both profiling and real life. $ pacman -Sii zvbi real: 0.41 sec -> 0.32 sec strcmp: 16,669,760 calls -> 473,942 calls _alpm_pkg_find: 52.73% -> 26.31% of time $ pacman -Su (no upgrades found) real: 0.40 sec -> 0.50 sec strcmp: 19,497,226 calls -> 524,097 calls _alpm_pkg_find: 52.36% -> 26.15% of time There is some minor risk with this patch, but most of it should be avoided by falling back to strcmp() if we encounter a package with a '0' hash value (which we should not via any existing code path). We also do a strcmp once hash values match to ensure against hash collisions. The risk left is that a package name is modified once it was originally set, but the hash value is left alone. That would probably result in a lot of other problems anyway. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c2a73ba989fffb59c1b8ac7edb265a996dfc184d Author: Dan McGee <dan(a)archlinux.org> Date: Tue Dec 14 12:06:31 2010 -0600 When setting package name, set hash value as well Signed-off-by: Dan McGee <dan(a)archlinux.org> commit dbf59a6b141213b0afc962c71347eb83f8bcab73 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Dec 14 11:56:32 2010 -0600 Add hash_sdbm function This is prepping for the addition of a hash field to each package to greatly speed up the string comparisons we frequently do on package name in _alpm_pkg_find. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d1d163c5a3627675e4d063d196ea2b2255507cc8 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Dec 14 11:50:50 2010 -0600 Use _alpm_pkg_find in deps search Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a5e43b16052b5db0de285cb4abfbcd5dff58f7ad Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 13 21:06:42 2010 -0600 Correctly force load of package reason Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 580fe21065896a1cc239db72e66107f7997b3039 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 13 21:00:23 2010 -0600 Abstract has_scriptlet() to package ops struct Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c00e05992e142219c30caf154d62d6166ae28338 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 13 20:19:32 2010 -0600 Remove non-public functions from header And rename accordingly. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 94d3d665f0b0b4c934de73580afcb137fea9baa6 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 13 20:16:36 2010 -0600 Mark sync_db_read() as static Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 2 +- configure.ac | 4 ++-- doc/PKGBUILD.5.txt | 39 ++++++++++++++++++++++----------------- doc/makepkg.conf.5.txt | 5 +++-- lib/libalpm/be_local.c | 19 +++++++++++++++++-- lib/libalpm/be_package.c | 1 + lib/libalpm/be_sync.c | 12 ++++++++---- lib/libalpm/db.c | 6 +----- lib/libalpm/db.h | 4 ---- lib/libalpm/deps.c | 4 ++-- lib/libalpm/diskspace.c | 11 ++++++++--- lib/libalpm/package.c | 30 +++++++++++++++++------------- lib/libalpm/package.h | 33 +++++++++++++++++---------------- lib/libalpm/util.c | 22 ++++++++++++++++++++++ lib/libalpm/util.h | 1 + 15 files changed, 122 insertions(+), 71 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.1-21-gba45cb4
by dan＠archlinux.org 15 Dec '10

15 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 ba45cb459084a0746e0005345b8c5483834d1ba2 (commit) via c5f6995aeb7f0622b63a736208850c9c86f38aad (commit) via 8f18798d10ab74c79dce3e0b11b5896104299d73 (commit) from 5c8083baa4a831b16adcc3c1c35d7438f5bdcc3e (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 ba45cb459084a0746e0005345b8c5483834d1ba2 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 13 22:35:33 2010 -0600 doc/PKGBUILD: document that functions run in -e mode Caught this noted on the forums, but it is definitely worth a note in the manpage as well. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c5f6995aeb7f0622b63a736208850c9c86f38aad Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 13 22:35:24 2010 -0600 Fix manpage wrap not at 80 characters Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8f18798d10ab74c79dce3e0b11b5896104299d73 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Dec 12 23:07:54 2010 -0600 Update news and bump versions Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 2 +- configure.ac | 4 ++-- doc/PKGBUILD.5.txt | 39 ++++++++++++++++++++++----------------- 3 files changed, 25 insertions(+), 20 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Diskspace checking thought- free space cushion
by Dan McGee 15 Dec '10

15 Dec '10

Code in question is diskspace.c, line ~300: for(i = mount_points; i; i = alpm_list_next(i)) { alpm_mountpoint_t *data = i->data; if(data->used == 1) { _alpm_log(PM_LOG_DEBUG, "partition %s, needed %ld, free %ld\n", data->mount_dir, data->max_blocks_needed, (unsigned long)data->fsp.f_bfree); if(data->max_blocks_needed > data->fsp.f_bfree) { abort = 1; } } } This does a strict check of max_blocks_needed > fsp.f_bfree. do we want to cushion this somehow, as having 1 block free could still spell disaster given logging, post-install scripts, etc.? And if so, how much? I don't want to make this something that has loads and loads of configuration- we hardcode max delta ratio at 0.7, for instance. Is 5% of total blocks, capped at something like 10 MB (in 4K blocks that would be 2560 blocks) enough? -Dan

3 4

[pacman-dev] [PATCH 0/4] Package list find performance improvements
by Dan McGee 14 Dec '10

14 Dec '10

This series of patches makes finding a package in our linked list implementation a whole lot faster, if that search is using the standard _alpm_pkg_find, which nearly all are (after the first patch). It does this by adding a hash function to util.c which is nothing too complicated and named after a publicly available algorithm. When packages are created, we fill in this hash value as soon as the pkgname is read. Finally, the _alpm_pkg_find function is rewritten to take advantage of this field, avoiding repeated strcmp() calls and only falling back to that if a hash is not available and to verify the hash value was not some sort of collision. Performance figures and numbers are available in the last patch. This actually speeds up operations by nearly 33%, so this is not a total waste of time to consider. :) Review and questions/comments/concerns welcome! -Dan Dan McGee (4): Use _alpm_pkg_find in deps search Add hash_sdbm function When setting package name, set hash value as well Used hashed package name in _alpm_pkg_find lib/libalpm/be_package.c | 1 + lib/libalpm/deps.c | 4 ++-- lib/libalpm/package.c | 16 ++++++++++++++-- lib/libalpm/package.h | 1 + lib/libalpm/util.c | 22 ++++++++++++++++++++++ lib/libalpm/util.h | 1 + 6 files changed, 41 insertions(+), 4 deletions(-) -- 1.7.3.3

5 8