- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] contrib/updpkgsums: Fix error message
by Allan McRae 15 Jul '12

15 Jul '12

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- contrib/updpkgsums.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/updpkgsums.sh.in b/contrib/updpkgsums.sh.in index 38c8281..33e04d9 100755 --- a/contrib/updpkgsums.sh.in +++ b/contrib/updpkgsums.sh.in @@ -43,7 +43,7 @@ esac buildfile=${1:-PKGBUILD} if [[ ! -f $buildfile ]]; then - printf '==> ERROR: %s not found or is not a file: %s\n' "$buildfile" + printf '==> ERROR: %s not found or is not a file\n' "$buildfile" exit 1 fi -- 1.7.11.2

1 0

[pacman-dev] [PATCH] makepkg: do not download VCS sources unless needed
by Allan McRae 15 Jul '12

15 Jul '12

VCS sources are not needed for --geninteg or --source operations. This also prevents VCS downloads outputting to stdout, which prevented piping -g output to the PKGBUILD. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 93587b3..8ab621a 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -511,6 +511,11 @@ download_svn() { download_sources() { msg "$(gettext "Retrieving Sources...")" + local GET_VCS=1 + if [[ $1 == "fast" ]]; then + GET_VCS=0 + fi + pushd "$SRCDEST" &>/dev/null local netfile @@ -525,10 +530,10 @@ download_sources() { download_file "$netfile" ;; git*) - download_git "$netfile" + (( GET_VCS )) && download_git "$netfile" ;; svn*) - download_svn "$netfile" + (( GET_VCS )) && download_svn "$netfile" ;; *) error "$(gettext "Unknown download protocol: %s")" "$proto" @@ -2377,7 +2382,7 @@ if (( GENINTEG )); then mkdir -p "$srcdir" chmod a-s "$srcdir" cd_safe "$srcdir" - download_sources + download_sources fast generate_checksums exit 0 # $E_OK fi @@ -2519,10 +2524,11 @@ if (( SOURCEONLY )); then mkdir -p "$srcdir" chmod a-s "$srcdir" cd_safe "$srcdir" - if ( (( ! SKIPCHECKSUMS )) || \ - ( (( ! SKIPPGPCHECK )) && source_has_signatures ) ) || \ - (( SOURCEONLY == 2 )); then + if (( SOURCEONLY == 2 )); then download_sources + elif ( (( ! SKIPCHECKSUMS )) || \ + ( (( ! SKIPPGPCHECK )) && source_has_signatures ) ); then + download_sources fast fi check_source_integrity cd_safe "$startdir" -- 1.7.11.2

1 0

[pacman-dev] [PATCH] query_fileowner: break/continue pkgfile loop
by Andrew Gregory 15 Jul '12

15 Jul '12

Break out of pkgfile loop on match or continue if the pkgfile path is too long. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/query.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/pacman/query.c b/src/pacman/query.c index 9b1ea6f..a14b3e3 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -212,12 +212,14 @@ static int query_fileowner(alpm_list_t *targets) if(strcmp(pkgfile, bname) == 0) { print_query_fileowner(filename, info); found = 1; + break; } continue; } if(rootlen + 1 + strlen(pkgfile) > PATH_MAX) { pm_printf(ALPM_LOG_ERROR, _("path too long: %s%s\n"), root, pkgfile); + continue; } /* concatenate our file and the root path */ strcpy(path + rootlen, pkgfile); @@ -229,6 +231,8 @@ static int query_fileowner(alpm_list_t *targets) if(ppath && strcmp(ppath, rpath) == 0) { print_query_fileowner(filename, info); found = 1; + free(ppath); + break; } free(ppath); } -- 1.7.11.1

2 3

[pacman-dev] [PATCH] Add the --no-ldconfig flag
by Alex Chamberlain 15 Jul '12

15 Jul '12

Hi all, This is my first time submitting a patch to any open source project, so I hope I've done it it right. Apologies in advance for anything I have done wrong! Below is a small patch adding an additional command-line flag to pacman, which prevents ld-config from being run by libalpm. I was having problems installing packages to a loop-mounted ARM image and I think preventing ldconfig from running is the best solution. Kind Regards, Alex Chamberlain Add the --no-ldconfig flag to the command line to prevent ldconfig from being run. It is useful for installing packages onto a loop- mounted image. Signed-off-by: Alex Chamberlain <alex(a)alexchamberlain.co.uk> --- lib/libalpm/alpm.h | 3 +++ lib/libalpm/handle.c | 14 ++++++++++++++ lib/libalpm/handle.h | 1 + lib/libalpm/util.c | 23 ++++++++++++----------- src/pacman/conf.c | 4 ++++ src/pacman/conf.h | 5 ++++- src/pacman/pacman.c | 5 +++++ 7 files changed, 43 insertions(+), 12 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index bb792cf..a8fdd11 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -547,6 +547,9 @@ int alpm_option_set_deltaratio(alpm_handle_t *handle, double ratio); int alpm_option_get_checkspace(alpm_handle_t *handle); int alpm_option_set_checkspace(alpm_handle_t *handle, int checkspace); +int alpm_option_get_ldconfig(alpm_handle_t *handle); +int alpm_option_set_ldconfig(alpm_handle_t *handle, int ldconfig); + alpm_siglevel_t alpm_option_get_default_siglevel(alpm_handle_t *handle); int alpm_option_set_default_siglevel(alpm_handle_t *handle, alpm_siglevel_t level); diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 816162b..e126421 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -44,6 +44,7 @@ alpm_handle_t *_alpm_handle_new(void) CALLOC(handle, 1, sizeof(alpm_handle_t), return NULL); handle->deltaratio = 0.0; + handle->ldconfig = 1; return handle; } @@ -265,6 +266,12 @@ int SYMEXPORT alpm_option_get_checkspace(alpm_handle_t *handle) return handle->checkspace; } +int SYMEXPORT alpm_option_get_ldconfig(alpm_handle_t *handle) +{ + CHECK_HANDLE(handle, return -1); + return handle->ldconfig; +} + int SYMEXPORT alpm_option_set_logcb(alpm_handle_t *handle, alpm_cb_log cb) { CHECK_HANDLE(handle, return -1); @@ -600,6 +607,13 @@ int SYMEXPORT alpm_option_set_checkspace(alpm_handle_t *handle, int checkspace) return 0; } +int SYMEXPORT alpm_option_set_ldconfig(alpm_handle_t *handle, int ldconfig) +{ + CHECK_HANDLE(handle, return -1); + handle->ldconfig = ldconfig; + return 0; +} + int SYMEXPORT alpm_option_set_default_siglevel(alpm_handle_t *handle, alpm_siglevel_t level) { diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index c0ad668..cccdf12 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -91,6 +91,7 @@ struct __alpm_handle_t { double deltaratio; /* Download deltas if possible; a ratio value */ int usesyslog; /* Use syslog instead of logfile? */ /* TODO move to frontend */ int checkspace; /* Check disk space before installing */ + int ldconfig; /* Should we run ldconfig? Default: 1 */ alpm_siglevel_t siglevel; /* Default signature verification level */ /* error code */ diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index c2b5d44..3b1ee6e 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -616,17 +616,18 @@ cleanup: int _alpm_ldconfig(alpm_handle_t *handle) { char line[PATH_MAX]; - - _alpm_log(handle, ALPM_LOG_DEBUG, "running ldconfig\n"); - - snprintf(line, PATH_MAX, "%setc/ld.so.conf", handle->root); - if(access(line, F_OK) == 0) { - snprintf(line, PATH_MAX, "%ssbin/ldconfig", handle->root); - if(access(line, X_OK) == 0) { - char arg0[32]; - char *argv[] = { arg0, NULL }; - strcpy(arg0, "ldconfig"); - return _alpm_run_chroot(handle, "/sbin/ldconfig", argv); + if(handle->ldconfig) { + _alpm_log(handle, ALPM_LOG_DEBUG, "running ldconfig\n"); + + snprintf(line, PATH_MAX, "%setc/ld.so.conf", handle->root); + if(access(line, F_OK) == 0) { + snprintf(line, PATH_MAX, "%ssbin/ldconfig", handle->root); + if(access(line, X_OK) == 0) { + char arg0[32]; + char *argv[] = { arg0, NULL }; + strcpy(arg0, "ldconfig"); + return _alpm_run_chroot(handle, "/sbin/ldconfig", argv); + } } } diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 4aaacb5..094c141 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -58,6 +58,8 @@ config_t *config_new(void) ALPM_SIG_DATABASE | ALPM_SIG_DATABASE_OPTIONAL; } + newconfig->ldconfig = 1; + return newconfig; } @@ -622,6 +624,8 @@ static int setup_libalpm(void) alpm_option_set_noupgrades(handle, config->noupgrade); alpm_option_set_noextracts(handle, config->noextract); + alpm_option_set_ldconfig(handle, config->ldconfig); + return 0; } diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 69c955e..389cfa3 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -95,6 +95,8 @@ typedef struct __config_t { alpm_list_t *explicit_adds; alpm_list_t *explicit_removes; + + int ldconfig; /* Should ldconfig be called? Default: 1 */ } config_t; /* Operations */ @@ -127,7 +129,8 @@ enum { OP_PRINTFORMAT, OP_GPGDIR, OP_DBONLY, - OP_FORCE + OP_FORCE, + OP_NO_LDCONFIG }; /* clean method */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 73d5be9..23af6bc 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -201,6 +201,7 @@ static void usage(int op, const char * const myname) addlist(_(" --gpgdir <path> set an alternate home directory for GnuPG\n")); addlist(_(" --logfile <path> set an alternate log file\n")); addlist(_(" --noconfirm do not ask for any confirmation\n")); + addlist(_(" --no-ldconfig do not run ldconfig\n")); } list = alpm_list_msort(list, alpm_list_count(list), options_cmp); for(i = list; i; i = alpm_list_next(i)) { @@ -436,6 +437,9 @@ static int parsearg_global(int opt) break; case 'r': check_optarg(); config->rootdir = strdup(optarg); break; case 'v': (config->verbose)++; break; + case OP_NO_LDCONFIG: + config->ldconfig = 0; + break; default: return 1; } return 0; @@ -628,6 +632,7 @@ static int parseargs(int argc, char *argv[]) {"print-format", required_argument, 0, OP_PRINTFORMAT}, {"gpgdir", required_argument, 0, OP_GPGDIR}, {"dbonly", no_argument, 0, OP_DBONLY}, + {"no-ldconfig", no_argument, 0, OP_NO_LDCONFIG}, {0, 0, 0, 0} }; -- 1.7.11.1

3 2

[pacman-dev] [PATCH 1/2] pactree: consolidate both walk_deps functions
by Andrew Gregory 15 Jul '12

15 Jul '12

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/util/pactree.c | 89 +++++++++++++++++------------------------------------- 1 file changed, 28 insertions(+), 61 deletions(-) diff --git a/src/util/pactree.c b/src/util/pactree.c index aa02c80..6c91a0a 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -359,85 +359,56 @@ static void print_end(void) } } -static alpm_pkg_t *get_pkg_from_dbs(alpm_list_t *dbs, const char *needle) { - alpm_list_t *i; - alpm_pkg_t *ret; - - for(i = dbs; i; i = alpm_list_next(i)) { - ret = alpm_db_get_pkg(i->data, needle); - if(ret) { - return ret; - } +static alpm_list_t *get_pkg_dep_names(alpm_pkg_t *pkg) +{ + alpm_list_t *i, *names = NULL; + for(i = alpm_pkg_get_depends(pkg); i; i = alpm_list_next(i)) { + alpm_depend_t *d = i->data; + names = alpm_list_add(names, d->name); } - return NULL; + return names; } /** - * walk dependencies in reverse, showing packages which require the target + * walk dependencies, showing dependencies of the target */ -static void walk_reverse_deps(alpm_list_t *dblist, alpm_pkg_t *pkg, int depth) +static void walk_deps(alpm_list_t *dblist, alpm_pkg_t *pkg, int depth, int reverse) { - alpm_list_t *required_by, *i; + alpm_list_t *deps, *i; if(!pkg || ((max_depth >= 0) && (depth == max_depth + 1))) { return; } walked = alpm_list_add(walked, (void *)alpm_pkg_get_name(pkg)); - required_by = alpm_pkg_compute_requiredby(pkg); - for(i = required_by; i; i = alpm_list_next(i)) { + if(reverse) { + deps = alpm_pkg_compute_requiredby(pkg); + } else { + deps = get_pkg_dep_names(pkg); + } + + for(i = deps; i; i = alpm_list_next(i)) { const char *pkgname = i->data; - if(alpm_list_find_str(walked, pkgname)) { + alpm_pkg_t *dep_pkg = alpm_find_dbs_satisfier(handle, dblist, pkgname); + + if(alpm_list_find_str(walked, dep_pkg ? alpm_pkg_get_name(dep_pkg) : pkgname)) { /* if we've already seen this package, don't print in "unique" output * and don't recurse */ if(!unique) { - print(alpm_pkg_get_name(pkg), pkgname, NULL, depth); + print(alpm_pkg_get_name(pkg), alpm_pkg_get_name(dep_pkg), pkgname, depth); } } else { - print(alpm_pkg_get_name(pkg), pkgname, NULL, depth); - walk_reverse_deps(dblist, get_pkg_from_dbs(dblist, pkgname), depth + 1); + print(alpm_pkg_get_name(pkg), alpm_pkg_get_name(dep_pkg), pkgname, depth); + if(dep_pkg) { + walk_deps(dblist, dep_pkg, depth + 1, reverse); + } } } - FREELIST(required_by); -} - -/** - * walk dependencies, showing dependencies of the target - */ -static void walk_deps(alpm_list_t *dblist, alpm_pkg_t *pkg, int depth) -{ - alpm_list_t *i; - - if((max_depth >= 0) && (depth == max_depth + 1)) { - return; - } - - walked = alpm_list_add(walked, (void *)alpm_pkg_get_name(pkg)); - - for(i = alpm_pkg_get_depends(pkg); i; i = alpm_list_next(i)) { - alpm_depend_t *depend = i->data; - alpm_pkg_t *provider = alpm_find_dbs_satisfier(handle, dblist, depend->name); - - if(provider) { - const char *provname = alpm_pkg_get_name(provider); - - if(alpm_list_find_str(walked, provname)) { - /* if we've already seen this package, don't print in "unique" output - * and don't recurse */ - if(!unique) { - print(alpm_pkg_get_name(pkg), provname, depend->name, depth); - } - } else { - print(alpm_pkg_get_name(pkg), provname, depend->name, depth); - walk_deps(dblist, provider, depth + 1); - } - } else { - /* unresolvable package */ - print(alpm_pkg_get_name(pkg), NULL, depend->name, depth); - } + if(reverse) { + FREELIST(deps); } } @@ -486,11 +457,7 @@ int main(int argc, char *argv[]) print_start(alpm_pkg_get_name(pkg), target_name); - if(reverse) { - walk_reverse_deps(dblist, pkg, 1); - } else { - walk_deps(dblist, pkg, 1); - } + walk_deps(dblist, pkg, 1, reverse); print_end(); -- 1.7.11.1

2 3

[pacman-dev] [PATCH] makepkg: renamve myver
by Allan McRae 15 Jul '12

15 Jul '12

myver is a bit generic for an internal variable name. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 9baf350..93587b3 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -39,7 +39,7 @@ export COMMAND_MODE='legacy' # Ensure CDPATH doesn't screw with our cd calls unset CDPATH -declare -r myver='@PACKAGE_VERSION@' +declare -r makepkg_version='@PACKAGE_VERSION@' declare -r confdir='@sysconfdir@' declare -r BUILDSCRIPT='@BUILDSCRIPT@' declare -r startdir="$PWD" @@ -1498,7 +1498,7 @@ write_pkginfo() { size="$(( ${size%%[^0-9]*} * 1024 ))" msg2 "$(gettext "Generating %s file...")" ".PKGINFO" - echo "# Generated by makepkg $myver" + echo "# Generated by makepkg $makepkg_version" if (( INFAKEROOT )); then echo "# using $(fakeroot -v)" fi @@ -2076,7 +2076,7 @@ canonicalize_path() { m4_include(library/parseopts.sh) usage() { - printf "makepkg (pacman) %s\n" "$myver" + printf "makepkg (pacman) %s\n" "$makepkg_version" echo printf -- "$(gettext "Usage: %s [options]")\n" "$0" echo @@ -2121,7 +2121,7 @@ usage() { } version() { - printf "makepkg (pacman) %s\n" "$myver" + printf "makepkg (pacman) %s\n" "$makepkg_version" printf -- "$(gettext "\ Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org>.\n\ Copyright (C) 2002-2006 Judd Vinet <jvinet(a)zeroflux.org>.\n\n\ -- 1.7.11.2

1 0

[pacman-dev] [PATCH] doc: remove duplicate pactree.8 entry in Makefile.am
by Allan McRae 15 Jul '12

15 Jul '12

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 9044960..300e4a0 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -159,7 +159,6 @@ PKGBUILD.5 PKGBUILD.5.html: PKGBUILD.5.txt PKGBUILD-example.txt makepkg.conf.5 makepkg.conf.5.html: makepkg.conf.5.txt pacman.conf.5 pacman.conf.5.html: pacman.conf.5.txt libalpm.3 libalpm.3.html: libalpm.3.txt -pactree.8 pactree.8.html: pactree.8.txt # this one is just a symlink repo-remove.8: repo-add.8 $(RM) repo-remove.8 -- 1.7.11.1

1 1

[pacman-dev] [PATCH 1/2] lib/conflict: use a binary search within filelists
by Dave Reisner 12 Jul '12

12 Jul '12

Take advantage of the fact that our filelists are arrays sorted by filename with a known length and use a binary search. This should speed up file conflict checking, particularly when larger packages are involved. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- lib/libalpm/conflict.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 7494fd7..fd4eff1 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -315,19 +315,16 @@ void _alpm_fileconflict_free(alpm_fileconflict_t *conflict) const alpm_file_t *_alpm_filelist_contains(alpm_filelist_t *filelist, const char *name) { - size_t i; - const alpm_file_t *file; + alpm_file_t key; if(!filelist) { return NULL; } - for(file = filelist->files, i = 0; i < filelist->count; file++, i++) { - if(strcmp(file->name, name) == 0) { - return file; - } - } - return NULL; + key.name = (char *)name; + + return bsearch(&key, filelist->files, filelist->count, + sizeof(alpm_file_t), _alpm_files_cmp); } static int dir_belongsto_pkg(alpm_handle_t *handle, const char *dirpath, -- 1.7.11.1

2 2

[pacman-dev] [PATCH 00/11] Support VCS URLs.
by Allan McRae 12 Jul '12

12 Jul '12

At the request of Dave, here are the updated versions of patches sent to the list earlier. Support for the following needs readded: CVS, Mercurial, Darcs and Bazaar Known issue: the pkgver check needs adjusted when using an auto-updating pkgver Allan McRae (11): makepkg: remove VCS package support makepkg: reorder source handling functions makepkg: add function to return download protocol makepkg: generalize download_sources makepkg: skip integrity checking early makepkg: allow using GIT source URLs makepkg: fix checksum generation with VCS sources makepkg: modify get_filename to handle VCS sources makepkg: modify get_filepath to handle VCS sources makepkg: provide mechanism for auto-updating pkgver makepkg: add support for SVN urls doc/PKGBUILD.5.txt | 64 ----- doc/makepkg.8.txt | 10 - scripts/makepkg.sh.in | 682 +++++++++++++++++++++++++++++--------------------- 3 files changed, 394 insertions(+), 362 deletions(-) -- 1.7.11.1

4 22

[pacman-dev] [PATCH] asdeps flag passed from makepkg to pacman
by Daniel Wallace 11 Jul '12

11 Jul '12

From: Daniel Wallace <daniel.wallace12(a)gmail.com> add the asdeps flag for makepkg so that it does pacman -U --asdeps Signed-off-by: Daniel Wallace <daniel.wallace12(a)gmail.com> --- contrib/bash_completion.in | 6 +++--- contrib/zsh_completion.in | 1 + doc/makepkg.8.txt | 4 ++++ scripts/makepkg.sh.in | 10 ++++++++-- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/contrib/bash_completion.in b/contrib/bash_completion.in index 1b265e0..99b9559 100644 --- a/contrib/bash_completion.in +++ b/contrib/bash_completion.in @@ -74,9 +74,9 @@ _makepkg() { COMPREPLY=() _get_comp_words_by_ref cur prev if [[ $cur = -* && ! $prev =~ ^-(-(config|help)$|\w*[Chp]) ]]; then - opts=('allsource asroot check clean config force geninteg help holdver ignorearch - install log nobuild nocheck nocolor noconfirm nodeps noextract noprogressbar - nosign pkg repackage rmdeps sign skipinteg source syncdeps' + opts=('allsource asdeps asroot check clean config force geninteg help holdver ignorearch + install log nobuild nocheck nocolor noconfirm nodeps noextract + noprogressbar nosign pkg repackage rmdeps sign skipinteg source syncdeps' 'A L R S c d e f g h i m o p r s') _arch_ptr2comp opts fi diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index dc0a544..84ee93c 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -483,6 +483,7 @@ _makepkg_longopts=( '--skipinteg[do not perform any verification checks on source files]' '--skippgpcheck[Do not verify source files with PGP signatures]' '--noconfirm[do not ask for confirmation when resolving dependencies]' + '--asdeps[Install packages as non-explicitly installed]' '--noprogressbar[Do not show a progress bar when downloading files]' ) _makepkg(){ diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 27875a3..b96d768 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -179,6 +179,10 @@ Options (Passed to pacman) Prevent pacman from waiting for user input before proceeding with operations. +*\--asdeps*:: + (Passed to pacman) Install packages as non-explicitly installed (used + with -i / --install). + *\--noprogressbar*:: (Passed to pacman) Prevent pacman from displaying a progress bar; useful if you are redirecting makepkg output to file. diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index abfabdf..db95d65 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -52,6 +52,7 @@ splitpkg_overrides=('pkgver' 'pkgrel' 'epoch' 'pkgdesc' 'arch' 'url' 'license' \ readonly -a packaging_options other_options splitpkg_overrides # Options +ASDEPS=0 ASROOT=0 CLEANUP=0 DEP_BIN=0 @@ -83,6 +84,7 @@ FORCE_VER="" PACMAN_OPTS= + shopt -s extglob ### SUBROUTINES ### @@ -1523,13 +1525,15 @@ install_package() { msg "$(gettext "Installing %s package group with %s...")" "$pkgbase" "$PACMAN -U" fi + (( ASDEPS )) && pkglist+=('--asdeps') + local fullver pkgarch pkg pkglist for pkg in ${pkgname[@]}; do fullver=$(get_full_version $pkg) pkgarch=$(get_pkg_arch $pkg) pkglist+=("$PKGDEST/${pkg}-${fullver}-${pkgarch}${PKGEXT}") done - + if ! run_pacman -U ${pkglist[@]}; then warning "$(gettext "Failed to install built package(s).")" return 0 @@ -1986,6 +1990,7 @@ usage() { printf -- "$(gettext "These options can be passed to %s:")\n" "pacman" echo printf -- "$(gettext " --noconfirm Do not ask for confirmation when resolving dependencies")\n" + printf -- "$(gettext " --asdeps Install packages as non-explicitly installed")\n" printf -- "$(gettext " --noprogressbar Do not show a progress bar when downloading files")\n" echo printf -- "$(gettext "If %s is not specified, %s will look for '%s'")\n" "-p" "makepkg" "$BUILDSCRIPT" @@ -2021,7 +2026,7 @@ OPT_LONG=('allsource' 'asroot' 'ignorearch' 'check' 'clean' 'nodeps' 'version' 'config:') # Pacman Options -OPT_LONG+=('noconfirm' 'noprogressbar') +OPT_LONG+=('asdeps' 'noconfirm' 'noprogressbar') if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then exit 1 # E_INVALID_OPTION; @@ -2032,6 +2037,7 @@ unset OPT_SHORT OPT_LONG OPTRET while true; do case "$1" in # Pacman Options + --asdeps) ASDEPS=1;; --noconfirm) PACMAN_OPTS+=" --noconfirm" ;; --noprogressbar) PACMAN_OPTS+=" --noprogressbar" ;; -- 1.7.11.1

2 1