- Pacman-dev - lists.archlinux.org

[pacman-dev] icadyptes makepkg changes
by Allan McRae 20 Jan '09

20 Jan '09

Hi, This is a reminder for myself and a FYI for anyone else that is interested. There is a new Arch fork called Icadyptes (http://icadyptes.org/) which does some changes to makepkg and to a lesser extend pacman (see http://icadyptes.org/index.php?q=node/2) Their git repo is here: http://gitweb.icadyptes.org/?p=icadyptes-core/.git;a=tree;f=base/pacman;hb=… Maybe there is something useful there that would worth merging. Adding something like "runtimedeps" has been previously suggested but from memory the patch never got updated for inclusion. Other makepkg changes listed will probably never make it here... Anyway, I will give the Icadyptes dev a ping to suggest that any changes could/should be CCed here so we can decide whether to include them. Allan

2 1

[pacman-dev] [PATCH] db_register: Unlink DbPath/database, if it is not a directory
by Nagy Gabor 19 Jan '09

19 Jan '09

From 884155e03bf20f1cca880f39848423091729f6cd Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Mon, 19 Jan 2009 00:35:45 +0100 Subject: [PATCH] db_register: Unlink DbPath/database, if it is not a directory We had a check for this case, but we didn't handle it at all (neither error, nor fix), we also had a TODO in the code. For example, if user has an "unstable" regular file instead of "unstable" directory (FS#12148), from now on pacman will remove that file (and print a warning message). Before this patch pacman just stopped with "could not register database" error. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/db.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 9b91ce4..fe886ae 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -452,13 +452,18 @@ pmdb_t *_alpm_db_register_local(void) RET_ERR(PM_ERR_DB_OPEN, NULL); } snprintf(path, PATH_MAX, "%slocal", dbpath); - /* TODO this is rediculous, we try to do this even if we can't */ - if(stat(path, &buf) != 0 || !S_ISDIR(buf.st_mode)) { + + if(stat(path, &buf) != 0) { _alpm_log(PM_LOG_DEBUG, "database dir '%s' does not exist, creating it\n", path); if(_alpm_makepath(path) != 0) { RET_ERR(PM_ERR_SYSTEM, NULL); } + } else if(!S_ISDIR(buf.st_mode)) { + _alpm_log(PM_LOG_WARNING, "removing bogus database: %s\n", path); + if(unlink(path) != 0 || _alpm_makepath(path) != 0) { + RET_ERR(PM_ERR_SYSTEM, NULL); + } } db = _alpm_db_new(dbpath, "local"); @@ -504,13 +509,18 @@ pmdb_t *_alpm_db_register_sync(const char *treename) } /* all sync DBs now reside in the sync/ subdir of the dbpath */ snprintf(path, PATH_MAX, "%ssync/%s", dbpath, treename); - /* TODO this is rediculous, we try to do this even if we can't */ - if(stat(path, &buf) != 0 || !S_ISDIR(buf.st_mode)) { + + if(stat(path, &buf) != 0) { _alpm_log(PM_LOG_DEBUG, "database dir '%s' does not exist, creating it\n", path); if(_alpm_makepath(path) != 0) { RET_ERR(PM_ERR_SYSTEM, NULL); } + } else if(!S_ISDIR(buf.st_mode)) { + _alpm_log(PM_LOG_WARNING, "removing bogus database: %s\n", path); + if(unlink(path) != 0 || _alpm_makepath(path) != 0) { + RET_ERR(PM_ERR_SYSTEM, NULL); + } } /* Ensure the db gets the real path. */ -- 1.6.1

2 2

[pacman-dev] pacman mirrors
by Amanai 19 Jan '09

19 Jan '09

I don't know what to do, but I know with the last pacman update with a seperated mirror list, my download speed went down to 40-80 k/sec. Before it was around 1700-2000 k/sec, using cable with 30 Mbits. I try to find the fastest server, but can't. Is it possible that pacman can use "geo_ip", that automatically find the nearest and fastest server. This works perfect with my openSUSE box. Now it looks like, after running pacman -Syu I spend a day to get all updates. I was set up mirror after mirror from this list http://users.archlinux.de/~gerbra/mirrorcheck.html the fastest I get now are 200 k/sec. with a Server out of date. ~ 10 hours out of date. Where is the fast california server gone?

2 1

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.2.2-4-g472e51b
by dan＠archlinux.org 18 Jan '09

18 Jan '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, maint has been updated via 472e51b975b9cb8fe1f67c03ff72bbc067fa7f01 (commit) from 1191303f8b9edc01ff969e2433f5c40c9a95474a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 4 ++-- lib/libalpm/util.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-73-gc794661
by dan＠archlinux.org 18 Jan '09

18 Jan '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 c794661f1ea8c819d479948e92e5648de62787c5 (commit) via 8929769902597f109fc6b49609fb64121becb197 (commit) via 350c3eb6ec25b91b0402fa86422a7312ba7330d6 (commit) via 472e51b975b9cb8fe1f67c03ff72bbc067fa7f01 (commit) from fba5771fa4c774457531a4bbbcd66340c7c3fb6a (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 c794661f1ea8c819d479948e92e5648de62787c5 Merge: 8929769902597f109fc6b49609fb64121becb197 472e51b975b9cb8fe1f67c03ff72bbc067fa7f01 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jan 18 13:48:48 2009 -0600 Merge branch 'maint' commit 8929769902597f109fc6b49609fb64121becb197 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 17 09:51:48 2009 -0600 makepkg: test fixes, part 2 The goal of this fix was empty string comparisons: - if [ "$pkgname" != "" ]; then + if [ -n "$pkgname" ]; then Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 350c3eb6ec25b91b0402fa86422a7312ba7330d6 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 17 09:42:23 2009 -0600 makepkg: clean up test usage In a lot of places, we had the following construct: [ "$foobar" = "0" ] which is better represented by using the integer tests: [ $foobar -eq 0 ] Attempt to unify makepkg to use the latter rather than the former in all places. From here on out we should ensure anything that is set to 0, 1, etc. uses the -eq format rather than =. In addition, fix a few other test anomalies including usage of double equals. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 4 +- lib/libalpm/util.c | 4 +- scripts/makepkg.sh.in | 135 +++++++++++++++++++++++++------------------------ 3 files changed, 72 insertions(+), 71 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Use archive_entry_set_perm instead of archive_entry_set_mode
by Nagy Gabor 18 Jan '09

18 Jan '09

From 2b1a58bda8318b7d0c70a4cfc161a82a156b199b Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sun, 18 Jan 2009 20:03:56 +0100 Subject: [PATCH] Use archive_entry_set_perm instead of archive_entry_set_mode This patch fixes FS#12148 ('unstable' regular file). I also changed the other archive_entry_set_mode usage in add.c to archive_entry_set_perm. Since I cannot find any relevant info in libarchive manual, I quote Tim Kientzle (the author of libarchive) here, and I say thank you for his help. *** Tim Kientzle wrote ************************************* This is the problem in libalpm/util.c: 323 if(S_ISREG(st->st_mode)) { 324 archive_entry_set_mode(entry, 0644); 325 } else if(S_ISDIR(st->st_mode)) { 326 archive_entry_set_mode(entry, 0755); 327 } Your example unstable.db.tar.gz is not empty. It has one entry in it, called "./". That entry is marked as a directory. But, when you call archive_entry_set_mode(), you are changing the file type! archive_read_extract() then creates the file /var/unstable as you requested. (archive_read_extract() will replace an empty directory with a file.) You should either set the mode value correctly: 323 if(S_ISREG(st->st_mode)) { 324 archive_entry_set_mode(entry, IFREG | 0644); 325 } else if(S_ISDIR(st->st_mode)) { 326 archive_entry_set_mode(entry, IFDIR | 0755); 327 } Or use archive_entry_set_perm(), which does not change the file type: 323 if(S_ISREG(st->st_mode)) { 324 archive_entry_set_perm(entry, 0644); 325 } else if(S_ISDIR(st->st_mode)) { 326 archive_entry_set_perm(entry, 0755); 327 } ************************************************************ Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/add.c | 4 ++-- lib/libalpm/util.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 23659c9..3c0074f 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -292,12 +292,12 @@ static int extract_single_file(struct archive *archive, /* the install script goes inside the db */ snprintf(filename, PATH_MAX, "%s%s-%s/install", db->path, newpkg->name, newpkg->version); - archive_entry_set_mode(entry, 0644); + archive_entry_set_perm(entry, 0644); } else if(strcmp(entryname, ".CHANGELOG") == 0) { /* the changelog goes inside the db */ snprintf(filename, PATH_MAX, "%s%s-%s/changelog", db->path, newpkg->name, newpkg->version); - archive_entry_set_mode(entry, 0644); + archive_entry_set_perm(entry, 0644); } else if(*entryname == '.') { /* for now, ignore all files starting with '.' that haven't * already been handled (for future possibilities) */ diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 5e6ca0c..1bec634 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -321,9 +321,9 @@ int _alpm_unpack(const char *archive, const char *prefix, const char *fn) entryname = archive_entry_pathname(entry); if(S_ISREG(st->st_mode)) { - archive_entry_set_mode(entry, 0644); + archive_entry_set_perm(entry, 0644); } else if(S_ISDIR(st->st_mode)) { - archive_entry_set_mode(entry, 0755); + archive_entry_set_perm(entry, 0755); } /* If a specific file was requested skip entries that don't match. */ -- 1.6.1

3 2

[pacman-dev] [PATCH 1/2] makepkg: clean up test usage
by Dan McGee 18 Jan '09

18 Jan '09

In a lot of places, we had the following construct: [ "$foobar" = "0" ] which is better represented by using the integer tests: [ $foobar -eq 0 ] Attempt to unify makepkg to use the latter rather than the former in all places. From here on out we should ensure anything that is set to 0, 1, etc. uses the -eq format rather than =. In addition, fix a few other test anomalies including usage of double equals. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/makepkg.sh.in | 100 ++++++++++++++++++++++++------------------------ 1 files changed, 50 insertions(+), 50 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 1721048..c25a8d8 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -129,7 +129,7 @@ error() { # the fakeroot call, the error message will be printed by the main call. ## trap_exit() { - if [ "$INFAKEROOT" = "0" ]; then + if [ $INFAKEROOT -eq 0 ]; then echo error "$@" fi @@ -143,12 +143,12 @@ trap_exit() { clean_up() { local EXIT_CODE=$? - if [ "$INFAKEROOT" = "1" ]; then + if [ $INFAKEROOT -eq 1 ]; then # Don't clean up when leaving fakeroot, we're not done yet. return fi - if [ $EXIT_CODE -eq 0 -a "$CLEANUP" = "1" ]; then + if [ $EXIT_CODE -eq 0 -a $CLEANUP -eq 1 ]; then # If it's a clean exit and -c/--clean has been passed... msg "$(gettext "Cleaning up...")" rm -rf "$pkgdir" "$srcdir" @@ -277,7 +277,7 @@ get_downloadclient() { local i for i in "${DLAGENTS[@]}"; do local handler=$(echo $i | sed 's|::.*||') - if [ "$proto" == "$handler" ]; then + if [ "$proto" = "$handler" ]; then agent=$(echo $i | sed 's|^.*::||') break fi @@ -353,16 +353,16 @@ handledeps() { local deplist="$*" - if [ "$DEP_BIN" = "0" ]; then + if [ $DEP_BIN -eq 0 ]; then return $R_DEPS_MISSING fi - if [ "$DEP_BIN" = "1" ]; then + if [ $DEP_BIN -eq 1 ]; then # install missing deps from binary packages (using pacman -S) msg "$(gettext "Installing missing dependencies...")" local ret=0 - if [ "$ASROOT" = 0 ]; then + if [ $ASROOT -eq 0 ]; then sudo pacman $PACMAN_OPTS -S --asdeps $deplist || ret=$? else pacman $PACMAN_OPTS -S --asdeps $deplist || ret=$? @@ -398,7 +398,7 @@ resolve_deps() { # check deps again to make sure they were resolved deplist="$(check_deps $*)" [ "$deplist" = "" ] && return $R_DEPS_SATISFIED - elif [ "$DEP_BIN" = "1" ]; then + elif [ $DEP_BIN -eq 1 ]; then error "$(gettext "Failed to install all missing dependencies.")" fi @@ -414,7 +414,7 @@ resolve_deps() { # fix flyspray bug #5923 remove_deps() { # $pkgdeps is a GLOBAL variable, set by resolve_deps() - [ "$RMDEPS" = "0" ] && return + [ $RMDEPS -eq 0 ] && return [ "$pkgdeps" = "" ] && return local dep depstrip deplist @@ -426,7 +426,7 @@ remove_deps() { msg "Removing installed dependencies..." local ret=0 - if [ "$ASROOT" = "0" ]; then + if [ $ASROOT -eq 0 ]; then sudo pacman $PACMAN_OPTS -Rns $deplist || ret=$? else pacman $PACMAN_OPTS -Rns $deplist || ret=$? @@ -686,7 +686,7 @@ run_build() { local shellopts=$(shopt -p) local ret=0 - if [ "$LOGGING" = "1" ]; then + if [ $LOGGING -eq 1 ]; then BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}-build.log" if [ -f "$BUILDLOG" ]; then local i=1 @@ -736,7 +736,7 @@ run_package() { export CFLAGS CXXFLAGS LDFLAGS MAKEFLAGS CHOST local ret=0 - if [ "$LOGGING" = "1" ]; then + if [ $LOGGING -eq 1 ]; then BUILDLOG="${startdir}/${nameofpkg}-${pkgver}-${pkgrel}-${CARCH}-package.log" if [ -f "$BUILDLOG" ]; then local i=1 @@ -785,7 +785,7 @@ tidy_install() { msg2 "$(gettext "Purging other files...")" local pt for pt in "${PURGE_TARGETS[@]}"; do - if [ "${pt}" == "${pt//\/}" ]; then + if [ "${pt}" = "${pt//\/}" ]; then find . -type f -name "${pt}" -exec rm -f -- '{}' \; else rm -f ${pt} @@ -881,7 +881,7 @@ create_package() { # write the .PKGINFO file msg2 "$(gettext "Generating .PKGINFO file...")" echo "# Generated by makepkg $myver" >.PKGINFO - if [ "$INFAKEROOT" = "1" ]; then + if [ $INFAKEROOT -eq 1 ]; then echo "# using $(fakeroot -v)" >>.PKGINFO fi echo "# $(LC_ALL=C date -u)" >>.PKGINFO @@ -1048,7 +1048,7 @@ create_xdelta() { create_srcpackage() { cd "$startdir" - if [ "$SOURCEONLY" = "2" ]; then + if [ $SOURCEONLY -eq 2 ]; then # get back to our src directory so we can begin with sources mkdir -p "$srcdir" cd "$srcdir" @@ -1084,7 +1084,7 @@ create_srcpackage() { if [ -f "$netfile" ]; then msg2 "$(gettext "Adding %s...")" "$netfile" ln -s "${startdir}/$netfile" "${srclinks}/${pkgname}" - elif [ "$SOURCEONLY" = "2" -a -f "$SRCDEST/$file" ]; then + elif [ $SOURCEONLY -eq 2 -a -f "$SRCDEST/$file" ]; then msg2 "$(gettext "Adding %s...")" "$file" ln -s "$SRCDEST/$file" "${srclinks}/${pkgname}/" fi @@ -1112,9 +1112,9 @@ create_srcpackage() { } install_package() { - [ "$INSTALL" = "0" ] && return + [ $INSTALL -eq 0 ] && return msg "$(gettext "Installing package ${pkgname} with pacman -U...")" - if [ "$ASROOT" = "0" ]; then + if [ $ASROOT -eq 0 ]; then sudo pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT} || exit $? else pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT} || exit $? @@ -1124,7 +1124,7 @@ install_package() { devel_check() { newpkgver="" # Only update pkgver if --holdver is not set - if [ "$HOLDVER" = "1" ]; then + if [ $HOLDVER -eq 1 ]; then return fi # Cannot update pkgver/pkgrel if reading PKGBUILD from pipe @@ -1453,13 +1453,13 @@ SRCDEST=${_SRCDEST:-$SRCDEST} SRCDEST=${SRCDEST:-$startdir} #default to $startdir if undefined -if [ "$HOLDVER" = "1" -a "$FORCE_VER" != "" ]; then +if [ $HOLDVER -eq 1 -a "$FORCE_VER" != "" ]; then # The '\\0' is here to prevent gettext from thinking --holdver is an option error "$(gettext "\\0--holdver and --forcever cannot both be specified" )" exit 1 fi -if [ "$CLEANCACHE" = "1" ]; then +if [ $CLEANCACHE -eq 1 ]; then #fix flyspray feature request #5223 if [ -n "$SRCDEST" -a "$SRCDEST" != "$startdir" ]; then msg "$(gettext "Cleaning up ALL files from %s.")" "$SRCDEST" @@ -1495,14 +1495,14 @@ if [ -z "$BUILDSCRIPT" ]; then exit 1 fi -if [ "$INFAKEROOT" = "0" ]; then - if [ $EUID -eq 0 -a "$ASROOT" = "0" ]; then +if [ $INFAKEROOT -eq 0 ]; then + if [ $EUID -eq 0 -a $ASROOT -eq 0 ]; then # Warn those who like to live dangerously. error "$(gettext "Running makepkg as root is a BAD idea and can cause")" plain "$(gettext "permanent, catastrophic damage to your system. If you")" plain "$(gettext "wish to run as root, please use the --asroot option.")" exit 1 # $E_USER_ABORT - elif [ $EUID -gt 0 -a "$ASROOT" = "1" ]; then + elif [ $EUID -gt 0 -a $ASROOT -eq 1 ]; then # Warn those who try to use the --asroot option when they are not root error "$(gettext "The --asroot option is meant for the root user only.")" plain "$(gettext "Please rerun makepkg without the --asroot flag.")" @@ -1527,8 +1527,8 @@ else fi # check for sudo if we will need it during makepkg execution -if [ "$ASROOT" = "0" \ - -a $ "$DEP_BIN" = "1" -o "$RMDEPS" = "1" -o "$INSTALL" = "1" $ ]; then +if [ $ASROOT -eq 0 \ + -a $ $DEP_BIN -eq 1 -o $RMDEPS -eq 1 -o $INSTALL -eq 1 $ ]; then if [ ! "$(type -p sudo)" ]; then error "$(gettext "Cannot find the sudo binary! Is sudo installed?")" plain "$(gettext "Missing dependencies cannot be installed or removed as a normal user")" @@ -1559,7 +1559,7 @@ fi source "$BUILDSCRIPT" -if [ "$GENINTEG" = "1" ]; then +if [ $GENINTEG -eq 1 ]; then mkdir -p "$srcdir" cd "$srcdir" download_sources @@ -1567,7 +1567,7 @@ if [ "$GENINTEG" = "1" ]; then exit 0 # $E_OK fi -if [ "$(type -t package)" == "function" ]; then +if [ "$(type -t package)" = "function" ]; then PKGFUNC=1 fi @@ -1602,7 +1602,7 @@ if [ "$arch" = 'any' ]; then fi if ! in_array $CARCH ${arch[@]}; then - if [ "$IGNOREARCH" = "0" ]; then + if [ $IGNOREARCH -eq 0 ]; then error "$(gettext "%s is not available for the '%s' architecture.")" "$pkgname" "$CARCH" plain "$(gettext "Note that many packages may need a line added to their %s")" "$BUILDSCRIPT" plain "$(gettext "such as arch=('%s').")" "$CARCH" @@ -1650,8 +1650,8 @@ devel_check devel_update if [ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \ - -a "$FORCE" = "0" -a "$SOURCEONLY" = "0" -a "$NOBUILD" = "0" ]; then - if [ "$INSTALL" = "1" ]; then + -a $FORCE -eq 0 -a $SOURCEONLY -eq 0 -a $NOBUILD -eq 0 ]; then + if [ $INSTALL -eq 1 ]; then warning "$(gettext "A package has already been built, installing existing package...")" install_package exit $? @@ -1662,10 +1662,10 @@ if [ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \ fi # Run the bare minimum in fakeroot -if [ "$INFAKEROOT" = "1" ]; then - if [ "$SPLITPKG" = "0" ]; then - if [ "$PKGFUNC" = "0" ]; then - if [ "$REPKG" = "0" ]; then +if [ $INFAKEROOT -eq 1 ]; then + if [ $SPLITPKG -eq 0 ]; then + if [ $PKGFUNC -eq 0 ]; then + if [ $REPKG -eq 0 ]; then run_build fi else @@ -1693,9 +1693,9 @@ fi msg "$(gettext "Making package: %s")" "$pkgname $pkgver-$pkgrel $CARCH ($(date))" # if we are creating a source-only package, go no further -if [ "$SOURCEONLY" != "0" ]; then +if [ $SOURCEONLY -ne 0 ]; then if [ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}${SRCEXT}" \ - -a "$FORCE" = "0" ]; then + -a $FORCE -eq 0 ]; then error "$(gettext "A package has already been built. (use -f to overwrite)")" exit 1 fi @@ -1705,9 +1705,9 @@ if [ "$SOURCEONLY" != "0" ]; then fi # fix flyspray bug #5973 -if [ "$NODEPS" = "1" -o "$NOBUILD" = "1" -o "$REPKG" = "1" ]; then +if [ $NODEPS -eq 1 -o $NOBUILD -eq 1 -o $REPKG -eq 1 ]; then # no warning message needed for nobuild, repkg - if [ "$NODEPS" = "1" ]; then + if [ $NODEPS -eq 1 ]; then warning "$(gettext "Skipping dependency checks.")" fi elif [ $(type -p pacman) ]; then @@ -1735,18 +1735,18 @@ umask 0022 mkdir -p "$srcdir" cd "$srcdir" -if [ "$NOEXTRACT" = "1" ]; then +if [ $NOEXTRACT -eq 1 ]; then warning "$(gettext "Skipping source retrieval -- using existing src/ tree")" warning "$(gettext "Skipping source integrity checks -- using existing src/ tree")" warning "$(gettext "Skipping source extraction -- using existing src/ tree")" - if [ "$NOEXTRACT" = "1" -a "$(ls "$srcdir" 2>/dev/null)" = "" ]; then + if [ $NOEXTRACT -eq 1 -a "$(ls "$srcdir" 2>/dev/null)" = "" ]; then error "$(gettext "The source directory is empty, there is nothing to build!")" plain "$(gettext "Aborting...")" exit 1 fi -elif [ "$REPKG" = "1" ]; then - if [ "$PKGFUNC" = "0" -a "$SPLITPKG" = "0" \ +elif [ $REPKG -eq 1 ]; then + if [ $PKGFUNC -eq 0 -a $SPLITPKG -eq 0 \ -a $ ! -d "$pkgdir" -o "$(ls "$pkgdir" 2>/dev/null)" = "" $ ]; then error "$(gettext "The package directory is empty, there is nothing to repackage!")" plain "$(gettext "Aborting...")" @@ -1758,12 +1758,12 @@ else extract_sources fi -if [ "$NOBUILD" = "1" ]; then +if [ $NOBUILD -eq 1 ]; then msg "$(gettext "Sources are ready.")" exit 0 #E_OK else # check for existing pkg directory; don't remove if we are repackaging - if [ -d "$pkgdir" -a $ "$REPKG" = "0" -o "$PKGFUNC" = "1" -o "$SPLITPKG" = "1" $ ]; then + if [ -d "$pkgdir" -a $ $REPKG -eq 0 -o $PKGFUNC -eq 1 -o $SPLITPKG -eq 1 $ ]; then msg "$(gettext "Removing existing pkg/ directory...")" rm -rf "$pkgdir" fi @@ -1772,15 +1772,15 @@ else # if we are root or if fakeroot is not enabled, then we don't use it if [ "$(check_buildenv fakeroot)" != "y" -o $EUID -eq 0 ]; then - if [ "$REPKG" = "0" ]; then + if [ $REPKG -eq 0 ]; then devel_update run_build fi - if [ "$SPLITPKG" = "0" ]; then - if [ "$PKGFUNC" = "1" ]; then + if [ $SPLITPKG -eq 0 ]; then + if [ $PKGFUNC -eq 1 ]; then run_package tidy_install - elif [ "$REPKG" = "0" ]; then + elif [ $REPKG -eq 0 ]; then tidy_install fi create_package @@ -1797,7 +1797,7 @@ else done fi else - if [ "$REPKG" = "0" -a $ "$PKGFUNC" == "1" -o "$SPLITPKG" = "1" $ ]; then + if [ $REPKG -eq 0 -a $ $PKGFUNC -eq 1 -o $SPLITPKG -eq 1 $ ]; then devel_update run_build cd "$startdir" -- 1.6.1

4 5

[pacman-dev] My first splitted package
by Pierre Schmitz 18 Jan '09

18 Jan '09

Hi pacman-devs, I have just installed Allan's makepkg-git package and played with the splitting feature. I think its quite elegant and will make packaging a lot easier and cleaner. I have two general questions (so far) 1) Are dependencies and makedependencies of sub-packages are treated by makepkg in any way? If yes there might be a problem if the sub-packages depend on each other. 2) Is it possible to use build_pkg1 etc.? That's not very improtant as one could abuse the package functions for such a use case. So, let's have a look at a real world example. I have chosen phonon for this. Its quite small but its really useful to split it into three parts. Optdepends do not work here because phonon detects its backends at runtime; and if those are linked against something we have not installed we'll have a problem. The following PKGBUILD works fine and the resulting packages are valid and functional. I am not sure if this is the best way to use splitting; so comments are welcome. One problem is that phonon and its backends depend on each other. the backends are linked against phonon and if you use phonon you'll have to install at least one backend. Long story short; here it is: pkgname=('phonon' 'phonon-backend-xine' 'phonon-backend-gstreamer') pkgver=4.2.96 pkgrel=1 pkgdesc='The multimedia API for KDE 4' arch=('i686' 'x86_64') url='http://phonon.kde.org' license=('LGPL') makedepends=('pkgconfig' 'cmake' 'automoc4') source=("http://download.kde.org/unstable/4.1.96/src/${pkgname}-${pkgver}.tar.bz2") md5sums=('35b64db6e850df7d492f812a85b16982') build() { cd $srcdir mkdir build cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr make } package_phonon() { depends=('qt' 'phonon-backend') cd $srcdir/build/phonon make DESTDIR=$pkgdir install cd $srcdir/build/includes make DESTDIR=$pkgdir install } package_phonon-backend-xine() { pkgdesc='Xine backend for Phonon' provides=('phonon-backend') depends=('phonon' 'xine-lib') cd $srcdir/build/xine make DESTDIR=$pkgdir install } package_phonon-backend-gstreamer() { pkgdesc='Gstreamer backend for Phonon' provides=('phonon-backend') depends=('phonon' 'gstreamer0.10-base') cd $srcdir/build/gstreamer make DESTDIR=$pkgdir install } -- Pierre Schmitz Clemens-August-Straße 76 53115 Bonn Telefon 0228 9716608 Mobil 0160 95269831 Jabber pierre(a)jabber.archlinux.de WWW http://www.archlinux.de

4 6

[pacman-dev] makepkg-git package
by Allan McRae 17 Jan '09

17 Jan '09

Hi all, The splitpkg work has now made it into pacman's master branch so it would be good to get some more testing on this. I have made a makepkg-git package that installs alongside the makepkg from pacman so people can safely take this for a spin. Read all about it and download from http://dev.archlinux.org/~allan/makepkg-git.html Just a reminder for those who want to test new features in pacman and makepkg, Dan has pacman-git build that can be tried out. Dan uses these builds all the time, so the are fairly stable... He pushed a package today so they will only be 1 patch different to my makepkg-git package. x86:64: [pacman-git-64] Server = http://dev.archlinux.org/~dan/pacman-git i686: [pacman-git] Server = http://dev.archlinux.org/~dan/pacman-git Allan

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-69-gfba5771
by dan＠archlinux.org 17 Jan '09

17 Jan '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 fba5771fa4c774457531a4bbbcd66340c7c3fb6a (commit) via 5bc23bc05d1661b27867a53069858c05356efd22 (commit) from 3d49d88009341d5cacbbe08fb4f6f6af3ed76ae1 (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 fba5771fa4c774457531a4bbbcd66340c7c3fb6a Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jan 17 16:41:01 2009 +1000 makepkg: repackage rework with package functions When using the optional package() function or split packages, the entire packaging step is rerun instead of just final package creation step. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5bc23bc05d1661b27867a53069858c05356efd22 Author: Bryan Ischo <bji-keyword-pacman.3644cb(a)www.ischo.com> Date: Sat Jan 17 15:14:16 2009 +1300 Fixed some inconsistencies and errors in the pactest documentation. Signed-off-by: Bryan Ischo <bryan(a)ischo.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: pactest/README | 25 ++++++++++++++++--------- scripts/makepkg.sh.in | 48 ++++++++++++++++++++++++++++-------------------- 2 files changed, 44 insertions(+), 29 deletions(-) hooks/post-receive -- The official pacman repository

1 0