- Pacman-dev - lists.archlinux.org

Re: [pacman-dev] [PATCH] Fix a possible bash-4.0 problem in makepkg
by Marc - A. Dahlhaus [ Administration | Westermann GmbH ] 28 Apr '09

28 Apr '09

Am Dienstag, den 28.04.2009, 14:26 +1000 schrieb Allan McRae: > Aaron Griffin wrote: > > On Sun, Apr 26, 2009 at 9:39 AM, Marc - A. Dahlhaus <mad(a)wol.de> wrote: > > > >> Dan McGee schrieb: > >> > >>> On Sun, Apr 26, 2009 at 9:04 AM, Marc - A. Dahlhaus <mad(a)wol.de> wrote: > >>> > >>> > >>>> Allan McRae schrieb: > >>>> > >>>> > >>>>> Marc - A. Dahlhaus wrote: > >>>>> > >>>>> > >>>>>> Hello, > >>>>>> > >>>>>> i've spotted a problem in makepkg's cleanup part if the host is running > >>>>>> bash-4.0. > >>>>>> As makepkg runs bash with option -e, on bash-4.0 it fails if strip > >>>>>> reports an unsupported binary. > >>>>>> The following trivial patch fixes the problem. > >>>>>> > >>>>>> Signed-off-by: "Marc - A. Dahlhaus" <mad(a)wol.de> > >>>>>> > >>>>>> --- pacman-3.2.2.orig/scripts/makepkg.sh.in > >>>>>> +++ pacman-3.2.2/scripts/makepkg.sh.in > >>>>>> @@ -766,11 +766,11 @@ tidy_install() { > >>>>>> find ${STRIP_DIRS[@]} -type f 2>/dev/null | while read binary ; > >>>>>> do > >>>>>> case "$(file -biz "$binary")" in > >>>>>> *application/x-sharedlib*) # Libraries (.so) > >>>>>> - /usr/bin/strip --strip-debug "$binary";; > >>>>>> + /usr/bin/strip --strip-debug "$binary" || true;; > >>>>>> *application/x-archive*) # Libraries (.a) > >>>>>> - /usr/bin/strip --strip-debug "$binary";; > >>>>>> + /usr/bin/strip --strip-debug "$binary" || true;; > >>>>>> *application/x-executable*) # Binaries > >>>>>> - /usr/bin/strip "$binary";; > >>>>>> + /usr/bin/strip "$binary" || true;; > >>>>>> esac > >>>>>> done > >>>>>> fi > >>>>>> > >>>>>> > >>>>> I don't think this is a good approach to the problem. Having "|| true" > >>>>> means if there is a real problem, then it gets ignored. > >>>>> > >>>>> > >>>> What real problem could arise? > >>>> An unsupported binary? Would print errors but creates the package mostly > >>>> stripped. > >>>> A missing strip command? Would print errors but creates the package > >>>> unstripped. > >>>> A damaged storage... but i think in that case makepkg would have failed > >>>> in > >>>> the actual build step and not in cleanup. > >>>> > >>>> > >>>>> I suppose the real question is: How do you actually get an unsupported > >>>>> binary? My guess is this occurs when building a package from a binary > >>>>> source, in which case "options=('!strip')" would be the solution. > >>>>> > >>>>> > >>>> The package that triggered this, was xen. > >>>> xen installs some gzipped content inside /usr/lib which strip doesn't > >>>> support. > >>>> > >>>> $ file -biz usr/lib/xen/boot/ioemu-stubdom.gz > >>>> application/x-executable; charset=binary > >>>> compressed-encoding=application/x-gzip; charset=binary; charset=binary > >>>> > >>>> The file itself is a bootable image file for grub. > >>>> > >>>> The library strip lines are not needed. > >>>> What about a case which catches *"*compressed-encoding*" and continues > >>>> with > >>>> the next file?* > >>>> > >>>> > >>> I'm with Allan here- we should fix the real problem rather than adding > >>> a "|| true" and calling it a day. > >>> > >>> > >> This was an ugly hack, i know, hence the last few lines of my message. > >> > >>> I wouldn't be against an exclusion of "compressed-encoding=" when > >>> running strip- Allan, what do you think? The easiest way of > >>> implementing this would be to make it the first case and make it a > >>> no-op. > >>> > >> Thats what i had in mind. > >> > >> I'll do a complete rebuild of all packages and grep for unsupported binarys > >> in the logs. > >> There might be some other types where this could bite us. I'll report back > >> after that. $ grep "File format not recognized" makepkg.log /usr/bin/strip:usr/lib/xen/boot/ioemu-stubdom.gz: File format not recognized /usr/bin/strip:usr/lib/xen/boot/pv-grub-x86_32.gz: File format not recognized /usr/bin/strip:usr/lib/xen/boot/pv-grub-x86_64.gz: File format not recognized Looks like it's a xen only problem as no other package deploys compressed contents in searchpath. > > Is it actually strip-able? Could we actually unpack it (based on the > > compressed-encoding), strip it, and repack? > > I had that thought initially and then thought that would be a major > pain. I'm quite happy with detecting compressed files and skipping > them. But if someone goes ahead and implements that, at this stage I see > no reason not to include it. It just won't be me... > > Allan I don't think that it would work for xen as the files are bootable images that could depend on size and or symbols that we might strip out. An updated patch is attached. Marc

1 1

[pacman-dev] [PATCH] Fix a possible bash-4.0 problem in makepkg
by Marc - A. Dahlhaus 28 Apr '09

28 Apr '09

Hello, i've spotted a problem in makepkg's cleanup part if the host is running bash-4.0. As makepkg runs bash with option -e, on bash-4.0 it fails if strip reports an unsupported binary. The following trivial patch fixes the problem. Signed-off-by: "Marc - A. Dahlhaus" <mad(a)wol.de> --- pacman-3.2.2.orig/scripts/makepkg.sh.in +++ pacman-3.2.2/scripts/makepkg.sh.in @@ -766,11 +766,11 @@ tidy_install() { find ${STRIP_DIRS[@]} -type f 2>/dev/null | while read binary ; do case "$(file -biz "$binary")" in *application/x-sharedlib*) # Libraries (.so) - /usr/bin/strip --strip-debug "$binary";; + /usr/bin/strip --strip-debug "$binary" || true;; *application/x-archive*) # Libraries (.a) - /usr/bin/strip --strip-debug "$binary";; + /usr/bin/strip --strip-debug "$binary" || true;; *application/x-executable*) # Binaries - /usr/bin/strip "$binary";; + /usr/bin/strip "$binary" || true;; esac done fi --- pacman-3.2.2.orig/scripts/makepkg.sh.in +++ pacman-3.2.2/scripts/makepkg.sh.in @@ -766,11 +766,11 @@ tidy_install() { find ${STRIP_DIRS[@]} -type f 2>/dev/null | while read binary ; do case "$(file -biz "$binary")" in *application/x-sharedlib*) # Libraries (.so) - /usr/bin/strip --strip-debug "$binary";; + /usr/bin/strip --strip-debug "$binary" || true;; *application/x-archive*) # Libraries (.a) - /usr/bin/strip --strip-debug "$binary";; + /usr/bin/strip --strip-debug "$binary" || true;; *application/x-executable*) # Binaries - /usr/bin/strip "$binary";; + /usr/bin/strip "$binary" || true;; esac done fi

5 9

[pacman-dev] [PATCH] makepkg: make in-place sed portable
by Allan McRae 28 Apr '09

28 Apr '09

Do a sed replacement in-place is not very portable. On Mac OSX and BSDs, the syntax is "sed -i ''" where as with GNU sed the command is "sed -i''" or just "sed -i". This patch detects which command should be used during configure. Credit to Kevin Barry who researched this issue and provided a patch to work around this using temporary backup files. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- configure.ac | 5 +++++ scripts/Makefile.am | 1 + scripts/makepkg.sh.in | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 5dcbe79..a83d5e4 100644 --- a/configure.ac +++ b/configure.ac @@ -180,9 +180,11 @@ GCC_GNU89_INLINE_CC # Host-dependant definitions SIZECMD="stat -c %s" +SEDINPLACE="sed -i" case "${host_os}" in *bsd*) SIZECMD="stat -f %z" + SEDINPLACE="sed -i ''" ;; cygwin*) host_os_cygwin=yes @@ -191,12 +193,14 @@ case "${host_os}" in darwin*) host_os_darwin=yes SIZECMD="/usr/bin/stat -f %z" + SEDINPLACE="sed -i ''" ;; esac AM_CONDITIONAL([CYGWIN], test "x$host_os_cygwin" = "xyes") AM_CONDITIONAL([DARWIN], test "x$host_os_darwin" = "xyes") AC_SUBST(SIZECMD) +AC_SUBST(SEDINPLACE) # Check for architecture, used in default makepkg.conf # (Note single space left after CARCHFLAGS) @@ -356,6 +360,7 @@ ${PACKAGE_NAME}: Architecture flags : ${CARCHFLAGS} Host Type : ${CHOST} Filesize command : ${SIZECMD} + In-place sed command : ${SEDINPLACE} libalpm version : ${LIB_VERSION} libalpm version info : ${LIB_VERSION_INFO} diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 5a2b780..5d65653 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -41,6 +41,7 @@ edit = sed \ -e 's|@DBEXT[@]|$(DBEXT)|g' \ -e 's|@BUILDSCRIPT[@]|$(BUILDSCRIPT)|g' \ -e 's|@SIZECMD[@]|$(SIZECMD)|g' \ + -e 's|@SEDINPLACE[@]|$(SEDINPLACE)|g' \ -e 's|@configure_input[@]|Generated from $@.in; do not edit by hand.|g' ## All the scripts depend on Makefile so that they are rebuilt when the diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c97eff2..ca25fbb 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1171,8 +1171,8 @@ devel_update() { if [ -n "$newpkgver" ]; then if [ "$newpkgver" != "$pkgver" ]; then if [ -f "./$BUILDSCRIPT" ]; then - sed -i "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "./$BUILDSCRIPT" - sed -i "s/^pkgrel=[^ ]*/pkgrel=1/" "./$BUILDSCRIPT" + @SEDINPLACE@ "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "./$BUILDSCRIPT" + @SEDINPLACE@ "s/^pkgrel=[^ ]*/pkgrel=1/" "./$BUILDSCRIPT" source "$BUILDSCRIPT" fi fi -- 1.6.2.4

3 3

[pacman-dev] [PATCH] makepkg: do not update pkgver when building source package
by Allan McRae 27 Apr '09

27 Apr '09

When making a source package for a SCM PKGBUILD, makepkg should not update the pkgver/pkgrel. Noted in FS#14456. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 97acfb4..c97eff2 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1098,14 +1098,13 @@ install_package() { devel_check() { newpkgver="" - # Only update pkgver if --holdver is not set - if [ "$HOLDVER" -eq 1 ]; then - return - fi - # Cannot update pkgver/pkgrel if reading PKGBUILD from pipe - if [ ! -f "./$BUILDSCRIPT" ]; then + + # Do not update pkgver if --holdver is set, when building a source package, + # or when reading PKGBUILD from pipe + if [ "$HOLDVER" -eq 1 -o "$SOURCEONLY" -ne 0 -o ! -f "./$BUILDSCRIPT" ]; then return fi + if [ -z "$FORCE_VER" ]; then # Check if this is a svn/cvs/etc PKGBUILD; set $newpkgver if so. # This will only be used on the first call to makepkg; subsequent -- 1.6.2.4

3 4

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-144-gc279046
by dan＠archlinux.org 26 Apr '09

26 Apr '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 c27904661ef96cb2e7c729ce82b527146529c768 (commit) from 10584ec8eab873ffb4b03dd8e4a4703dabed8955 (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 c27904661ef96cb2e7c729ce82b527146529c768 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Apr 26 20:58:04 2009 +1000 makepkg: make in-place sed portable Do a sed replacement in-place is not very portable. On Mac OSX and BSDs, the syntax is "sed -i ''" where as with GNU sed the command is "sed -i''" or just "sed -i". This patch detects which command should be used during configure. Credit to Kevin Barry who researched this issue and provided a patch to work around this using temporary backup files. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 5 +++++ scripts/Makefile.am | 1 + scripts/makepkg.sh.in | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Stripping files on OSX
by Allan McRae 26 Apr '09

26 Apr '09

Hi all, I am looking for people in the know about how files should be stripped on Mac OSX. In FS#13592, it is suggested that we do some more fine grained tuning of our library stripping. These should work for platforms using GNU strip (Linux/BSD/Cygwin): Binaries: "strip --strip-all" Shared Libraries: "strip --strip-unneeded" Static Libraries: "strip --strip-debug" Can we do something similar on OSX? From [1], it looks like similar options are: Binaries: "strip -u -r" Shared Libraries: "strip -x" Static Libraries: "strip -S Can someone confirm if these options are any good? I could be entirely wrong... [1] http://developer.apple.com/documentation/Darwin/Reference/ManPages/man1/str… Allan

1 0

[pacman-dev] [PATCH] Remove unused error codes and handle PM_ERR_RETRIEVE by alpm_strerror()
by Nagy Gabor 18 Apr '09

18 Apr '09

>From 88c26a6e5902875f07ca7c842971619530fa5aa9 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat, 18 Apr 2009 17:35:08 +0200 Subject: [PATCH] Remove unused error codes and handle PM_ERR_RETRIEVE by alpm_strerror() Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/alpm.h | 9 --------- lib/libalpm/error.c | 17 ++--------------- 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 48b6ba2..57ea880 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -487,31 +487,22 @@ enum _pmerrno_t { PM_ERR_TRANS_NOT_PREPARED, PM_ERR_TRANS_ABORT, PM_ERR_TRANS_TYPE, - PM_ERR_TRANS_COMMITING, - PM_ERR_TRANS_DOWNLOADING, /* Packages */ PM_ERR_PKG_NOT_FOUND, PM_ERR_PKG_IGNORED, PM_ERR_PKG_INVALID, PM_ERR_PKG_OPEN, - PM_ERR_PKG_LOAD, - PM_ERR_PKG_CANT_FRESH, PM_ERR_PKG_CANT_REMOVE, PM_ERR_PKG_INVALID_NAME, PM_ERR_PKG_REPO_NOT_FOUND, /* Deltas */ PM_ERR_DLT_INVALID, PM_ERR_DLT_PATCHFAILED, - /* Groups */ - PM_ERR_GRP_NOT_FOUND, /* Dependencies */ PM_ERR_UNSATISFIED_DEPS, PM_ERR_CONFLICTING_DEPS, PM_ERR_FILE_CONFLICTS, /* Misc */ - PM_ERR_USER_ABORT, - PM_ERR_INTERNAL_ERROR, - PM_ERR_DB_SYNC, PM_ERR_RETRIEVE, PM_ERR_INVALID_REGEX, /* External library errors */ diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index 01dc758..47f0750 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -99,10 +99,6 @@ const char SYMEXPORT *alpm_strerror(int err) return _("transaction aborted"); case PM_ERR_TRANS_TYPE: return _("operation not compatible with the transaction type"); - case PM_ERR_TRANS_COMMITING: - return _("could not commit transaction"); - case PM_ERR_TRANS_DOWNLOADING: - return _("could not download all files"); /* Packages */ case PM_ERR_PKG_NOT_FOUND: return _("could not find or read package"); @@ -112,10 +108,6 @@ const char SYMEXPORT *alpm_strerror(int err) return _("invalid or corrupted package"); case PM_ERR_PKG_OPEN: return _("cannot open package file"); - case PM_ERR_PKG_LOAD: - return _("cannot load package data"); - case PM_ERR_PKG_CANT_FRESH: - return _("package not installed or lesser version"); case PM_ERR_PKG_CANT_REMOVE: return _("cannot remove all files for package"); case PM_ERR_PKG_INVALID_NAME: @@ -127,9 +119,6 @@ const char SYMEXPORT *alpm_strerror(int err) return _("invalid or corrupted delta"); case PM_ERR_DLT_PATCHFAILED: return _("delta patch failed"); - /* Groups */ - case PM_ERR_GRP_NOT_FOUND: - return _("group not found"); /* Dependencies */ case PM_ERR_UNSATISFIED_DEPS: return _("could not satisfy dependencies"); @@ -138,10 +127,8 @@ const char SYMEXPORT *alpm_strerror(int err) case PM_ERR_FILE_CONFLICTS: return _("conflicting files"); /* Miscellaenous */ - case PM_ERR_USER_ABORT: - return _("user aborted the operation"); - case PM_ERR_INTERNAL_ERROR: - return _("internal error"); + case PM_ERR_RETRIEVE: + return _("failed to retrieve some files"); case PM_ERR_INVALID_REGEX: return _("invalid regular expression"); /* Errors from external libraries- our own wrapper error */ -- 1.6.0.3

1 1

[pacman-dev] some more delta stats
by Xavier 18 Apr '09

18 Apr '09

I generated deltas for the last 20 updates on my system. The total delta size is 12M, while the total package size is 73M. So the overall ratio is pretty good imo. Afaik, only one delta on the 20 didn't reach the 0.7 ratio : attr The ghostscript one is unbelievable : 5,7K vs 29M ! Here are the packages, deltas and their size : 56K attr-2.4.41-1_to_2.4.43-1-x86_64.delta 79K attr-2.4.43-1-x86_64.pkg.tar.gz 3,6K crda-0.9.5-2_to_1.0.1-1-x86_64.delta 13K crda-1.0.1-1-x86_64.pkg.tar.gz 254K curl-7.19.3-1_to_7.19.4-1-x86_64.delta 555K curl-7.19.4-1-x86_64.pkg.tar.gz 444K e2fsprogs-1.41.3-2_to_1.41.4-1-x86_64.delta 1,3M e2fsprogs-1.41.4-1-x86_64.pkg.tar.gz 5,7K ghostscript-8.64-2_to_8.64-3-x86_64.delta 29M ghostscript-8.64-3-x86_64.pkg.tar.gz 2,5M git-1.6.1.3-1_to_1.6.2-1-x86_64.delta 6,4M git-1.6.2-1-x86_64.pkg.tar.gz 39K hdparm-9.10-1_to_9.12-1-x86_64.delta 56K hdparm-9.12-1-x86_64.pkg.tar.gz 6,1K iw-0.9.8-1_to_0.9.9-1-x86_64.delta 15K iw-0.9.9-1-x86_64.pkg.tar.gz 369K kbd-1.14.1.20080309-2_to_1.15-1-x86_64.delta 1013K kbd-1.15-1-x86_64.pkg.tar.gz 569 libmad-0.15.1b-3_to_0.15.1b-4-x86_64.delta 132K libmad-0.15.1b-4-x86_64.pkg.tar.gz 89K libsndfile-1.0.18-1_to_1.0.19-1-x86_64.delta 423K libsndfile-1.0.19-1-x86_64.pkg.tar.gz 17K libv4l-0.5.7-1_to_0.5.8-1-x86_64.delta 56K libv4l-0.5.8-1-x86_64.pkg.tar.gz 79K libxi-1.1.4-2-x86_64.pkg.tar.gz 47K libxi-1.2.0-1_to_1.1.4-2-x86_64.delta 4,1K man-db-2.5.4-1_to_2.5.4-2-x86_64.delta 959K man-db-2.5.4-2-x86_64.pkg.tar.gz 1,2M man-pages-3.18-1_to_3.19-1-x86_64.delta 4,4M man-pages-3.19-1-x86_64.pkg.tar.gz 1,5M ncurses-5.7-2.1-x86_64.pkg.tar.gz 263K ncurses-5.7-2_to_5.7-2.1-x86_64.delta 951K nvidia-180.22-1_to_180.29-3-x86_64.delta 2,6M nvidia-180.29-3-x86_64.pkg.tar.gz 6,1M nvidia-utils-180.22-1_to_180.29-3-x86_64.delta 11M nvidia-utils-180.29-3-x86_64.pkg.tar.gz 1,2K pm-utils-1.2.4-1_to_1.2.4-3-x86_64.delta 39K pm-utils-1.2.4-3-x86_64.pkg.tar.gz 5,6K run-parts-2.30-1_to_2.31-1-x86_64.delta 8,9K run-parts-2.31-1-x86_64.pkg.tar.gz

4 7

[pacman-dev] [PATCH] Introduce destarch keyword into makepkg
by Thomas Bächler 17 Apr '09

17 Apr '09

If destarch is added to a PKGBUILD, makepkg sets the architecture of the resulting package to $destarch instead of $CARCH. This is useful if you want to cross-create packages for one architecture on the other. Using arch=('i686') destarch='x86_64' makes it possible to build multilib packages and to build grub without the export CARCH="x86_64" hack. --- scripts/makepkg.sh.in | 32 ++++++++++++++++++-------------- 1 files changed, 18 insertions(+), 14 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index bce2e6c..c45d7e8 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -152,7 +152,7 @@ clean_up() { rm -rf pkg src if [ "$pkgname" != "" ]; then # Can't do this unless the BUILDSCRIPT has been sourced. - rm -f "${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log*" + rm -f "${pkgname}-${pkgver}-${pkgrel}-${destarch}.log*" fi fi @@ -662,7 +662,7 @@ run_build() { local ret=0 if [ "$LOGGING" = "1" ]; then - BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log" + BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${destarch}.log" if [ -f "$BUILDLOG" ]; then local i=1 while true; do @@ -792,8 +792,8 @@ create_package() { echo "builddate = $builddate" >>.PKGINFO echo "packager = $packager" >>.PKGINFO echo "size = $size" >>.PKGINFO - if [ "$CARCH" != "" ]; then - echo "arch = $CARCH" >>.PKGINFO + if [ "$destarch" != "" ]; then + echo "arch = $destarch" >>.PKGINFO fi if [ "$(check_option force)" = "y" ]; then echo "force = true" >> .PKGINFO @@ -851,7 +851,7 @@ create_package() { # tar it up msg2 "$(gettext "Compressing package...")" - local pkg_file="$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" + local pkg_file="$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${destarch}${PKGEXT}" if ! bsdtar -czf "$pkg_file" $comp_files *; then error "$(gettext "Failed to create package file.")" @@ -872,11 +872,11 @@ create_xdelta() { local pkginfo="$(mktemp "$startdir"/xdelta-pkginfo.XXXXXXXXX)" local old_file old_version - for old_file in $(ls {"$cache_dir","$PKGDEST"}/${pkgname}-*-*{,-$CARCH}$PKGEXT 2>/dev/null); do + for old_file in $(ls {"$cache_dir","$PKGDEST"}/${pkgname}-*-*{,-$destarch}$PKGEXT 2>/dev/null); do bsdtar -xOf "$old_file" .PKGINFO > "$pkginfo" || continue if [ "$(cat "$pkginfo" | grep '^pkgname = ')" != "pkgname = $pkgname" ]; then continue # Package name does not match. - elif [ "$(cat "$pkginfo" | grep '^arch = ')" != "arch = $CARCH" ] ; then + elif [ "$(cat "$pkginfo" | grep '^arch = ')" != "arch = $destarch" ] ; then continue # Not same arch. fi @@ -894,7 +894,7 @@ create_xdelta() { if [ "$base_file" != "" ]; then msg "$(gettext "Making delta from version %s...")" "$latest_version" - local delta_file="$PKGDEST/$pkgname-${latest_version}_to_$pkgver-$pkgrel-$CARCH.delta" + local delta_file="$PKGDEST/$pkgname-${latest_version}_to_$pkgver-$pkgrel-$destarch.delta" local ret=0 # xdelta will decompress base_file & pkg_file into TMP_DIR (or /tmp if @@ -984,9 +984,9 @@ install_package() { [ "$INSTALL" = "0" ] && return msg "$(gettext "Installing package ${pkgname} with pacman -U...")" if [ "$ASROOT" = "0" ]; then - sudo pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT} || exit $? + sudo pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${destarch}${PKGEXT} || exit $? else - pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT} || exit $? + pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${destarch}${PKGEXT} || exit $? fi } @@ -1330,6 +1330,10 @@ if [ "$arch" = 'any' ]; then CARCH='any' fi +if [ -z "$destarch" ]; then + destarch="$CARCH" +fi + if ! in_array $CARCH ${arch[@]}; then if [ "$IGNOREARCH" = "0" ]; then error "$(gettext "%s is not available for the '%s' architecture.")" "$pkgname" "$CARCH" @@ -1374,7 +1378,7 @@ unset valid_options opt known kopt devel_check devel_update -if [ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \ +if [ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${destarch}${PKGEXT}" \ -a "$FORCE" = "0" -a "$SOURCEONLY" = "0" -a "$NOBUILD" = "0" ]; then if [ "$INSTALL" = "1" ]; then warning "$(gettext "A package has already been built, installing existing package...")" @@ -1402,7 +1406,7 @@ if [ "$INFAKEROOT" = "1" ]; then exit 0 # $E_OK fi -msg "$(gettext "Making package: %s")" "$pkgname $pkgver-$pkgrel $CARCH ($(date))" +msg "$(gettext "Making package: %s")" "$pkgname $pkgver-$pkgrel $destarch ($(date))" if [ $EUID -eq 0 ]; then warning "$(gettext "Running makepkg as root...")" @@ -1504,10 +1508,10 @@ else fi fi - create_xdelta "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" + create_xdelta "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${destarch}${PKGEXT}" fi -msg "$(gettext "Finished making: %s")" "$pkgname $pkgver-$pkgrel $CARCH ($(date))" +msg "$(gettext "Finished making: %s")" "$pkgname $pkgver-$pkgrel $destarch ($(date))" install_package -- 1.5.6

8 30

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-143-g10584ec
by dan＠archlinux.org 16 Apr '09

16 Apr '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 10584ec8eab873ffb4b03dd8e4a4703dabed8955 (commit) from db3e166503386b4f9e456017fd56d8bce84528fe (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 10584ec8eab873ffb4b03dd8e4a4703dabed8955 Author: Loui Chang <louipc.ist(a)gmail.com> Date: Thu Oct 2 19:47:19 2008 -0400 Mention required libraries in INSTALL. Signed-off-by: Loui Chang <louipc.ist(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: INSTALL | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0