- Pacman-dev - lists.archlinux.org

[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

[pacman-dev] [PATCH] Fix extra commas at end of enumerator list in alpm.h
by Gerardo Exequiel Pozzi 12 May '09

12 May '09

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- lib/libalpm/alpm.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 48b6ba2..b34563e 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -357,7 +357,7 @@ typedef enum _pmtransevt_t { /** Files will be downloaded from a repository. * The repository's tree name is passed to the callback. */ - PM_TRANS_EVT_RETRIEVE_START, + PM_TRANS_EVT_RETRIEVE_START } pmtransevt_t; /*@}*/ @@ -368,7 +368,7 @@ typedef enum _pmtransconv_t { PM_TRANS_CONV_CONFLICT_PKG = 0x04, PM_TRANS_CONV_CORRUPTED_PKG = 0x08, PM_TRANS_CONV_LOCAL_NEWER = 0x10, - PM_TRANS_CONV_REMOVE_PKGS = 0x20, + PM_TRANS_CONV_REMOVE_PKGS = 0x20 } pmtransconv_t; /* Transaction Progress */ -- 1.6.2.4

2 2

[pacman-dev] [PATCH] Fix non-C style comments in libalpm
by Gerardo Exequiel Pozzi 12 May '09

12 May '09

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- lib/libalpm/be_files.c | 4 ++-- lib/libalpm/be_package.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index 8ac253a..9bb7b3d 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -489,7 +489,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) char first = tolower(line[0]); if(first > 'a' && first < 'z') { - struct tm tmp_tm = {0}; //initialize to null incase of failure + struct tm tmp_tm = {0}; /* initialize to null in case of failure */ setlocale(LC_TIME, "C"); strptime(line, "%a %b %e %H:%M:%S %Y", &tmp_tm); info->builddate = mktime(&tmp_tm); @@ -505,7 +505,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) char first = tolower(line[0]); if(first > 'a' && first < 'z') { - struct tm tmp_tm = {0}; //initialize to null incase of failure + struct tm tmp_tm = {0}; /* initialize to null in case of failure */ setlocale(LC_TIME, "C"); strptime(line, "%a %b %e %H:%M:%S %Y", &tmp_tm); info->installdate = mktime(&tmp_tm); diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index c0ec3bc..bcb742c 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -83,7 +83,7 @@ static int parse_descfile(struct archive *a, pmpkg_t *newpkg) } else if(!strcmp(key, "builddate")) { char first = tolower(ptr[0]); if(first > 'a' && first < 'z') { - struct tm tmp_tm = {0}; //initialize to null in case of failure + struct tm tmp_tm = {0}; /* initialize to null in case of failure */ setlocale(LC_TIME, "C"); strptime(ptr, "%a %b %e %H:%M:%S %Y", &tmp_tm); newpkg->builddate = mktime(&tmp_tm); -- 1.6.2.4

2 1

[pacman-dev] [PATCH] New feature: files verification
by changaco 04 May '09

04 May '09

>From 7c0348fa499f55968764fef4c7bb3d3d7245932b Mon Sep 17 00:00:00 2001 From: Charly COSTE <changaco(a)laposte.net> Date: Sat, 28 Mar 2009 12:36:23 +0100 Subject: [PATCH] New feature: files verification A new option "-Qy" which checks if the files owned by a/some/all package(s) really are on the system (i.e. not accidentally deleted). http://bugs.archlinux.org/task/13877 Signed-off-by: Charly COSTE <changaco(a)laposte.net> --- src/pacman/conf.h | 1 + src/pacman/pacman.c | 6 +++- src/pacman/query.c | 87 +++++++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 84 insertions(+), 10 deletions(-) diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 466d983..01a1828 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -50,6 +50,7 @@ typedef struct __config_t { unsigned short op_q_search; unsigned short op_q_changelog; unsigned short op_q_upgrade; + unsigned short op_q_verify; unsigned short op_s_clean; unsigned short op_s_downloadonly; diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 59916d6..e1d13a4 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -360,6 +360,7 @@ static int parseargs(int argc, char *argv[]) {"verbose", no_argument, 0, 'v'}, {"downloadonly", no_argument, 0, 'w'}, {"refresh", no_argument, 0, 'y'}, + {"verify", no_argument, 0, 'y'}, {"noconfirm", no_argument, 0, 1000}, {"config", required_argument, 0, 1001}, {"ignore", required_argument, 0, 1002}, @@ -510,7 +511,10 @@ static int parseargs(int argc, char *argv[]) config->flags |= PM_TRANS_FLAG_DOWNLOADONLY; config->flags |= PM_TRANS_FLAG_NOCONFLICTS; break; - case 'y': (config->op_s_sync)++; break; + case 'y': + (config->op_s_sync)++; + config->op_q_verify = 1; + break; case '?': return(1); default: return(1); } diff --git a/src/pacman/query.c b/src/pacman/query.c index 0d48638..2a7dba5 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -334,10 +334,70 @@ static void display(pmpkg_t *pkg) } } +// We loop through the packages and for each packages we loop through files to check if they exist +static void verify(alpm_list_t *pkgs) +{ + alpm_list_t *i, *files, *file, *pkgs2repair; + pmpkg_t *pkg; + struct stat stFileInfo; + int pkgs_n = alpm_list_count(pkgs); + int j = 0, k = 0; + for(i = pkgs; i; i = alpm_list_next(i)) { + j++; + pkg = alpm_list_getdata(i); + char *pkgname = alpm_pkg_get_name(pkg); + if(filter(pkg)) { + files = alpm_pkg_get_files(pkg); + for(file = files; file; file = alpm_list_next(file)){ + char *x = alpm_list_getdata(file); + char *f = malloc (strlen(x)+2); + strcpy(f,"/"); + strcat(f, x); + k++; + if(strncmp(f, "/tmp", 4)==0){ + continue; // ignore files in /tmp + } + if(lstat(f,&stFileInfo) == 0) { // we use lstat to prevent errors from symbolic links + if(!config->quiet){ + fprintf(stderr, "\rfile n°%i (package %i/%i): OK", k, j, pkgs_n); fflush(stdout); + } + } + else { + if(config->quiet){ + fprintf(stderr, "%s %s\n", pkgname, f); fflush(stdout); + } else { + fprintf(stderr, "\rfile n°%i (package %i/%i): Missing file owned by \"%s\": %s\n", k, j, pkgs_n, pkgname, f); fflush(stdout); + } + if(alpm_list_find_ptr(pkgs2repair, pkgname) == NULL) { + pkgs2repair = alpm_list_add(pkgs2repair, pkgname); + } + } + } + } + } + if(!config->quiet){ + fprintf(stderr, "\n"); + } + if(alpm_list_count(pkgs2repair) > 0) { + if(!config->quiet){ + fprintf(stderr, "Damaged packages: "); + } + for(i = pkgs2repair; i; i = alpm_list_next(i)) { + fprintf(stdout, "%s ", alpm_list_getdata(i)); + } + } else { + if(!config->quiet){ + fprintf(stderr, "No damaged packages."); + } + } + fprintf(stdout, "\n"); + fflush(stdout); +} + int pacman_query(alpm_list_t *targets) { int ret = 0; - alpm_list_t *i; + alpm_list_t *i, *pkgs; /* First: operations that do not require targets */ @@ -363,18 +423,20 @@ int pacman_query(alpm_list_t *targets) } /* operations on all packages in the local DB - * valid: no-op (plain -Q), list, info + * valid: no-op (plain -Q), list, info, verify * invalid: isfile, owns */ if(targets == NULL) { if(config->op_q_isfile || config->op_q_owns) { pm_printf(PM_LOG_ERROR, _("no targets specified (use -h for help)\n")); return(1); - } - - for(i = alpm_db_get_pkgcache(db_local); i; i = alpm_list_next(i)) { - pmpkg_t *pkg = alpm_list_getdata(i); - if(filter(pkg)) { - display(pkg); + } else if(config->op_q_verify) { + verify(alpm_db_get_pkgcache(db_local)); + } else { + for(i = alpm_db_get_pkgcache(db_local); i; i = alpm_list_next(i)) { + pmpkg_t *pkg = alpm_list_getdata(i); + if(filter(pkg)) { + display(pkg); + } } } return(0); @@ -389,7 +451,7 @@ int pacman_query(alpm_list_t *targets) } /* operations on named packages in the local DB - * valid: no-op (plain -Q), list, info */ + * valid: no-op (plain -Q), list, info, verify */ for(i = targets; i; i = alpm_list_next(i)) { char *strname = alpm_list_getdata(i); pmpkg_t *pkg = NULL; @@ -406,8 +468,12 @@ int pacman_query(alpm_list_t *targets) continue; } + if(filter(pkg)) { display(pkg); + if(config->op_q_verify){ + pkgs = alpm_list_add(pkgs, pkg); + } } if(config->op_q_isfile) { @@ -415,6 +481,9 @@ int pacman_query(alpm_list_t *targets) pkg = NULL; } } + if(config->op_q_verify){ + verify(pkgs); + } return(ret); } -- 1.6.2.1 Créez votre adresse électronique prenom.nom(a)laposte.net 1 Go d'espace de stockage, anti-spam et anti-virus intégrés.

7 21

[pacman-dev] [PATCH] makepkg: several small fixes
by Allan McRae 03 May '09

03 May '09

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> --- configure.ac | 2 +- etc/makepkg.conf.in | 2 +- scripts/makepkg.sh.in | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index a83d5e4..9141158 100644 --- a/configure.ac +++ b/configure.ac @@ -193,7 +193,7 @@ case "${host_os}" in darwin*) host_os_darwin=yes SIZECMD="/usr/bin/stat -f %z" - SEDINPLACE="sed -i ''" + SEDINPLACE="/usr/bin/sed -i ''" ;; esac diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 76b9eca..1368ff1 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -75,7 +75,7 @@ INTEGRITY_CHECK=(md5) #-- Manual (man and info) directories to compress (if zipman is specified) MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info}) #-- Doc directories to remove (if !docs is specified) -DOC_DIRS=(usr/{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc}) +DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc}) #-- Directories to be searched for the strip option (if strip is specified) STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin}) #-- Files to be removed from all packages (if purge is specified) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ca25fbb..ebc19bc 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -846,6 +846,8 @@ tidy_install() { local binary find ${STRIP_DIRS[@]} -type f 2>/dev/null | while read binary ; do case "$(file -biz "$binary")" in + *compressed-encoding*) # Skip compressed binarys + ;; *application/x-sharedlib*) # Libraries (.so) /usr/bin/strip -S "$binary";; *application/x-archive*) # Libraries (.a) @@ -952,7 +954,7 @@ create_package() { # warn if license array is not present or empty if [ -z "$license" ]; then warning "$(gettext "Please add a license line to your %s!")" "$BUILDSCRIPT" - plain "$(gettext "Example for GPL'ed software: license=('GPL').")" + plain "$(gettext "Example for GPL\'ed software: license=('GPL').")" fi local comp_files=".PKGINFO" -- 1.6.2.4

1 0

[pacman-dev] Bad error message on invalid pacman -S operation
by Dan McGee 02 May '09

02 May '09

I did "pacman -S" today instead of "pacman -U", and I noticed the error message is not all that great, and I think this is a regression: dmcgee@galway ~/projects/arch-repos/valgrind/trunk $ pacS /home/makepkg/packages/valgrind-3.4.1-1-x86_64.pkg.tar.gz Password: error: repository '' not found error: '/home/makepkg/packages/valgrind-3.4.1-1-x86_64.pkg.tar.gz': no such repository

3 5

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