- Pacman-dev - lists.archlinux.org

Re: [pacman-dev] [arch-general] "pkgdyn" a set of scripts for analysis of ELF deps in pkgs.
by Aaron Griffin 15 May '09

15 May '09

On Thu, Apr 23, 2009 at 10:45 PM, Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> wrote: > Hi, > > This is a set of draft scripts that I use to find/extract some data of > ELF files from packages. > For example: > > * Find all packages that needed inexistent shared objects because a > soname bump in libraries. > * Generate a report for all packages per repo that in case of soname > bump , needs to be rebuild. > * Find ELF files that are outside the allowed paths (for example ELF in > /usr/share) > * Find RPATH in packages, with a simple "awk" can generate a report etc. > > * Other task with "temporary data generated", but there are no scripts > at this time, are only "at command line runtime". > Can be easily construct with awk, of your preferer lang. > > It use files in analysis so, if a ELF needed a "soname" that are > symlink, this are reported (tho only case here are courier-maildrop, > just ignore it) > > http://archlinux.djgera.com.ar/pkgdyn/ > > Sample data and generated DB by "dynup.bash" is uploaded, extract in > "pkgdyn" directory. > The dyunp.bash can make DB from empty DB, or update the DB, deleting old > entries and inserting news. > > > Is in "public domain": so use it, modify it, copy it, no problem. > Sugestions, improvements, dudes, write me. > > > PS1: Exception here: (this report as missing, but is a "optdepend in > community") > extra/gnome-speech-0.4.25-1:NEEDED libespeak.so.1 > > PS2: All missing deps I already reported and many of [community] have > been fixed. Congrats TU! > > > Cheers, Just replying so I can send this over to the pacman-dev list. This looks great

2 2

[pacman-dev] [PATCH] Introduce -Suu
by Nagy Gabor 14 May '09

14 May '09

>From 449d53df4a41f3856a5dba967e2eb186aa64914a Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Thu, 14 May 2009 18:25:16 +0200 Subject: [PATCH] Introduce -Suu If the user switches from unstable repo to a stable one, it is quite hard to sync its system with the new repo (the user will see many "Local is newer than stable" messages, nothing more). That's why I introduced -Suu, which treats a sync package like an upgrade, iff the package version doesn't match with the local one's. I added a new pactest (sync104.py) to test this, and I updated the documentation of -Su. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- doc/pacman.8.txt | 5 ++++- lib/libalpm/alpm.h | 2 +- lib/libalpm/sync.c | 18 +++++++++++++++--- lib/libalpm/sync.h | 2 +- lib/libalpm/trans.c | 4 ++-- pactest/tests/sync104.py | 12 ++++++++++++ src/pacman/pacman.c | 3 ++- src/pacman/sync.c | 2 +- 8 files changed, 38 insertions(+), 10 deletions(-) create mode 100644 pactest/tests/sync104.py diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 4582be5..e914ab4 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -310,7 +310,10 @@ linkman:pacman.conf[5]. report of all packages to upgrade will be presented and the operation will not proceed without user confirmation. Dependencies are automatically resolved at this level and will be installed/upgraded if - necessary. + necessary. Pass this option twice to enable package downgrade; in this + case pacman will select sync packages whose version does not match with + the local ones'. For example, this can be useful when the user + switches from a testing repo to a stable one. *-w, \--downloadonly*:: Retrieve all packages from the server, but do not install/upgrade diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 57ea880..2a6c2e0 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -395,7 +395,7 @@ alpm_list_t * alpm_trans_get_pkgs(); int alpm_trans_init(pmtranstype_t type, pmtransflag_t flags, alpm_trans_cb_event cb_event, alpm_trans_cb_conv conv, alpm_trans_cb_progress cb_progress); -int alpm_trans_sysupgrade(void); +int alpm_trans_sysupgrade(int enable_downgrade); int alpm_trans_addtarget(char *target); int alpm_trans_prepare(alpm_list_t **data); int alpm_trans_commit(alpm_list_t **data); diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index abda147..ccd6424 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -79,7 +79,7 @@ pmpkg_t SYMEXPORT *alpm_sync_newversion(pmpkg_t *pkg, alpm_list_t *dbs_sync) return(NULL); } -int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync) +int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync, int enable_downgrade) { alpm_list_t *i, *j, *k; @@ -115,8 +115,20 @@ int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_s trans->packages = alpm_list_add(trans->packages, spkg); } } else if(cmp < 0) { - _alpm_log(PM_LOG_WARNING, _("%s: local (%s) is newer than %s (%s)\n"), - lpkg->name, lpkg->version, sdb->treename, spkg->version); + if(enable_downgrade) { + /* check IgnorePkg/IgnoreGroup */ + if(_alpm_pkg_should_ignore(spkg) || _alpm_pkg_should_ignore(lpkg)) { + _alpm_log(PM_LOG_WARNING, _("%s: ignoring package downgrade (%s => %s)\n"), + lpkg->name, lpkg->version, spkg->version); + } else { + _alpm_log(PM_LOG_WARNING, _("%s: downgrading from version %s to version %s\n"), + lpkg->name, lpkg->version, spkg->version); + trans->packages = alpm_list_add(trans->packages, spkg); + } + } else { + _alpm_log(PM_LOG_WARNING, _("%s: local (%s) is newer than %s (%s)\n"), + lpkg->name, lpkg->version, sdb->treename, spkg->version); + } } break; /* jump to next local package */ } else { /* 2. search for replacers in sdb */ diff --git a/lib/libalpm/sync.h b/lib/libalpm/sync.h index 00985b6..8171e36 100644 --- a/lib/libalpm/sync.h +++ b/lib/libalpm/sync.h @@ -23,7 +23,7 @@ #include "alpm.h" -int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync); +int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync, int enable_downgrade); int _alpm_sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync, char *name); int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync, alpm_list_t **data); diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index ef56841..b144b2a 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -87,7 +87,7 @@ int SYMEXPORT alpm_trans_init(pmtranstype_t type, pmtransflag_t flags, /** Search for packages to upgrade and add them to the transaction. * @return 0 on success, -1 on error (pm_errno is set accordingly) */ -int SYMEXPORT alpm_trans_sysupgrade() +int SYMEXPORT alpm_trans_sysupgrade(int enable_downgrade) { pmtrans_t *trans; @@ -100,7 +100,7 @@ int SYMEXPORT alpm_trans_sysupgrade() ASSERT(trans->state == STATE_INITIALIZED, RET_ERR(PM_ERR_TRANS_NOT_INITIALIZED, -1)); ASSERT(trans->type == PM_TRANS_TYPE_SYNC, RET_ERR(PM_ERR_TRANS_TYPE, -1)); - return(_alpm_sync_sysupgrade(trans, handle->db_local, handle->dbs_sync)); + return(_alpm_sync_sysupgrade(trans, handle->db_local, handle->dbs_sync, enable_downgrade)); } /** Add a target to the transaction. diff --git a/pactest/tests/sync104.py b/pactest/tests/sync104.py new file mode 100644 index 0000000..6d51b85 --- /dev/null +++ b/pactest/tests/sync104.py @@ -0,0 +1,12 @@ +self.description = "-Suu" + +sp = pmpkg("dummy", "0.9-1") +lp = pmpkg("dummy", "1.0-1") + +self.addpkg2db("sync", sp) +self.addpkg2db("local", lp) + +self.args = "-Suu" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=dummy|0.9-1") diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 72a72ba..6e2d96c 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -129,6 +129,7 @@ static void usage(int op, const char * const myname) printf(_(" -p, --print-uris print out URIs for given packages and their dependencies\n")); printf(_(" -s, --search <regex> search remote repositories for matching strings\n")); printf(_(" -u, --sysupgrade upgrade all packages that are out of date\n")); + printf(_(" (-uu enables package downgrade)\n")); printf(_(" -w, --downloadonly download packages but do not install/upgrade anything\n")); printf(_(" -y, --refresh download fresh package databases from the server\n")); printf(_(" --needed don't reinstall up to date packages\n")); @@ -501,7 +502,7 @@ static int parseargs(int argc, char *argv[]) config->op_q_unrequired = 1; break; case 'u': - config->op_s_upgrade = 1; + (config->op_s_upgrade)++; config->op_q_upgrade = 1; config->flags |= PM_TRANS_FLAG_UNNEEDED; break; diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 68fb81a..3a03b42 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -561,7 +561,7 @@ static int sync_trans(alpm_list_t *targets) if(config->op_s_upgrade) { printf(_(":: Starting full system upgrade...\n")); alpm_logaction("starting full system upgrade\n"); - if(alpm_trans_sysupgrade() == -1) { + if(alpm_trans_sysupgrade(config->op_s_upgrade >= 2) == -1) { pm_fprintf(stderr, PM_LOG_ERROR, "%s\n", alpm_strerrorlast()); retval = 1; goto cleanup; -- 1.6.0.3

1 1

[pacman-dev] [PATCH] Don't print "local/" with -Qs
by Nagy Gabor 13 May '09

13 May '09

>From 1572535efe01dfae1f28b74862dec21f2102f165 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sun, 10 May 2009 14:08:04 +0200 Subject: [PATCH] Don't print "local/" with -Qs See FS#14642. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- src/pacman/query.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index 0d48638..2cb86a9 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -166,7 +166,7 @@ static int query_search(alpm_list_t *targets) pmpkg_t *pkg = alpm_list_getdata(i); if (!config->quiet) { - printf("local/%s %s", alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg)); + printf("%s %s", alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg)); } else { printf("%s", alpm_pkg_get_name(pkg)); } -- 1.6.0.3

3 4

[pacman-dev] [PATCH] Add more files to cleanup in autoclean.sh
by Gerardo Exequiel Pozzi 12 May '09

12 May '09

Add files pactest/tests/Makefile.in , pactest/tests/Makefile and contrib/Makefile.in , contrib/Makefile to list of cleanup script. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- autoclean.sh | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/autoclean.sh b/autoclean.sh index 17e4416..4353179 100755 --- a/autoclean.sh +++ b/autoclean.sh @@ -18,7 +18,8 @@ rm -rf scripts/{Makefile.in,Makefile} rm -rf etc/{Makefile.in,Makefile} rm -rf etc/pacman.d/{Makefile.in,Makefile} rm -rf etc/abs/{Makefile.in,Makefile} -rm -rf pactest/{Makefile.in,Makefile} +rm -rf pactest{,/tests}/{Makefile.in,Makefile} +rm -rf contrib/{Makefile.in,Makefile} rm -rf doc/{Makefile.in,Makefile} rm -rf doc/html/*.html rm -rf doc/man3/*.3 -- 1.6.3

1 0

[pacman-dev] [PATCH] Introduce -Qlq
by Nagy Gabor 12 May '09

12 May '09

>From 054eae27537989dee76a06fac882fb38702144d5 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sun, 10 May 2009 22:41:29 +0200 Subject: [PATCH] Introduce -Qlq With --quiet flag, -Ql doesn't print the package name only lists files. I made --quiet documentation up-to-date (I also added -Sgq/-Qgq). Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- doc/pacman.8.txt | 18 ++++++++++++------ src/pacman/package.c | 8 ++++++-- src/pacman/package.h | 2 +- src/pacman/query.c | 2 +- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 95880a2..cc3d396 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -204,9 +204,13 @@ Query Options[[QO]] This is useful in combination with '\--info' and '\--list'. *-q, \--quiet*:: - Show less information for certain query operations. Search will only show - package names and not version, group, and description information; a bare - query will only show package names rather than names and versions. + Show less information for certain query operations. (This is useful when + pacman's output is processed in a script.) Search will only show package + names and not version, group, and description information; owns will + only show package names and versions instead of "file is owned by pkg" + messages; group will only show package names and omit group names; list + will only show files and omit package names; a bare query will only + show package names rather than names and versions. *-s, \--search* <'regexp'>:: This will search each locally-installed package for names or @@ -284,9 +288,11 @@ linkman:pacman.conf[5]. downloaded at a later time, using a program like wget. *-q, \--quiet*:: - Show less information for certain sync operations. Search will only show - package names and not version, group, and description information; list - will only show package names and omit databases and versions. + Show less information for certain sync operations. (This is useful when + pacman's output is processed in a script.) Search will only show package + names and not repo, version, group, and description information; list + will only show package names and omit databases and versions; group will + only show package names and omit group names. *-s, \--search* <'regexp'>:: This will search each package in the sync databases for names or diff --git a/src/pacman/package.c b/src/pacman/package.c index b23c577..da2feb5 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -205,7 +205,7 @@ void dump_pkg_backups(pmpkg_t *pkg) /* List all files contained in a package */ -void dump_pkg_files(pmpkg_t *pkg) +void dump_pkg_files(pmpkg_t *pkg, int quiet) { const char *pkgname, *root, *filestr; alpm_list_t *i, *pkgfiles; @@ -216,7 +216,11 @@ void dump_pkg_files(pmpkg_t *pkg) for(i = pkgfiles; i; i = alpm_list_next(i)) { filestr = alpm_list_getdata(i); - fprintf(stdout, "%s %s%s\n", pkgname, root, filestr); + if(!quiet){ + fprintf(stdout, "%s %s%s\n", pkgname, root, filestr); + } else { + fprintf(stdout, "%s%s\n", root, filestr); + } } fflush(stdout); diff --git a/src/pacman/package.h b/src/pacman/package.h index 14bc7d6..aede2a1 100644 --- a/src/pacman/package.h +++ b/src/pacman/package.h @@ -25,7 +25,7 @@ void dump_pkg_full(pmpkg_t *pkg, int level); void dump_pkg_sync(pmpkg_t *pkg, const char *treename); void dump_pkg_backups(pmpkg_t *pkg); -void dump_pkg_files(pmpkg_t *pkg); +void dump_pkg_files(pmpkg_t *pkg, int quiet); void dump_pkg_changelog(pmpkg_t *pkg); #endif /* _PM_PACKAGE_H */ diff --git a/src/pacman/query.c b/src/pacman/query.c index 2cb86a9..0b8406d 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -320,7 +320,7 @@ static void display(pmpkg_t *pkg) } } if(config->op_q_list) { - dump_pkg_files(pkg); + dump_pkg_files(pkg, config->quiet); } if(config->op_q_changelog) { dump_pkg_changelog(pkg); -- 1.6.0.3

2 3

[pacman-dev] [PATCH 1/3] Fix stderr redirection
by Cedric Staniewski 12 May '09

12 May '09

When redirecting both stderr and stdout and using the 2>&1 construct, you have to redirect stdout first. Otherwise stderr will be redirected to the 'old' stdout and not to the new resource. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- acinclude.m4 | 4 ++-- scripts/repo-add.sh.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 1524a3d..94ddb2b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -234,7 +234,7 @@ AC_DEFUN([_LT_COMPILER_BOILERPLATE], [AC_REQUIRE([LT_AC_PROG_SED])dnl ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +eval "$ac_compile" >/dev/null 2>&1 | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* ])# _LT_COMPILER_BOILERPLATE @@ -248,7 +248,7 @@ AC_DEFUN([_LT_LINKER_BOILERPLATE], [AC_REQUIRE([LT_AC_PROG_SED])dnl ac_outfile=conftest.$ac_objext echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +eval "$ac_link" >/dev/null 2>&1 | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* ])# _LT_LINKER_BOILERPLATE diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 2390a92..13097df 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -341,7 +341,7 @@ add() fi pkgfile=$1 - if ! bsdtar -tf "$pkgfile" .PKGINFO 2>&1 >/dev/null; then + if ! bsdtar -tf "$pkgfile" .PKGINFO >/dev/null 2>&1; then error "$(gettext "'%s' is not a package file, skipping")" "$pkgfile" return 1 fi -- 1.6.3

1 0

[pacman-dev] [PATCH] Remove unused included headers from testdb.c and testpkg.c
by Gerardo Exequiel Pozzi 12 May '09

12 May '09

libgen.h was used for basename() in function main() from src/util/testdb.c string.h was used for strlen() in function output_cb() from src/util/testpkg.c Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- src/util/testdb.c | 1 - src/util/testpkg.c | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/util/testdb.c b/src/util/testdb.c index cbff578..abbc62f 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -24,7 +24,6 @@ #include <limits.h> #include <string.h> #include <dirent.h> -#include <libgen.h> #include <alpm.h> #include <alpm_list.h> diff --git a/src/util/testpkg.c b/src/util/testpkg.c index 6e8f9d1..d86fb1e 100644 --- a/src/util/testpkg.c +++ b/src/util/testpkg.c @@ -21,7 +21,6 @@ #include <stdio.h> /* printf */ #include <stdarg.h> /* va_list */ -#include <string.h> /* strlen */ #include <alpm.h> -- 1.6.2.4

1 0

[pacman-dev] [PATCH] makepkg: Document package splitting
by Allan McRae 12 May '09

12 May '09

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This should cover all suggested changes so far. Any further clarifications needed? doc/PKGBUILD.5.txt | 27 +++++++++++++++++++++------ doc/makepkg.8.txt | 6 +++--- scripts/makepkg.sh.in | 2 +- 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index e1ea632..41c468e 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -238,19 +238,14 @@ use during the build and install process. These three variables are as follows: *startdir*:: This contains the absolute path to the directory where the PKGBUILD was located, which is usually the output of `$(pwd)` when makepkg is started. - `$startdir` was most often used in combination with `/src` or `/pkg` - postfixes, but use of the `$srcdir` and `$pkgdir` variables is preferred. *srcdir*:: This points to the directory where makepkg extracts or copies all source - files. Although it currently is an alias for `$startdir/src`, this - assumption should not be assumed true for all future revisions of makepkg. + files. *pkgdir*:: This points to the directory where makepkg bundles the installed package (this directory will become the root directory of your built package). - Although it currently is an alias for `$startdir/pkg`, this assumption - should not be assumed true for all future revisions of makepkg. 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 @@ -264,6 +259,26 @@ combination with the fakeroot BUILDENV option in linkman:makepkg.conf[5], fakero usage will be limited to running the packaging stage. The build() function will be run as the user calling makepkg. +Package Splitting +----------------- +makepkg supports building multiple packages from a single PKGBUILD. This is achieved +by assigning an array of package names to the `pkgname` directive. Each split package +uses a corresponding packaging function with name `package_foo()`, where `foo` is the +name of the split package. + +All options and directives for the split packages default to the global values given +within the PKGBUILD. However, some of these can be overridden within each split +package's packaging function. The following variables can be overridden: `pkgdesc`, +`license`, `groups`, `depends`, `optdepends`, `provides`, `conflicts`, `replaces`, +`backup`, `options` and `install`. + +An optional global directive is available when building a split package: + +*pkgbase*:: + The name used to refer to the group of packages in the output of makepkg + and in the naming of source-only tarballs. If not specified, the first + element in the `pkgname` array is used. + Install/Upgrade/Remove Scripting -------------------------------- Pacman has the ability to store and execute a package-specific script when it diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index fb2e805..e480d8e 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -122,9 +122,9 @@ Options during dependency auto-resolution and installation when using `-s`. *-R, \--repackage*:: - Repackage contents of pkg/ without rebuilding the package. This is - useful if you forgot a depend or install file in your PKGBUILD and the - build itself will not change. + Repackage contents of the package without rebuilding the package. This + is useful if you forgot a depend or install file in your PKGBUILD and + the build itself will not change. *-s, \--syncdeps*:: Install missing dependencies using pacman. When build-time or run-time diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ebc19bc..fefcc73 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1308,7 +1308,7 @@ usage() { printf "$(gettext " -p <buildscript> Use an alternate build script (instead of '%s')")\n" "$BUILDSCRIPT" echo "$(gettext " -r, --rmdeps Remove installed dependencies after a successful build")" # fix flyspray feature request #2978 - echo "$(gettext " -R, --repackage Repackage contents of pkg/ without building")" + echo "$(gettext " -R, --repackage Repackage contents of the package without rebuilding")" 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")" -- 1.6.3

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-148-g2001735
by dan＠archlinux.org 12 May '09

12 May '09

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 20017354f7ccb58bf4f78691985a5d237f4dbc90 (commit) via a783f3fbf1425fc9b8815a2ab658aa6530ce0c23 (commit) via f569c4a0425649853516634853159cbe8815dee6 (commit) via ed848b1c54e520db760760f1db2e79414cf39bf6 (commit) from c27904661ef96cb2e7c729ce82b527146529c768 (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 20017354f7ccb58bf4f78691985a5d237f4dbc90 Author: Dan McGee <dan(a)archlinux.org> Date: Mon May 11 21:43:36 2009 -0500 Remove version information from -Qqo output This was the only --quiet operation that showed version information; make it consistent with the rest. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a783f3fbf1425fc9b8815a2ab658aa6530ce0c23 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sun May 10 22:41:29 2009 +0200 Introduce -Qlq With --quiet flag, -Ql doesn't print the package name, just lists the files. I made --quiet documentation up-to-date (I also added -Sgq/-Qgq). Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f569c4a0425649853516634853159cbe8815dee6 Author: Allan McRae <allan(a)archlinux.org> Date: Sun May 3 17:21:02 2009 +1000 makepkg: several small fixes 1) Do not attempt to strip compressed binaries Original-work-by: Marc - A. Dahlhaus <mad(a)wol.de> 2) Add "\" in "GPL\'ed" so quote mark does not break source code highlighting 3) Add local to docdir paths in makepkg.conf for consistency 4) Use full path to sed in MacOSX in case users have GNU sed earlier in path Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ed848b1c54e520db760760f1db2e79414cf39bf6 Author: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Date: Mon May 11 00:35:56 2009 -0300 Fix non-C style comments in libalpm Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- doc/pacman.8.txt | 18 ++++++++++++------ etc/makepkg.conf.in | 2 +- lib/libalpm/be_files.c | 4 ++-- lib/libalpm/be_package.c | 2 +- scripts/makepkg.sh.in | 4 +++- src/pacman/package.c | 8 ++++++-- src/pacman/package.h | 2 +- src/pacman/query.c | 5 ++--- 9 files changed, 29 insertions(+), 18 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: Document package splitting
by Allan McRae 12 May '09

12 May '09

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This is a RFC patch. I would like comments on the documentation I have written. I find it hard to write documentation for features I implemented as I know what I am talking about, even if no-one else does... (I haven't actually checked that the docs still build after these changes.) doc/PKGBUILD.5.txt | 19 +++++++++++++++++++ doc/makepkg.8.txt | 6 +++--- scripts/makepkg.sh.in | 2 +- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index e1ea632..e2f19ac 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -264,6 +264,25 @@ combination with the fakeroot BUILDENV option in linkman:makepkg.conf[5], fakero usage will be limited to running the packaging stage. The build() function will be run as the user calling makepkg. +Package Splitting +----------------- +makepkg supports building multiple packages from a single PKGBUILD. This is achieved +by assigning an array of package names to the `pkgname` directive. Each sub-package +uses a corresponding package function with name `package_foo()`, where `foo` is the +name of the package. + +All options and directives for the split packages default to the global values given +within the PKGBUILD. However, some of these can be overridden within each sub-package's +package function. The following variables can be overridden: `pkgdesc`, `license`, +`groups`, `depends`, `optdepends`, `provides`, `conflicts`, `replaces`, `backup`, +`options` and `install`. + +An additional directive is available when building a split package: + +*pkgbase*:: + The name used to refer to the group of packages in the output of makepkg. + Also, used when creating source-only tarballs. + Install/Upgrade/Remove Scripting -------------------------------- Pacman has the ability to store and execute a package-specific script when it diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index fb2e805..e480d8e 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -122,9 +122,9 @@ Options during dependency auto-resolution and installation when using `-s`. *-R, \--repackage*:: - Repackage contents of pkg/ without rebuilding the package. This is - useful if you forgot a depend or install file in your PKGBUILD and the - build itself will not change. + Repackage contents of the package without rebuilding the package. This + is useful if you forgot a depend or install file in your PKGBUILD and + the build itself will not change. *-s, \--syncdeps*:: Install missing dependencies using pacman. When build-time or run-time diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ebc19bc..fefcc73 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1308,7 +1308,7 @@ usage() { printf "$(gettext " -p <buildscript> Use an alternate build script (instead of '%s')")\n" "$BUILDSCRIPT" echo "$(gettext " -r, --rmdeps Remove installed dependencies after a successful build")" # fix flyspray feature request #2978 - echo "$(gettext " -R, --repackage Repackage contents of pkg/ without building")" + echo "$(gettext " -R, --repackage Repackage contents of the package without rebuilding")" 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")" -- 1.6.3

3 4