- Pacman-dev - lists.archlinux.org

[pacman-dev] CVS update of pacman-lib (4 files)
by Dan McGee 23 Feb '07

23 Feb '07

Date: Friday, February 23, 2007 @ 14:51:25 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: doc/PKGBUILD.5 (1.8 -> 1.9) doc/makepkg.8 (1.7 -> 1.8) doc/makepkg.conf.5 (1.3 -> 1.4) scripts/makepkg (1.50 -> 1.51) Implementing feature request: <http://bugs.archlinux.org/task/4706> * Added these three possible options (or !options, more likely), to the PKGBUILD possibilities: - ccache - distcc - makeflags * Removed the --noccache and -j flags from makepkg as their functionality is better used by adding the above options to a PKGBUILD- keep the functionality where it is needed. Testing would be appreciated, I didn't do much of that yet. --------------------+ doc/PKGBUILD.5 | 20 +++++++++++++++++--- doc/makepkg.8 | 8 -------- doc/makepkg.conf.5 | 3 +-- scripts/makepkg | 34 +++++++++++++++++++--------------- 4 files changed, 37 insertions(+), 28 deletions(-) Index: pacman-lib/doc/PKGBUILD.5 diff -u pacman-lib/doc/PKGBUILD.5:1.8 pacman-lib/doc/PKGBUILD.5:1.9 --- pacman-lib/doc/PKGBUILD.5:1.8 Thu Feb 22 22:23:07 2007 +++ pacman-lib/doc/PKGBUILD.5 Fri Feb 23 14:51:24 2007 @@ -59,7 +59,7 @@ Specifies a special install script that is to be included in the package. This file should reside in the same directory as the \fB\*(PB\fP, and will be copied into the package by \fBmakepkg\fP. It does not need to be included in the -\fIsource\fP array. (e.g. \fBinstall=pkgname.install\fP) +\fIsource\fP array (e.g. \fBinstall=pkgname.install\fP). .TP .B source \fI(array)\fP @@ -99,8 +99,8 @@ .TP .B arch \fI(array)\fP -Defines on which architectures the given package is available. (e.g. -\fBarch=('i686' 'x86_64')\fP) +Defines on which architectures the given package is available (e.g. +\fBarch=('i686' 'x86_64')\fP). .TP .B backup \fI(array)\fP @@ -166,6 +166,20 @@ .B emptydirs Leave empty directories in packages. .TP +.B ccache +Allow the use of \fBccache\fP during build. More useful in its negative form +"!ccache" with select packages that have problems building with \fBccache\fP. +.TP +.B distcc +Allow the use of \fBdistcc\fP during build. More useful in its negative form +"!distcc" with select packages that have problems building with \fBdistcc\fP. +.TP +.B makeflags +Allow the use of user-specific makeflags during build as specified in +\fBmakepkg.conf\fP. More useful in its negative form "!makeflags" with select +packages that have problems building with custom makeflags such as "-j2" (or +higher). +.TP .B force Force the package to be upgraded by a \fBpacman\fP system upgrade operation, even if the version number would normally not trigger such an upgrade. This is Index: pacman-lib/doc/makepkg.8 diff -u pacman-lib/doc/makepkg.8:1.7 pacman-lib/doc/makepkg.8:1.8 --- pacman-lib/doc/makepkg.8:1.7 Thu Feb 22 22:23:07 2007 +++ pacman-lib/doc/makepkg.8 Fri Feb 23 14:51:24 2007 @@ -32,10 +32,6 @@ them it will call \fBmakepkg\fP to build and install the missing dependencies. The child calls will be made with the \fB-b\fP and \fB-i\fP options. .TP -.B \-B, --noccache -Disable the use of \fBccache\fP during build (useful for select packages that -have problems with \fBccache\fP). -.TP .B \-c, --clean Clean up leftover work files and directories after a successful build. .TP @@ -72,10 +68,6 @@ .B \-i, --install Install or upgrade the package after a successful build using \fBpacman\fP. .TP -.B \-j \fIjobs\fP -Sets MAKEFLAGS="-j\fIjobs\fP" before building the package. This is useful for -overriding the \fIMAKEFLAGS\fP setting in \fBmakepkg.conf\fP. -.TP .B \-m, --nocolor Disable color in output messages. .TP Index: pacman-lib/doc/makepkg.conf.5 diff -u pacman-lib/doc/makepkg.conf.5:1.3 pacman-lib/doc/makepkg.conf.5:1.4 --- pacman-lib/doc/makepkg.conf.5:1.3 Thu Feb 22 22:23:07 2007 +++ pacman-lib/doc/makepkg.conf.5 Fri Feb 23 14:51:24 2007 @@ -68,8 +68,7 @@ .B ccache Use ccache to cache compilation by default. This allows for faster compiles if you are continuously recompiling the same packages. It can be disabled for -individual packages by passing the \fB-B\fP or \fB--noccache\fP flag to -\fBmakepkg\fP. +individual packages by placing \fB!ccache\fP in the \fB\*(PB\fP options array. .RE .TP .B DISTCC_HOSTS="\fIhost1 ...\fP" Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.50 pacman-lib/scripts/makepkg:1.51 --- pacman-lib/scripts/makepkg:1.50 Wed Feb 14 00:52:49 2007 +++ pacman-lib/scripts/makepkg Fri Feb 23 14:51:25 2007 @@ -356,7 +356,6 @@ echo echo "Options:" echo " -b, --builddeps Build missing dependencies from source" - echo " -B, --noccache Do not use ccache during build" echo " -c, --clean Clean up work files after build" echo " -C, --cleancache Clean up source files from the cache" echo " -d, --nodeps Skip all dependency checks" @@ -365,7 +364,6 @@ echo " -g, --geninteg Generate integrity checks for source files" echo " -h, --help This help" echo " -i, --install Install package after successful build" - echo " -j <jobs> Set MAKEFLAGS to \"-j<jobs>\" before building" echo " -L, --log Log package build process" echo " -m, --nocolor Disable colorized output messages" echo " -o, --nobuild Download and extract files only" @@ -421,7 +419,6 @@ --syncdeps) DEP_BIN=1 ;; --usesudo) SUDO=1 ;; --builddeps) DEP_SRC=1 ;; - --noccache) USE_CCACHE="n" ;; --nodeps) NODEPS=1 ;; --noextract) NOEXTRACT=1 ;; --install) INSTALL=1 ;; @@ -441,10 +438,9 @@ exit 1 ;; -*) - while getopts "bBcCdefghij:Lmop:rRsS-" opt; do + while getopts "bcCdefghiLmop:rRsS-" opt; do case $opt in b) DEP_SRC=1 ;; - B) USE_CCACHE="n" ;; c) CLEANUP=1 ;; C) CLEANCACHE=1 ;; d) NODEPS=1 ;; @@ -456,7 +452,6 @@ exit 0 ;; i) INSTALL=1 ;; - j) export MAKEFLAGS="-j$OPTARG" ;; L) LOGGING=1 ;; m) USE_COLOR="n" ;; o) NOBUILD=1 ;; @@ -524,7 +519,7 @@ source $BUILDSCRIPT -# check for no-no's +# check for no-no's in the build script if [ -z "$pkgver" ]; then error "pkgver is not allowed to be empty." exit 1 @@ -553,7 +548,8 @@ exit 1 fi -if [ -f $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.${PKGEXT} -a "$FORCE" = "0" -a "$GENINTEG" = "0" ]; then +if [ -f $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.${PKGEXT} + -a "$FORCE" = "0" -a "$GENINTEG" = "0" ]; then if [ "$INSTALL" = "1" ]; then warning "a package has already been built, installing existing package." installpackage @@ -564,8 +560,9 @@ fi fi -# Enter the fakeroot environment if necessary. This will call the makepkg script again -# as the fake root user. We detect this by passing a sentinel option (-F) to makepkg +# Enter the fakeroot environment if necessary. This will call the makepkg +# script again as the fake root user. We detect this by passing a sentinel +# option (-F) to makepkg. if [ "$EUID" != "0" ]; then if [ "$(check_buildenv fakeroot)" = "y" ]; then if [ $(type -p fakeroot) ]; then @@ -819,17 +816,24 @@ fi mkdir -p $startdir/pkg - # use distcc if requested - if [ "$(check_buildenv distcc)" = "y" ]; then + # use distcc if it is requested (check buildenv and PKGBUILD opts) + if [ "$(check_buildenv distcc)" = "y" -a "$(check_option distcc)" != "n" ]; then [ -d /usr/lib/distcc/bin ] && export PATH=/usr/lib/distcc/bin:$PATH + else if [ "$(check_option distcc)" = "n" ]; then + # if it is not wanted, clear the makeflags too + export MAKEFLAGS="" fi - # use ccache if it's available - # USE_CCACHE still here because it is a command line option - if [ ! "$USE_CCACHE" = "n" -a "$(check_buildenv ccache)" = "y" ]; then + # use ccache if it is requested (check buildenv and PKGBUILD opts) + if [ "$(check_buildenv ccache)" = "y" -a "$(check_option ccache)" != "n" ]; then [ -d /usr/lib/ccache/bin ] && export PATH=/usr/lib/ccache/bin:$PATH fi + # clear user-specified makeflags if requested + if [ "$(check_option makeflags)" = "n" ]; then + export MAKEFLAGS="" + fi + # build msg "Starting build()..."

1 0

[pacman-dev] Pacman speed improvement
by Nagy Gabor 23 Feb '07

23 Feb '07

Hi! As known, pacman is very slow in some cases (mainly when -S switch is used). I looked into the source (of pacman2, but the following problems still exists on pacman-cvs) and I'd like to make some suggestions: 1. I think, that the main problem is the dbcache, which is calculated in most cases (e.g. this is the first step when you do a 'pacman -S foo' (?!)). In the current state of pacman, the whole package info is always loaded into the dbcache for all package, which means that all /var/lib/pacman/*/desc files (hundreds of files) needs to be read (in my computer this process takes 20 sec). I think loading desc for all package (in remote repo) is needless, because usually this is needed for the packages which we working with (except -Ss for example). The package name and version can be easily got from the repo directory (~ls), so this can be done as a dbcache initialization (this is fast.) To maintain the current structure of the source, I think that the best solution is to replace 'dbcache_entry->info' (and similar) with a function package_info(dbcache_entry) which checks if the info field is loaded to dbcache_entry already or not and loads it if needed and returns with it. In the 'pacman -S foo' example you need to read the repo directory (~ ls => fast) to initialize dbcache, search the package 'foo', read its dependencies (from desc) and the dependencies' dependencies... so you need to read the desc files only for packages to be installed. 2. Sometimes (e.g. -Ss) reading desc for all package is needed (I think this is needed for remote repos only, see 3.). This would be much faster if we used one file instead of many small ones. For remote repos fdb is needed, so we have done this (tar) file already, so we should keep it (after sync) and use it. (Because we work with special files (text files), we may find/write a more efficient "tar-format".) 3. Working with the local repo is slow when you install a new package. Because you must reed all local package info to check conflicts. This is done by reading many small depends files. If we assume that only few packages have CONFLICTS and PROVIDES field filled (which is true, I think), this process could be radically speed up if you "cache" these packages with "double store": For example, there would be two special directories (.provides and .conflict) in /var/lib/pacman/local; when you install a foo package you check if conflict field is filled: if yes, after installing the package you create a symlink in .conflict to foo package directory (This is ~no overhead), and the same for provides. So when you need to resolve conflicts you just read the (few) packages can be found in .conflict. 4. (Small thing, similar to 3) In remote repo the groups may be collected into a .groups directory (which contains groups & symlinks), so shouldn't be read the whole repo to find the members of a group. Bye, Nagy Gabor

2 1

[pacman-dev] man2html
by Jürgen Hötzel 23 Feb '07

23 Feb '07

Hi, i think man2html code could be removed to make build/configure scripts cleaner. Any objections? Jürgen

2 4

[pacman-dev] ambigous message in remove.c
by Nagy Gabor 23 Feb '07

23 Feb '07

Hi! When you try to remove a package which doesn't exist in local repo, you get the following message: "failed to add target '%s'(could not find or read package)"... Bye

2 1

[pacman-dev] Sugestion to makepkg3 -g
by Douglas Soares de Andrade 23 Feb '07

23 Feb '07

Hi guys, Thanks for the great work with pacman :) I have been thinking and what about instead of: ==> Generating md5sums for source files md5sums=('e1bf4b2941249c223efc524151caaadc') ==> Generating sha1sums for source files sha1sums=('39059c20d7e3b07c552ee9a9a662db7dbc742363') Why not: ==> Generating md5sums and sha1sums for source files or ==> Generating checksums for source files md5sums=('e1bf4b2941249c223efc524151caaadc') sha1sums=('39059c20d7e3b07c552ee9a9a662db7dbc742363') Im asking this because it would make easier just to pass the mouse in the two lines and paste in the PKGBUILD. (this is what i do) And in the current behaviour, i have to copy all lines and then paste in the PKGBUILD and then remove what is not needed. I know its a comestic one, but it would be good. Thanks -- Douglas Soares de Andrade Archlinux Brasil - http://archlinux-br.org Paradigma Internet - http://www.paradigma.com.br

3 3

[pacman-dev] CVS update of pacman-lib/src/pacman/po (it.po)
by ,,, 23 Feb '07

23 Feb '07

Date: Friday, February 23, 2007 @ 11:36:32 Author: dan Path: /home/cvs-pacman/pacman-lib/src/pacman/po Modified: it.po (1.9 -> 1.10) * Updated Italian translation Giovanni Scafora <linuxmania(a)gmail.com> -------+ it.po | 49 +++++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 22 deletions(-) Index: pacman-lib/src/pacman/po/it.po diff -u pacman-lib/src/pacman/po/it.po:1.9 pacman-lib/src/pacman/po/it.po:1.10 --- pacman-lib/src/pacman/po/it.po:1.9 Thu Feb 22 16:34:52 2007 +++ pacman-lib/src/pacman/po/it.po Fri Feb 23 11:36:32 2007 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: Pacman package manager 3.0.0\n" "Report-Msgid-Bugs-To: pacman-dev(a)archlinux.org\n" -"POT-Creation-Date: 2007-02-22 11:13-0500\n" -"PO-Revision-Date: 2007-02-21 20:00+0100\n" +"POT-Creation-Date: 2007-02-23 11:47+0100\n" +"PO-Revision-Date: 2007-02-23 12:00+0100\n" "Last-Translator: Giovanni Scafora <linuxmania(a)gmail.com>\n" "Language-Team: Arch Linux Italian Team <linuxmania(a)gmail.com>\n" "MIME-Version: 1.0\n" @@ -61,15 +61,15 @@ #: src/pacman/add.c:127 src/pacman/sync.c:709 #, c-format -msgid "%s%s exists in both '%s' and '%s'\n" -msgstr "%s%s è presente in '%s' e in '%s'\n" +msgid "%s exists in both '%s' and '%s'\n" +msgstr "%s è già presente in '%s' e in '%s'\n" -#: src/pacman/add.c:134 src/pacman/sync.c:716 +#: src/pacman/add.c:133 src/pacman/sync.c:715 #, c-format -msgid "%s: %s%s exists in filesystem\n" -msgstr "%s: %s%s è già presente nel filesystem\n" +msgid "%s: %s exists in filesystem\n" +msgstr "%s: %s è già presente nel filesystem\n" -#: src/pacman/add.c:141 src/pacman/sync.c:723 src/pacman/sync.c:729 +#: src/pacman/add.c:139 src/pacman/sync.c:721 src/pacman/sync.c:727 msgid "" "\n" "errors occurred, no packages were upgraded.\n" @@ -77,18 +77,18 @@ "\n" "si sono verificati degli errori, nessun pacchetto è stato aggiornato.\n" -#: src/pacman/add.c:151 src/pacman/sync.c:652 +#: src/pacman/add.c:149 src/pacman/sync.c:652 #, c-format msgid ":: %.1f MB required, have %.1f MB" msgstr ":: %.1f MB richiesti, spazio a disposizione %.1f MB" -#: src/pacman/add.c:164 src/pacman/remove.c:138 src/pacman/sync.c:702 +#: src/pacman/add.c:162 src/pacman/remove.c:138 src/pacman/sync.c:702 #, c-format msgid "failed to commit transaction (%s)\n" msgstr "impossibile eseguire l'operazione richiesta (%s)\n" -#: src/pacman/add.c:174 src/pacman/remove.c:148 src/pacman/sync.c:524 -#: src/pacman/sync.c:745 +#: src/pacman/add.c:172 src/pacman/remove.c:148 src/pacman/sync.c:524 +#: src/pacman/sync.c:743 #, c-format msgid "failed to release transaction (%s)\n" msgstr "impossibile annullare l'operazione richiesta (%s)\n" @@ -1020,51 +1020,56 @@ msgid ":: %s requires %s, but it is in IgnorePkg. Install anyway? [Y/n] " msgstr ":: %s richiede %s, ma è in IgnorePkg. Installare ugualmente? [Y/n] " -#: src/pacman/trans.c:185 +#: src/pacman/trans.c:176 +#, c-format +msgid ":: %s is in IgnorePkg. Install anyway? [Y/n] " +msgstr ":: %s è in IgnorePkg. Installare ugualmente? [Y/n] " + +#: src/pacman/trans.c:189 #, c-format msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] " msgstr ":: %s è in HoldPkg. Rimuovere ugualmente? [Y/n] " -#: src/pacman/trans.c:198 +#: src/pacman/trans.c:202 #, c-format msgid ":: Replace %s with %s/%s? [Y/n] " msgstr ":: Sostituire %s con %s/%s? [Y/n] " -#: src/pacman/trans.c:213 +#: src/pacman/trans.c:217 #, c-format msgid ":: %s conflicts with %s. Remove %s? [Y/n] " msgstr ":: %s va in conflitto con %s. Rimuovere %s? [Y/n] " -#: src/pacman/trans.c:229 +#: src/pacman/trans.c:233 #, c-format msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] " msgstr "" ":: %s-%s: la versione installata è più recente. Aggiornare ugualmente? [Y/n] " -#: src/pacman/trans.c:247 +#: src/pacman/trans.c:251 #, c-format msgid ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] " msgstr "" ":: %s-%s: la versione installata è aggiornata. Aggiornare ugualmente? [Y/n] " -#: src/pacman/trans.c:265 +#: src/pacman/trans.c:269 #, c-format msgid ":: Archive %s is corrupted. Do you want to delete it? [Y/n] " msgstr ":: L'archivio %s è corrotto. Eliminarlo? [Y/n] " -#: src/pacman/trans.c:319 +#: src/pacman/trans.c:323 msgid "installing" msgstr "installazione in corso di " -#: src/pacman/trans.c:322 +#: src/pacman/trans.c:326 msgid "upgrading" msgstr "aggiornamento in corso di" -#: src/pacman/trans.c:325 +#: src/pacman/trans.c:329 msgid "removing" msgstr "rimozione in corso di" -#: src/pacman/trans.c:328 +#: src/pacman/trans.c:332 msgid "checking for file conflicts" msgstr "controllo dei conflitti in corso"

1 0

[pacman-dev] Italian pacman it.po patch
by Giovanni Scafora 23 Feb '07

23 Feb '07

Hi Dan, there is a new italian translation patch. Thanks in advance. -- Giovanni Scafora Arch Linux Trusted User (voidnull) http://www.archlinux.org linuxmania(a)gmail.com

1 0

[pacman-dev] CVS update of pacman-lib/contrib (Makefile.am)
by Aaron Griffin 23 Feb '07

23 Feb '07

Date: Friday, February 23, 2007 @ 03:07:48 Author: aaron Path: /home/cvs-pacman/pacman-lib/contrib Modified: Makefile.am (1.1 -> 1.2) Whoops, added to Makefile.am -------------+ Makefile.am | 1 + 1 file changed, 1 insertion(+) Index: pacman-lib/contrib/Makefile.am diff -u pacman-lib/contrib/Makefile.am:1.1 pacman-lib/contrib/Makefile.am:1.2 --- pacman-lib/contrib/Makefile.am:1.1 Thu Feb 22 21:00:30 2007 +++ pacman-lib/contrib/Makefile.am Fri Feb 23 03:07:48 2007 @@ -1,5 +1,6 @@ EXTRA_DIST = \ bash_completion \ pacsearch \ + pacdiff \ zsh_completion

1 0

[pacman-dev] CVS update of pacman-lib/contrib (pacdiff)
by Aaron Griffin 23 Feb '07

23 Feb '07

Date: Friday, February 23, 2007 @ 03:03:50 Author: aaron Path: /home/cvs-pacman/pacman-lib/contrib Added: pacdiff (1.1) I had this laying around, figured someone might find it useful ---------+ pacdiff | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) Index: pacman-lib/contrib/pacdiff diff -u /dev/null pacman-lib/contrib/pacdiff:1.1 --- /dev/null Fri Feb 23 03:03:50 2007 +++ pacman-lib/contrib/pacdiff Fri Feb 23 03:03:50 2007 @@ -0,0 +1,47 @@ +#!/bin/sh +# pacdiff : a simple pacnew/pacorig/pacsave updater for /etc/ +# +# Copyright (c) 2007 Aaron Griffin <aaronmgriffin(a)gmail.com> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, +# USA. +# + +# Original http://phraktured.net/config/bin/pacdiff + +diffprog=${DIFFPROG:-vimdiff} +for x in $(find /etc/ -name *.pacnew -o -name *.pacorig -o -name *.pacsave) +do + echo "File: ${x%.pac*}" + chk="$(cmp $x ${x%.pac*})" + if [ -z "${chk}" ]; then + echo " Files are identical, removing..." + rm $x + else + echo -n " File differences found. (V)iew, (S)kip, (R)emove: [v/s/r] " + read c + c="$(echo $c| tr A-Z a-z)" #tolower + if [ "$c" = "r" ]; then + rm $x + elif [ "$c" = "s" ]; then + continue + else + [ "$c" = "n" -o "$c" = "N" ] || $diffprog $x ${x%.pac*} + echo -n " Remove file? [Y/n] " + read c + [ "$c" = "n" -o "$c" = "N" ] || rm $x + fi + fi +done

1 0

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

23 Feb '07

Date: Friday, February 23, 2007 @ 03:00:09 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: package.c (1.76 -> 1.77) * The info level for this was wrong, causing replacements to not really work -----------+ package.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.76 pacman-lib/lib/libalpm/package.c:1.77 --- pacman-lib/lib/libalpm/package.c:1.76 Fri Feb 23 02:53:25 2007 +++ pacman-lib/lib/libalpm/package.c Fri Feb 23 03:00:06 2007 @@ -861,8 +861,8 @@ ASSERT(handle != NULL, return(NULL)); ASSERT(pkg != NULL, return(NULL)); - if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_DEPENDS)) { - _alpm_db_read(pkg->data, pkg, INFRQ_DEPENDS); + if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_DESC)) { + _alpm_db_read(pkg->data, pkg, INFRQ_DESC); } return pkg->replaces; }

1 0