- Pacman-dev - lists.archlinux.org

[pacman-dev] CVS update of pacman-lib/src/pacman (downloadprog.c)
by Aaron Griffin 07 Feb '07

07 Feb '07

Date: Tuesday, February 6, 2007 @ 22:15:18 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: downloadprog.c (1.10 -> 1.11) I broke the progress bars earlier. Put that back to normal. ----------------+ downloadprog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/src/pacman/downloadprog.c diff -u pacman-lib/src/pacman/downloadprog.c:1.10 pacman-lib/src/pacman/downloadprog.c:1.11 --- pacman-lib/src/pacman/downloadprog.c:1.10 Tue Feb 6 16:54:39 2007 +++ pacman-lib/src/pacman/downloadprog.c Tue Feb 6 22:15:18 2007 @@ -73,7 +73,7 @@ timediff = get_update_timediff(0); } - if(percent > 0 && percent <= 100 && !timediff) { + if(percent > 0 && percent < 100 && !timediff) { /* only update the progress bar when * a) we first start * b) we end the progress

1 0

[pacman-dev] CVS update of pacman-lib (7 files)
by dan＠archlinux.org 06 Feb '07

06 Feb '07

Date: Tuesday, February 6, 2007 @ 17:36:14 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: NEWS (1.6 -> 1.7) TODO.dan (1.3 -> 1.4) etc/makepkg.conf.in (1.11 -> 1.12) lib/libalpm/po/POTFILES.in (1.2 -> 1.3) scripts/makepkg (1.44 -> 1.45) src/pacman/package.c (1.26 -> 1.27) src/pacman/query.c (1.22 -> 1.23) * Makepkg updates, and small bugfix on man page compression. * Change libtool default to makepkg2 behavior. * Other small changes. ----------------------------+ NEWS | 1 + TODO.dan | 1 - etc/makepkg.conf.in | 2 +- lib/libalpm/po/POTFILES.in | 2 +- scripts/makepkg | 10 +++++++++- src/pacman/package.c | 3 +-- src/pacman/query.c | 2 +- 7 files changed, 14 insertions(+), 7 deletions(-) Index: pacman-lib/NEWS diff -u pacman-lib/NEWS:1.6 pacman-lib/NEWS:1.7 --- pacman-lib/NEWS:1.6 Fri Feb 2 22:46:06 2007 +++ pacman-lib/NEWS Tue Feb 6 17:36:13 2007 @@ -21,6 +21,7 @@ - added pactest testing suite - abs - supports cvsup/csup, expanded configuration - makepkg fixes: + - new configuration file options format - support alternate integrity checks - extract files using filetype, not extension - added noextract array Index: pacman-lib/TODO.dan diff -u pacman-lib/TODO.dan:1.3 pacman-lib/TODO.dan:1.4 --- pacman-lib/TODO.dan:1.3 Sun Feb 4 13:28:21 2007 +++ pacman-lib/TODO.dan Tue Feb 6 17:36:13 2007 @@ -46,7 +46,6 @@ -- http://everything2.com/?node_id=556079 Quick hits: -* log_progress and cb_trans_progress - same function? not quite but close * unsigned int vs. unsigned * 'ldd' & 'ldd -u' - many linkages * possibly split utilities/extras from pacman package Index: pacman-lib/etc/makepkg.conf.in diff -u pacman-lib/etc/makepkg.conf.in:1.11 pacman-lib/etc/makepkg.conf.in:1.12 --- pacman-lib/etc/makepkg.conf.in:1.11 Sun Feb 4 13:31:39 2007 +++ pacman-lib/etc/makepkg.conf.in Tue Feb 6 17:36:13 2007 @@ -56,7 +56,7 @@ #-- libtool: Leave libtool (.la) files in binaries #-- emptydirs: Leave empty directories in binaries # -OPTIONS=(strip !docs !libtool emptydirs) +OPTIONS=(strip !docs libtool emptydirs) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5 sha1) Index: pacman-lib/lib/libalpm/po/POTFILES.in diff -u pacman-lib/lib/libalpm/po/POTFILES.in:1.2 pacman-lib/lib/libalpm/po/POTFILES.in:1.3 --- pacman-lib/lib/libalpm/po/POTFILES.in:1.2 Sun Oct 15 15:31:07 2006 +++ pacman-lib/lib/libalpm/po/POTFILES.in Tue Feb 6 17:36:13 2007 @@ -1,5 +1,6 @@ add.c alpm.c +alpm_list.c backup.c be_files.c cache.c @@ -9,7 +10,6 @@ error.c group.c handle.c -list.c log.c md5.c md5driver.c Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.44 pacman-lib/scripts/makepkg:1.45 --- pacman-lib/scripts/makepkg:1.44 Tue Feb 6 16:20:20 2007 +++ pacman-lib/scripts/makepkg Tue Feb 6 17:36:14 2007 @@ -862,7 +862,8 @@ fi # move /usr/share/man files to /usr/man -if [ -d pkg/usr/share/man ]; then +if [ -d $startdir/pkg/usr/share/man ]; then + cd $startdir mkdir -p pkg/usr/man cp -a pkg/usr/share/man/* pkg/usr/man/ rm -rf pkg/usr/share/man @@ -964,6 +965,13 @@ echo "backup = $it" >>.PKGINFO done +# TODO maybe remove this at some point +# warn if license array is not present or empty +if [ "$license" = "" ]; then + warning "Please add a license line to your $BUILDSCRIPT!" + plain "example for GPL'ed software: license=('GPL')." +fi + # check for an install script if [ "$install" != "" ]; then msg "Copying install script..." Index: pacman-lib/src/pacman/package.c diff -u pacman-lib/src/pacman/package.c:1.26 pacman-lib/src/pacman/package.c:1.27 --- pacman-lib/src/pacman/package.c:1.26 Wed Jan 31 21:16:13 2007 +++ pacman-lib/src/pacman/package.c Tue Feb 6 17:36:14 2007 @@ -98,9 +98,8 @@ if(level > 1) { /* call new backup function */ dump_pkg_backups(pkg); + printf("\n"); } - - printf("\n"); } /* Display the content of a sync package Index: pacman-lib/src/pacman/query.c diff -u pacman-lib/src/pacman/query.c:1.22 pacman-lib/src/pacman/query.c:1.23 --- pacman-lib/src/pacman/query.c:1.22 Sun Feb 4 03:26:53 2007 +++ pacman-lib/src/pacman/query.c Tue Feb 6 17:36:14 2007 @@ -125,7 +125,7 @@ } if(config->op_q_upgrade) { - MSG(NL, _("Checking for package upgrades")); + MSG(NL, _("Checking for package upgrades...")); alpm_list_t *syncpkgs; if((syncpkgs = alpm_get_upgrades()) != NULL) {

1 0

[pacman-dev] CVS update of pacman-lib/src/pacman (downloadprog.c)
by Aaron Griffin 06 Feb '07

06 Feb '07

Date: Tuesday, February 6, 2007 @ 16:54:39 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: downloadprog.c (1.9 -> 1.10) Minor experimental changes to the download progress bar: * change to Mb and Gb for both total size and transfer rate if needed * round up to 1 second for downloads that were between 1s and 0.5s This function needs some serious looking at, as it's probably not 64bit safe (thus the "wrong calculation" problem on the list). ----------------+ downloadprog.c | 50 ++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 38 insertions(+), 12 deletions(-) Index: pacman-lib/src/pacman/downloadprog.c diff -u pacman-lib/src/pacman/downloadprog.c:1.9 pacman-lib/src/pacman/downloadprog.c:1.10 --- pacman-lib/src/pacman/downloadprog.c:1.9 Sat Feb 3 20:36:45 2007 +++ pacman-lib/src/pacman/downloadprog.c Tue Feb 6 16:54:39 2007 @@ -73,7 +73,7 @@ timediff = get_update_timediff(0); } - if(percent > 0 && percent < 100 && !timediff) { + if(percent > 0 && percent <= 100 && !timediff) { /* only update the progress bar when * a) we first start * b) we end the progress @@ -84,17 +84,22 @@ gettimeofday(&current_time, NULL); total_timediff = current_time.tv_sec-initial_time.tv_sec - + (float)(current_time.tv_usec-initial_time.tv_usec) / 1000000; + + (float)(current_time.tv_usec-initial_time.tv_usec) / 1000000.0; if(xfered == total) { /* compute final values */ - rate = (float)total / (total_timediff * 1024); - eta_s = (unsigned int)total_timediff; + rate = (float)total / (total_timediff * 1024.0); + if(total_timediff < 1.0 && total_timediff > 0.5) { + /* round up so we don't display 00:00:00 for quick downloads all the time*/ + eta_s = 1; + } else { + eta_s = (unsigned int)total_timediff; + } set_output_padding(0); /* shut off padding */ } else { - rate = (float)(xfered - xfered_last) / (timediff * 1024); + rate = (float)(xfered - xfered_last) / (timediff * 1024.0); rate = (float)(rate + 2*rate_last) / 3; - eta_s = (unsigned int)(total - xfered) / (rate * 1024); + eta_s = (unsigned int)(total - xfered) / (rate * 1024.0); } rate_last = rate; @@ -114,14 +119,35 @@ fname[FILENAME_TRIM_LEN] = '\0'; } - /* DL rate cap, for printf formatting - this should be sane for a while - * if anything we can change to MB/s if we need a higher rate */ - if(rate > 9999.9) { - rate = 9999.9; + /* Awesome formatting for progress bar. We need a mess of Kb->Mb->Gb stuff + * here. We'll use limit of 2048 for each until we get some empirical */ + char rate_size = 'K'; + char xfered_size = 'K'; + if(rate > 2048.0) { + rate /= 1024.0; + rate_size = 'M'; + if(rate > 2048.0) { + rate /= 1024.0; + rate_size = 'G'; + /* we should not go higher than this for a few years (9999.9 Gb/s?)*/ + } } - printf(" %-*s %6dK %#6.1fK/s %02u:%02u:%02u", FILENAME_TRIM_LEN, fname, - xfered/1024, rate, eta_h, eta_m, eta_s); + xfered /= 1024; /* convert to K by default */ + if(xfered > 2048) { + xfered /= 1024; + xfered_size = 'M'; + if(xfered > 2048) { + xfered /= 1024; + xfered_size = 'G'; + /* I should seriously hope that archlinux packages never break + * the 9999.9GB mark... we'd have more serious problems than the progress + * bar in pacman */ + } + } + + printf(" %-*s %6d%c %#6.1f%c/s %02u:%02u:%02u", FILENAME_TRIM_LEN, fname, + xfered/1024, xfered_size, rate, rate_size, eta_h, eta_m, eta_s); free(fname);

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (package.c)
by dan＠archlinux.org 06 Feb '07

06 Feb '07

Date: Tuesday, February 6, 2007 @ 16:28:30 Author: dan Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: package.c (1.60 -> 1.61) Cleaning up mistakes. :P -----------+ package.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.60 pacman-lib/lib/libalpm/package.c:1.61 --- pacman-lib/lib/libalpm/package.c:1.60 Tue Feb 6 15:57:17 2007 +++ pacman-lib/lib/libalpm/package.c Tue Feb 6 16:28:29 2007 @@ -125,7 +125,7 @@ /* Is pkgB an upgrade for pkgA ? */ int alpm_pkg_compare_versions(pmpkg_t *pkgA, pmpkg_t *pkgB) { - if(spkg->origin == PKG_FROM_CACHE) { + if(pkgB->origin == PKG_FROM_CACHE) { /* ensure we have the /desc file, which contains the 'force' option */ _alpm_db_read(pkgB->data, INFRQ_DESC, pkgB); }

2 1

[pacman-dev] coloured pacman
by Vojtěch Gondžala 06 Feb '07

06 Feb '07

Hi all, this patch add coloured output in to pacman-3.0.0 diff is here: http://www.fi.muni.cz/~xgondz/pacman3-color/pacman3-color.diff vogo

5 14

[pacman-dev] CVS update of pacman-lib/scripts (makepkg)
by dan＠archlinux.org 06 Feb '07

06 Feb '07

Date: Tuesday, February 6, 2007 @ 16:20:20 Author: dan Path: /home/cvs-pacman/pacman-lib/scripts Modified: makepkg (1.43 -> 1.44) I should test code before I check it in. Also a fix for the annoying wget output in PKGBUILD bug. ---------+ makepkg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.43 pacman-lib/scripts/makepkg:1.44 --- pacman-lib/scripts/makepkg:1.43 Tue Feb 6 01:54:13 2007 +++ pacman-lib/scripts/makepkg Tue Feb 6 16:20:20 2007 @@ -633,7 +633,7 @@ exit 1 fi msg2 "Downloading $file" - $FTPAGENT "$netfile" 2>&1 + $FTPAGENT "$netfile" # fix flyspray bug #3289 ftpret=$? if [ $ftpret -gt 0 ]; then @@ -750,8 +750,8 @@ # START REMOVE # TODO remove this with release of file v4.20, temp bugfix *application/empty*) - cmd="tar -xf $file" ;; - warning "file had trouble detecting type, assuming tar" + cmd="tar -xf $file" + warning "file had trouble detecting type, assuming tar" ;; # END REMOVE *application/x-tar*) cmd="tar -xf $file" ;;

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (package.c package.h)
by Aaron Griffin 06 Feb '07

06 Feb '07

Date: Tuesday, February 6, 2007 @ 15:57:17 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: package.c (1.59 -> 1.60) package.h (1.25 -> 1.26) Attempt #2 at -S/-Su unification: verify that the 'force' option has been read before comparing versions -----------+ package.c | 5 +++++ package.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.59 pacman-lib/lib/libalpm/package.c:1.60 --- pacman-lib/lib/libalpm/package.c:1.59 Tue Feb 6 12:41:36 2007 +++ pacman-lib/lib/libalpm/package.c Tue Feb 6 15:57:17 2007 @@ -125,6 +125,11 @@ /* Is pkgB an upgrade for pkgA ? */ int alpm_pkg_compare_versions(pmpkg_t *pkgA, pmpkg_t *pkgB) { + if(spkg->origin == PKG_FROM_CACHE) { + /* ensure we have the /desc file, which contains the 'force' option */ + _alpm_db_read(pkgB->data, INFRQ_DESC, pkgB); + } + if(pkgB->force) { /* skip the version compare call if this is a 'force' package */ return(1); Index: pacman-lib/lib/libalpm/package.h diff -u pacman-lib/lib/libalpm/package.h:1.25 pacman-lib/lib/libalpm/package.h:1.26 --- pacman-lib/lib/libalpm/package.h:1.25 Sun Feb 4 03:26:52 2007 +++ pacman-lib/lib/libalpm/package.h Tue Feb 6 15:57:17 2007 @@ -82,7 +82,7 @@ alpm_list_t *conflicts; alpm_list_t *provides; /* internal */ - unsigned short origin; + pmpkgfrom_t origin; void *data; pmdbinfrq_t infolevel; };

1 0

[pacman-dev] CVS update of pacman-lib/doc (po4a.cfg)
by dan＠archlinux.org 06 Feb '07

06 Feb '07

Date: Tuesday, February 6, 2007 @ 15:34:32 Author: dan Path: /home/cvs-pacman/pacman-lib/doc Modified: po4a.cfg (1.2 -> 1.3) one more change for man page move ----------+ po4a.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: pacman-lib/doc/po4a.cfg diff -u pacman-lib/doc/po4a.cfg:1.2 pacman-lib/doc/po4a.cfg:1.3 --- pacman-lib/doc/po4a.cfg:1.2 Mon Jan 29 17:18:31 2007 +++ pacman-lib/doc/po4a.cfg Tue Feb 6 15:34:32 2007 @@ -6,6 +6,6 @@ [type: man] makepkg.8 \ $lang:$lang/makepkg.8 add_$(srcdir)/$lang:addendum.8.$lang \ opt:"-o groff_code=verbatim -o translate_joined=CW,CE -o no_wrap=CW:CE" -[type: man] $(srcdir)/PKGBUILD.8 \ - $lang:$lang/PKGBUILD.8 add_$(srcdir)/$lang:addendum.8.$lang \ +[type: man] $(srcdir)/PKGBUILD.5 \ + $lang:$lang/PKGBUILD.5 add_$(srcdir)/$lang:addendum.8.$lang \ opt:"-o groff_code=verbatim -o translate_joined=CW,CE -o no_wrap=CW:CE"

1 0

[pacman-dev] CVS update of pacman-lib/doc (Makefile.am hu/Makefile.am)
by dan＠archlinux.org 06 Feb '07

06 Feb '07

Date: Tuesday, February 6, 2007 @ 15:23:41 Author: dan Path: /home/cvs-pacman/pacman-lib/doc Modified: Makefile.am (1.10 -> 1.11) hu/Makefile.am (1.2 -> 1.3) fix makefiles for PKGBUILD.8 -> PKGBUILD.5 ----------------+ Makefile.am | 8 ++++---- hu/Makefile.am | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) Index: pacman-lib/doc/Makefile.am diff -u pacman-lib/doc/Makefile.am:1.10 pacman-lib/doc/Makefile.am:1.11 --- pacman-lib/doc/Makefile.am:1.10 Mon Jan 29 17:18:31 2007 +++ pacman-lib/doc/Makefile.am Tue Feb 6 15:23:41 2007 @@ -1,4 +1,4 @@ -all: po4a makepkg.8 PKGBUILD.8 pacman.8 +all: po4a makepkg.8 PKGBUILD.5 pacman.8 SUBDIRS = hu @@ -13,8 +13,8 @@ makepkg.8: man2html makepkg.8 > html/makepkg.8.html -PKGBUILD.8: - man2html PKGBUILD.8 > html/PKGBUILD.8.html +PKGBUILD.5: + man2html PKGBUILD.5 > html/PKGBUILD.5.html pacman.8: man2html pacman.8 > html/pacman.8.html @@ -25,7 +25,7 @@ rm -f hu/*.8 rm -f man3/*.3 -man_MANS = pacman.8 makepkg.8 PKGBUILD.8 libalpm.3 +man_MANS = pacman.8 makepkg.8 PKGBUILD.5 libalpm.3 if HAS_DOXYGEN man_MANS += *.3 Index: pacman-lib/doc/hu/Makefile.am diff -u pacman-lib/doc/hu/Makefile.am:1.2 pacman-lib/doc/hu/Makefile.am:1.3 --- pacman-lib/doc/hu/Makefile.am:1.2 Tue Nov 14 02:58:42 2006 +++ pacman-lib/doc/hu/Makefile.am Tue Feb 6 15:23:41 2007 @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS=foreign mandir = @mandir@/hu -man_MANS = pacman.8 makepkg.8 PKGBUILD.8 +man_MANS = pacman.8 makepkg.8 PKGBUILD.5 $(man_MANS): -EXTRA_DIST = pacman.8 makepkg.8 PKGBUILD.8 +EXTRA_DIST = pacman.8 makepkg.8 PKGBUILD.5

1 0

[pacman-dev] CVS update of pacman-lib/doc (PKGBUILD.5)
by Aaron Griffin 06 Feb '07

06 Feb '07

Date: Tuesday, February 6, 2007 @ 13:45:32 Author: aaron Path: /home/cvs-pacman/pacman-lib/doc Modified: PKGBUILD.5 (1.1 -> 1.2) Minor fixups for the moment, still partially complete ------------+ PKGBUILD.5 | 141 ++++++++++++++++++++++++++++------------------------------- 1 file changed, 68 insertions(+), 73 deletions(-) Index: pacman-lib/doc/PKGBUILD.5 diff -u pacman-lib/doc/PKGBUILD.5:1.1 pacman-lib/doc/PKGBUILD.5:1.2 --- pacman-lib/doc/PKGBUILD.5:1.1 Tue Feb 6 13:33:35 2007 +++ pacman-lib/doc/PKGBUILD.5 Tue Feb 6 13:45:32 2007 @@ -54,47 +54,6 @@ required to build. If some are missing it will attempt to download them, provided there is a fully-qualified URL in the \fIsource()\fR array. -.SS Install/Upgrade/Remove Scripting -Pacman has the ability to store and execute a package-specific script when it -installs, removes, or upgrades a package. This allows a package to "configure -itself" after installation and do the opposite right before it is removed. - -The exact time the script is run varies with each operation: - -.TP -.B pre_install -script is run right before files are extracted. - -.TP -.B post_install -script is run right after files are extracted. - -.TP -.B pre_upgrade -script is run right before files are extracted. - -.TP -.B post_upgrade -script is run after files are extracted. - -.TP -.B pre_remove -script is run right before files are removed. - -.TP -.B post_remove -script is run right after files are removed. - -.P -To use this feature, just create a file (eg, pkgname.install) and put it in -the same directory as the PKGBUILD script. Then use the \fIinstall\fR -directive: - -install=pkgname.install - -The install script does not need to be specified in the \fIsource\fR array. -A template install file is available in your ABS tree (/var/abs/install.proto). - .SH OPTIONS AND DIRECTIVES .TP .B pkgname @@ -114,11 +73,12 @@ .B pkgdesc This should be a brief description of the package and its functionality. -." Is this applicable below? -.TP -.B pkgdesc_localized \fI(array)\fR -Array of the localized package descriptions. The format is the following: -pkgdesc_localized=('xx_YY foo' 'xx_YY bar') +." Not entirely applicable, and we can do this better anyway. pacman does +." actuall support localized descriptions, though, but i don't think makepkg does. +." .TP +." .B pkgdesc_localized \fI(array)\fR +." Array of the localized package descriptions. The format is the following: +." pkgdesc_localized=('xx_YY foo' 'xx_YY bar') .TP .B url @@ -130,9 +90,9 @@ This field specifies the license(s) that apply to the package. Commonly-used licenses are typically found in \fI/usr/share/licenses/common\fR. If you see the package's license there, simply reference it in the license field -(eg, \fBlicense="GPL"\fR). If the package provides a license not found in +(eg, \fBlicense=("GPL")\fR). If the package provides a license not found in \fI/usr/share/licenses/common\fR, then you should include the license in -the package itself and set \fBlicense="custom"\fR or +the package itself and set \fBlicense=("custom")\fR or \fBlicense="custom:LicenseName"\fR. The license itself should be placed in a directory called \fI$startdir/pkg/usr/share/licenses/$pkgname\fR. If multiple licenses are applied, use the array form: \fBlicenses=('GPL' 'FDL')\fR @@ -144,12 +104,6 @@ copied into the package by makepkg. It does not need to be included in the \fIsource\fR array. (eg, install=pkgname.install) -." Is this applicable below? -.TP -.B up2date -This directive should contain a command that prints the current upstream stable -version of the project. - .TP .B source \fI(array)\fR The \fIsource\fR line is an array of source files required to build the @@ -157,6 +111,13 @@ file, unless they have a fully-qualified URL. .TP +.B noextract \fI(array)\fR +The \fInoextract\fR line is an array of filenames corresponding to those from +the \fIsource\fR array. If a file is listed in the \fInoextract\fR array, it is +not extracted with the rest of the source files. This is useful for packages +which use compressed data which id downloaded via the \fIsource\fR array. + +.TP .B md5sums \fI(array)\fR If this field is present, it should contain an MD5 hash for every source file specified in the \fIsource\fR array (in the same order). \fImakepkg\fR will use @@ -164,15 +125,9 @@ generate md5sums, first build using the PKGBUILD then run \fBmakepkg -g >>PKGBUILD\fR. Then you can edit the PKGBUILD and move the \fImd5sums\fR line from the bottom to an appropriate location. - -." Is this applicable below? -.TP -.B signatures \fI(array)\fR -If this field is present, it should contain an array of gpg signatures required -to validate the source files. Where there is no signature available just leave -it empty, like: - -signatures=(${source[0]}.asc '') +\fBNOTE:\fR makepkg supports multiple integrity algorithms and their +corresponding arrays (i.e. sha1sums for the SHA1 algorithm), however official +packages use only md5sums for the time being. .TP .B groups \fI(array)\fR @@ -181,7 +136,7 @@ one could install all KDE packages by installing the 'kde' group. .TP -.B archs \fI(array)\fR +.B arch \fI(array)\fR This array defines on which architectures the given package is available. .TP @@ -231,17 +186,48 @@ This array allows you to override some of makepkg's default behaviour when building packages. To set an option, just include the option name in the \fBoptions\fR array. -.RS +See \fBmakepkg (8)\fR for details on the options array. + +.SS Install/Upgrade/Remove Scripting +Pacman has the ability to store and execute a package-specific script when it +installs, removes, or upgrades a package. This allows a package to "configure +itself" after installation and do the opposite right before it is removed. + +The exact time the script is run varies with each operation: + .TP -.B nostrip -don't strip binaries/libraries. +.B pre_install +script is run right before files are extracted. + .TP -.B keepdocs -keep /usr/share/doc and /usr/share/info directories. +.B post_install +script is run right after files are extracted. + .TP -.B force -force the package to be upgraded by --sysupgrade, even if it's an older version. -.RE +.B pre_upgrade +script is run right before files are extracted. + +.TP +.B post_upgrade +script is run after files are extracted. + +.TP +.B pre_remove +script is run right before files are removed. + +.TP +.B post_remove +script is run right after files are removed. + +.P +To use this feature, just create a file (eg, pkgname.install) and put it in +the same directory as the PKGBUILD script. Then use the \fIinstall\fR +directive: + +install=pkgname.install + +The install script does not need to be specified in the \fIsource\fR array. +A template install file is available in your ABS tree (/var/abs/install.proto). .SH EXAMPLE The following is an example PKGBUILD for the 'modutils' package. For more @@ -249,6 +235,7 @@ .nf # Maintainer: John Doe <johndoe(a)archlinux.org> +# Contributor: Bill Smith <billsmith(a)archlinux.org> pkgname=modutils pkgver=2.4.25 pkgrel=1 @@ -259,8 +246,11 @@ backup=(etc/modules.conf) source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/v2.4/$pkgname-… \\ modules.conf) +arch=('i686') +license=('GPL' 'custom') #dual licensed md5sums=('2c0cca3ef6330a187c6ef4fe41ecaa4d' \\ '35175bee593a7cc7d6205584a94d8625') +options=('nolibtool') build() { cd $startdir/src/$pkgname-$pkgver @@ -275,7 +265,9 @@ .SH SEE ALSO .BR makepkg (8), +.BR makepkg.conf (5), .BR pacman (8) +.BR pacman.conf (5) See the Arch Linux website at <http://www.archlinux.org> for more current information on the distribution, and @@ -283,4 +275,7 @@ recommendations on packaging standards. .SH AUTHORS Judd Vinet <jvinet(a)zeroflux.org> -and the Frugalware developers <frugalware-devel(a)frugalware.org> +Aurelien Foret <aurelien(a)archlinux.org> +Aaron Griffin <aaron(a)archlinux.org> +Dan McGee <dan(a)archlinux.org> +See the 'AUTHORS' file for additional contributors.

1 0