- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] sync_prepare: ignore explicitly removed conflicts
by Andrew Gregory 04 Mar '14

04 Mar '14

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/sync.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 6ea78a0..31181e1 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -566,6 +566,9 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) /* if conflict->package2 (the local package) is not elected for removal, we ask the user */ + if(alpm_pkg_find(trans->remove, conflict->package2)) { + found = 1; + } for(j = trans->add; j && !found; j = j->next) { alpm_pkg_t *spkg = j->data; if(alpm_pkg_find(spkg->removes, conflict->package2)) { -- 1.9.0

2 1

[pacman-dev] [PATCH] remove check for unused ALPM_ERR_PKG_IGNORED
by Andrew Gregory 03 Mar '14

03 Mar '14

alpm_add_pkg does not ignore packages. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/sync.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index fc4baaf..bf19d57 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -566,9 +566,8 @@ static int process_pkg(alpm_pkg_t *pkg) if(ret == -1) { alpm_errno_t err = alpm_errno(config->handle); - if(err == ALPM_ERR_TRANS_DUP_TARGET - || err == ALPM_ERR_PKG_IGNORED) { - /* just skip duplicate or ignored targets */ + if(err == ALPM_ERR_TRANS_DUP_TARGET) { + /* just skip duplicate targets */ pm_printf(ALPM_LOG_WARNING, _("skipping target: %s\n"), alpm_pkg_get_name(pkg)); return 0; } else { -- 1.9.0

1 0

[pacman-dev] [PATCH] simplify check for leading "local/"
by Andrew Gregory 03 Mar '14

03 Mar '14

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/remove.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/pacman/remove.c b/src/pacman/remove.c index 00bd3b3..933e6f7 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -94,13 +94,10 @@ int pacman_remove(alpm_list_t *targets) /* Step 1: add targets to the created transaction */ for(i = targets; i; i = alpm_list_next(i)) { char *target = i->data; - char *targ = strchr(target, '/'); - if(targ && strncmp(target, "local", 5) == 0) { - targ++; - } else { - targ = target; + if(strncmp(target, "local/", 6) == 0) { + target += 6; } - if(remove_target(targ) == -1) { + if(remove_target(target) == -1) { retval = 1; } } -- 1.9.0

1 0

[pacman-dev] [PATCH] makepkg: Add a --noarchive option to inhibit archive creation
by Pierre Neidhardt 03 Mar '14

03 Mar '14

1. Packagers who want to test the package() function, i.e. to check the content of the pkg/ folder. 2. Developers who want to check how the packaged version of a program looks, in other words how the pkg/ folder looks. 3. For users of systems with no port tree, makepkg can ease package creation. However the resulting archive of the whole makepkg process is often useless. For all situations, makepkg will usually be called several times. But no archive (the final package) is needed in any cases. The archive creation ends up being a waste of time and resource, especially for big applications and slow machines. Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> --- doc/makepkg.8.txt | 7 ++++++- scripts/makepkg.sh.in | 14 ++++++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 29f4a03..7b29023 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -102,7 +102,7 @@ Options *-i, \--install*:: Install or upgrade the package after a successful build using - linkman:pacman[8]. + linkman:pacman[8]. This option and '\--noarchive' are mutually exclusive. *-L, \--log*:: Enable makepkg build logging. This will use the *tee* program to send @@ -165,6 +165,11 @@ Options Run the check() function in the PKGBUILD, overriding the setting in linkman:makepkg.conf[5]. +*\--noarchive*:: + Do not create the archive at the end of the build process. This can be + useful to test the package() function or if your target distribution does + not use pacman. This option and '\--install' are mutually exclusive. + *\--nocheck*:: Do not run the check() function in the PKGBUILD or handle the checkdepends. diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b69c071..0689807 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -74,6 +74,7 @@ INFAKEROOT=0 INSTALL=0 LOGGING=0 NEEDED=0 +NOARCHIVE=0 NOBUILD=0 NODEPS=0 NOEXTRACT=0 @@ -1844,6 +1845,8 @@ write_pkginfo() { } create_package() { + (( NOARCHIVE )) && return + if [[ ! -d $pkgdir ]]; then error "$(gettext "Missing %s directory.")" "\$pkgdir/" plain "$(gettext "Aborting...")" @@ -2513,6 +2516,7 @@ usage() { printf -- "$(gettext " --config <file> Use an alternate config file (instead of '%s')")\n" "$confdir/makepkg.conf" printf -- "$(gettext " --holdver Do not update VCS sources")\n" printf -- "$(gettext " --key <key> Specify a key to use for %s signing instead of the default")\n" "gpg" + printf -- "$(gettext " --noarchive Skip package archive creation and installation")\n" printf -- "$(gettext " --nocheck Do not run the %s function in the %s")\n" "check()" "$BUILDSCRIPT" printf -- "$(gettext " --noprepare Do not run the %s function in the %s")\n" "prepare()" "$BUILDSCRIPT" printf -- "$(gettext " --nosign Do not create a signature for the package")\n" @@ -2558,10 +2562,11 @@ ARGLIST=("$@") # Parse Command Line Options. OPT_SHORT="AcCdefFghiLmop:rRsSV" + OPT_LONG=('allsource' 'asroot' 'check' 'clean' 'cleanbuild' 'config:' 'force' 'geninteg' - 'help' 'holdver' 'ignorearch' 'install' 'key:' 'log' 'nobuild' 'nocolor' - 'nocheck' 'nodeps' 'noextract' 'noprepare' 'nosign' 'pkg:' 'repackage' 'rmdeps' - 'sign' 'skipchecksums' 'skipinteg' 'skippgpcheck' 'source' 'syncdeps' + 'help' 'holdver' 'ignorearch' 'install' 'key:' 'log' 'noarchive' 'nobuild' + 'nocolor' 'nocheck' 'nodeps' 'noextract' 'noprepare' 'nosign' 'pkg:' 'repackage' + 'rmdeps' 'sign' 'skipchecksums' 'skipinteg' 'skippgpcheck' 'source' 'syncdeps' 'verifysource' 'version') # Pacman Options @@ -2584,6 +2589,7 @@ while true; do # Makepkg Options --allsource) SOURCEONLY=2 ;; --asroot) ASROOT=1 ;; + --noarchive) NOARCHIVE=1; INSTALL=0 ;; -A|--ignorearch) IGNOREARCH=1 ;; -c|--clean) CLEANUP=1 ;; -C|--cleanbuild) CLEANBUILD=1 ;; @@ -2595,7 +2601,7 @@ while true; do -F) INFAKEROOT=1 ;; -g|--geninteg) GENINTEG=1 ;; --holdver) HOLDVER=1 ;; - -i|--install) INSTALL=1 ;; + -i|--install) INSTALL=1; NOARCHIVE=0 ;; --key) shift; GPGKEY=$1 ;; -L|--log) LOGGING=1 ;; -m|--nocolor) USE_COLOR='n' ;; -- 1.9.0

2 4

[pacman-dev] [PATCH] Fix install order in scripts Makefile
by Allan McRae 03 Mar '14

03 Mar '14

We need to use install-exec-hook instead of install-data-hook to make sure the hook is run after the installation of the scripts into $BINDIR. --- scripts/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 5d69993..43045df 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -142,7 +142,7 @@ makepkg-wrapper: \ $(AM_V_at)chmod +x,a-w $@ $(AM_V_at)$(LN_S) makepkg-wrapper makepkg -install-data-hook: +install-exec-hook: cd $(DESTDIR)$(bindir) && \ $(RM) makepkg makepkg-wrapper $(INSTALL) .lib/makepkg $(DESTDIR)$(bindir)/makepkg -- 1.9.0

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.2-317-ge6ff630
by allan＠archlinux.org 03 Mar '14

03 Mar '14

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 e6ff63076390141f2606babda627e5e053462456 (commit) via 0475b2501ae72b25a207fd9c1af479f5f7e0e877 (commit) via 0b0fe51a2cb1b5d8b5031b4299547a4e5fd47c20 (commit) via 620d2d9d587b9f361fedb464501f59141c98d3da (commit) via b2488eb356281e5da56d12286f07798f8ca8d2cb (commit) via e5c714f5010e803465dbe57adc31687dffba10b2 (commit) via cfde337b7b5f4a7f56ff0a4e6142804f6e638f69 (commit) via cfaff6e0c14d29f07246386695bce0188ce6f44b (commit) via 894773eb5bb054ba9750d9be269814c7e6672766 (commit) via e2fe0525765504b99178abbe94524ee8768c4d9d (commit) via fe961e65904dac06762b78350c340631a36eacf1 (commit) via 08cddb4b4b84147da52dfffc4e416f76a6c5c430 (commit) via bf79c0244065315edfb9abd613fa88d4cf1557bd (commit) via 9bfd6ff2756f0f2f164d28886cfe991010e9ae41 (commit) via bd3d1a17c2ec4297f05d092f0b93d025f811aa8a (commit) via 01cc55a1f47c99d3f296e710904b5f3fc31e0b1d (commit) via cd793c5ab7689cc8cbc18277375b368060e5acfe (commit) via 28dbd5551ee75e843019e6f067ed069daaabba0b (commit) via b6f6a165c4630cac86efb2608b9909b20488a710 (commit) via 5acfa65ffb4aab31e05b70cea164dcb3e011d91f (commit) via 8e60adc91662b7e79bf1982c1bdc5c7e4ef76d8b (commit) via 11fb1d30f430b4e4b01e08c84d3cdf0cfa749cb3 (commit) via 42f4a5081e06793be6c807d50cd7ec0a83bbcdf1 (commit) via f27fad9b890d2696201e1df2356dd4d66f813ddd (commit) from a7da2a47c3f71f52ad1214b4ae78e716ee488a5a (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 e6ff63076390141f2606babda627e5e053462456 Author: Pierre Neidhardt <ambrevar(a)gmail.com> Date: Sat Mar 1 20:51:09 2014 +0100 makepkg.8: Fix typo Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0475b2501ae72b25a207fd9c1af479f5f7e0e877 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Feb 28 10:13:34 2014 -0500 pactest: add prefix to temporary directory This makes cleaning up /tmp after several --keep-root runs much easier. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0b0fe51a2cb1b5d8b5031b4299547a4e5fd47c20 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Feb 28 10:13:33 2014 -0500 pmpkg.py: remove unused imports Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 620d2d9d587b9f361fedb464501f59141c98d3da Author: Thomas Bächler <thomas(a)archlinux.org> Date: Fri Feb 28 01:45:05 2014 +0100 makepkg: Support kernel.org's PGP signature scheme Files hosted on kernel.org only provide signatures for the uncompressed tarball. Support this scheme by transparently uncompressing the archives and piping the data into gpg. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b2488eb356281e5da56d12286f07798f8ca8d2cb Author: Allan McRae <allan(a)archlinux.org> Date: Sun Feb 23 11:41:40 2014 +1000 Fix warnings with strict-overflow in gcc-4.9 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e5c714f5010e803465dbe57adc31687dffba10b2 Author: Pierre Neidhardt <ambrevar(a)gmail.com> Date: Fri Feb 14 13:18:56 2014 +0100 pacsearch: factored -Ss and -Qs parts into one single function Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit cfde337b7b5f4a7f56ff0a4e6142804f6e638f69 Author: Pierre Neidhardt <ambrevar(a)gmail.com> Date: Fri Feb 14 13:18:55 2014 +0100 pacsearch: pattern arguments work as for pacman Previously only one pattern was allowed. $ pacsearch foo bar Search for packages containing 'foo bar'. $ pacman -Ss foo bar Search for packages containing both 'foo' and 'bar'. Note that removing the quotes from the call was not enough since $ pacsearch 'foo|bar' would then fail. Note the use of '--' to indicate the end of option parsing. This way we ensure that input will always be valid and we need not input checks anymore. Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit cfaff6e0c14d29f07246386695bce0188ce6f44b Author: Olivier Brunel <jjk(a)jjacky.com> Date: Wed Feb 12 16:32:30 2014 +0100 Add events on pacnew/pacsave/pacorig file creation ALPM still adds a warning to the log, but doesn't emit an event about said warning, instead using a specific event to let the frontend what happened/how to inform the user. Note that there are 2 cases for installing a .pacnew file, to not overwrite user changes and because file is in NoUpgrade. In the later case the warning was a bit different: it happened before and said "extracting" instead of "installed." Now both happen after and are phrased the same. Signed-off-by: Olivier Brunel <jjk(a)jjacky.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 894773eb5bb054ba9750d9be269814c7e6672766 Author: Pierre Neidhardt <ambrevar(a)gmail.com> Date: Sun Feb 9 19:41:42 2014 +0100 pacsearch: fields are treated uniformly when printing We include the leading space in the match for 'group' and 'installed'. This allows us to remove the conditions when printing. Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e2fe0525765504b99178abbe94524ee8768c4d9d Author: Pierre Neidhardt <ambrevar(a)gmail.com> Date: Sun Feb 9 19:41:41 2014 +0100 pacsearch: removed redundant sorting Package are processed in the same order as pacman output, so there is no real need to sort. This makes the code simpler and faster. The only difference is that local packages will always be printed at the end. Previously, they were printed before multilib for instance. Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fe961e65904dac06762b78350c340631a36eacf1 Author: Pierre Neidhardt <ambrevar(a)gmail.com> Date: Sun Feb 9 19:41:40 2014 +0100 pacsearch: indexing by 'name version' instead of 'name' In the old pacsearch, packages were identified uniquely by pkgfields[1], which contained pkgname+pkgver. Since commit 4d13558 pkgver is stored in pkgfields[2], and packages have been identified with pkgfields[1] only. Because of that packages with a different version would appear once only. This fixes the regression by identifying packages with both pkgfields[1] and pkgfields[2]. Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 08cddb4b4b84147da52dfffc4e416f76a6c5c430 Author: Pierre Neidhardt <ambrevar(a)gmail.com> Date: Sun Feb 9 19:41:39 2014 +0100 pacsearch: removed useless comment Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit bf79c0244065315edfb9abd613fa88d4cf1557bd Author: Steven Noonan <steven(a)uplinklabs.net> Date: Sun Feb 9 15:26:26 2014 -0800 makepkg: implement support for stripping kernel modules I noticed when I built a kernel package with options 'strip' and 'debug' that the debug package was missing the debug information for the kernel modules. This patch adds kernel modules to the targets for 'strip' and is compatible with the split-out debug information packages. v2: Correct logic error -- did a 'continue' after the 2nd-level case statement instead of in the default case. v3: Oops, forgot to terminate outer case. Ran this version through the test suite and all tests passed. Signed-off-by: Steven Noonan <steven(a)uplinklabs.net> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9bfd6ff2756f0f2f164d28886cfe991010e9ae41 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Feb 7 13:04:58 2014 -0500 restrict transaction package origins This moves the "wrong args" error up from trans_commit to add_pkg when used with a local pkg and adds the error for remove_pkg when used with a sync pkg, which currently just removes the db entry. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit bd3d1a17c2ec4297f05d092f0b93d025f811aa8a Author: Olivier Brunel <jjk(a)jjacky.com> Date: Fri Jan 10 16:25:17 2014 +0100 Add events _PKGDOWNLOAD_{START, DONE, FAILED} These will be emmitted when download a package file from a repository, indicating that the download starts, and whether it was successfull or not. Note that when multiple servers are available, no event is emmitted when switching to another server. (This doesn't apply to alpm_fetch_pkgurl(), but since it is called by the frontend, it shouldn't have problems knowing when the download starts and when it ends.) Signed-off-by: Olivier Brunel <jjk(a)jjacky.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 01cc55a1f47c99d3f296e710904b5f3fc31e0b1d Author: Olivier Brunel <jjk(a)jjacky.com> Date: Fri Jan 10 16:25:16 2014 +0100 Add events ALPM_EVENT_RETRIEVE_{DONE, FAILED} To go along with RETRIEVE_START, one other event will be emmitted once the downloads are done: RETRIEVE_DONE if all files were successfully downloaded, else RETRIEVE_FAILED. Signed-off-by: Olivier Brunel <jjk(a)jjacky.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit cd793c5ab7689cc8cbc18277375b368060e5acfe Author: Olivier Brunel <jjk(a)jjacky.com> Date: Fri Jan 10 16:25:15 2014 +0100 Remove log_cb, add ALPM_EVENT_LOG instead When ALPM emits a log message, it still goes through _alpm_log() but instead of calling a specific log callback, it goes as an event. Signed-off-by: Olivier Brunel <jjk(a)jjacky.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 28dbd5551ee75e843019e6f067ed069daaabba0b Author: Olivier Brunel <jjk(a)jjacky.com> Date: Fri Jan 10 16:25:14 2014 +0100 Update the event callback Instead of using two void* arguments for all events, we now send one pointer to an alpm_event_t struct. This contains the type of event that was triggered. With this information, the pointer can then be typecasted to the event-specific struct in order to get additional arguments. Signed-off-by: Olivier Brunel <jjk(a)jjacky.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b6f6a165c4630cac86efb2608b9909b20488a710 Author: Florian Pritz <bluewind(a)xinu.at> Date: Sun Feb 9 11:28:22 2014 +0100 be_local: Use alpm_greedy_grow Signed-off-by: Florian Pritz <bluewind(a)xinu.at> commit 5acfa65ffb4aab31e05b70cea164dcb3e011d91f Author: Florian Pritz <bluewind(a)xinu.at> Date: Mon Jan 27 23:49:34 2014 +0100 be_package: Build the file list from MTREE if possible This greatly speeds up file list generation times by avoiding uncompressing the whole package. pacman -S base with a deliberate file conflict: before: 9.1 seconds after: 2.2 seconds Signed-off-by: Florian Pritz <bluewind(a)xinu.at> commit 8e60adc91662b7e79bf1982c1bdc5c7e4ef76d8b Author: Florian Pritz <bluewind(a)xinu.at> Date: Mon Jan 27 23:47:10 2014 +0100 be_package: Refactor code adding a file to the files list Signed-off-by: Florian Pritz <bluewind(a)xinu.at> commit 11fb1d30f430b4e4b01e08c84d3cdf0cfa749cb3 Author: Florian Pritz <bluewind(a)xinu.at> Date: Mon Jan 27 23:40:49 2014 +0100 be_package: Refactor handling of simple path checks This is used to deduplicate code when using the mtree as the file list source. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> commit 42f4a5081e06793be6c807d50cd7ec0a83bbcdf1 Author: Florian Pritz <bluewind(a)xinu.at> Date: Mon Jan 27 23:38:49 2014 +0100 util: Add _alpm_realloc() and _alpm_greedy_grow() These will be used in the following patches. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> commit f27fad9b890d2696201e1df2356dd4d66f813ddd Author: Florian Pritz <bluewind(a)xinu.at> Date: Mon Jan 27 23:37:49 2014 +0100 Check if a file is in the package's file list before extracting Signed-off-by: Florian Pritz <bluewind(a)xinu.at> ----------------------------------------------------------------------- Summary of changes: contrib/pacsearch.in | 100 ++++++------------- doc/makepkg.8.txt | 2 +- lib/libalpm/add.c | 81 +++++++++++----- lib/libalpm/alpm.h | 244 ++++++++++++++++++++++++++++++++--------------- lib/libalpm/be_local.c | 19 +--- lib/libalpm/be_package.c | 230 +++++++++++++++++++++++++++++++++++++------- lib/libalpm/be_sync.c | 6 +- lib/libalpm/handle.c | 13 --- lib/libalpm/handle.h | 5 +- lib/libalpm/log.c | 14 ++- lib/libalpm/remove.c | 34 +++++-- lib/libalpm/sync.c | 96 ++++++++++++++----- lib/libalpm/util.c | 68 ++++++++++++- lib/libalpm/util.h | 2 + scripts/makepkg.sh.in | 30 +++++- src/pacman/callback.c | 177 +++++++++++++++++++++++----------- src/pacman/callback.h | 6 +- src/pacman/conf.c | 1 - src/pacman/sync.c | 2 +- src/pacman/util.c | 13 +++ src/pacman/util.h | 1 + src/util/cleanupdelta.c | 14 +-- src/util/testdb.c | 14 +-- src/util/testpkg.c | 14 +-- test/pacman/pactest.py | 2 +- test/pacman/pmpkg.py | 4 - 26 files changed, 826 insertions(+), 366 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Remove unneeded header inclusions
by Silvan Jegen 02 Mar '14

02 Mar '14

I checked only a few files but if you think cleaning up the includes is worth the hassle I could continue to check further files. (see: http://sillymon.ch/data/diskspace_8c__incl.png for example) -- >8 -- These headers are included transitively and can be removed. Signed-off-by: Silvan Jegen <s.jegen(a)gmail.com> --- lib/libalpm/add.c | 14 -------------- lib/libalpm/alpm.c | 2 -- lib/libalpm/backup.c | 3 --- lib/libalpm/diskspace.c | 3 --- lib/libalpm/filelist.c | 2 -- lib/libalpm/util.h | 3 --- 6 files changed, 27 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index f38afef..133b85c 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -18,31 +18,17 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <stdlib.h> #include <errno.h> -#include <string.h> #include <limits.h> -#include <fcntl.h> -#include <sys/types.h> -#include <sys/stat.h> #include <unistd.h> -#include <stdint.h> /* int64_t */ - -/* libarchive */ -#include <archive.h> -#include <archive_entry.h> /* libalpm */ #include "add.h" #include "alpm.h" -#include "alpm_list.h" -#include "handle.h" #include "libarchive-compat.h" -#include "trans.h" #include "util.h" #include "log.h" #include "backup.h" -#include "package.h" #include "db.h" #include "remove.h" #include "handle.h" diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index 4a69bf8..a56b17b 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -27,8 +27,6 @@ /* libalpm */ #include "alpm.h" -#include "alpm_list.h" -#include "handle.h" #include "log.h" #include "util.h" diff --git a/lib/libalpm/backup.c b/lib/libalpm/backup.c index c2989b6..10bd0de 100644 --- a/lib/libalpm/backup.c +++ b/lib/libalpm/backup.c @@ -21,9 +21,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <stdlib.h> -#include <string.h> - /* libalpm */ #include "backup.h" #include "alpm_list.h" diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index d07b188..52d6bf7 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -17,7 +17,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <stdio.h> #include <errno.h> #if defined(HAVE_MNTENT_H) @@ -44,11 +43,9 @@ /* libalpm */ #include "diskspace.h" -#include "alpm_list.h" #include "util.h" #include "log.h" #include "trans.h" -#include "handle.h" static int mount_point_cmp(const void *p1, const void *p2) { diff --git a/lib/libalpm/filelist.c b/lib/libalpm/filelist.c index 2d2426c..33ac957 100644 --- a/lib/libalpm/filelist.c +++ b/lib/libalpm/filelist.c @@ -18,8 +18,6 @@ */ #include <limits.h> -#include <string.h> -#include <sys/stat.h> /* libalpm */ #include "filelist.h" diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 250c530..b7f6c8b 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -24,7 +24,6 @@ #ifndef _ALPM_UTIL_H #define _ALPM_UTIL_H -#include "alpm_list.h" #include "alpm.h" #include "package.h" /* alpm_pkg_t */ #include "handle.h" /* alpm_handle_t */ @@ -40,8 +39,6 @@ #include <float.h> /* DBL_EPSILON */ #include <fcntl.h> /* open, close */ -#include <archive.h> /* struct archive */ - #ifdef ENABLE_NLS #include <libintl.h> /* here so it doesn't need to be included elsewhere */ /* define _() as shortcut for gettext() */ -- 1.9.0

2 2

[pacman-dev] Shabang in scripts
by Pierre Neidhardt 02 Mar '14

02 Mar '14

This maybe a futile question, but not much to lose here so I'm still asking: should we let the autotools change the path of the interpreter in the shabang of the different scripts? (See makepkg and so on.) Actually, according to https://wiki.archlinux.org/index.php/DeveloperWiki:Bash_Coding_Style it is said that the interpreter should be /bin/bash, not /usr/bin/bash. The latter being far less common. Note that the source files are properly set to /bin/*, only the autotools change them to the realpath of the build system. This is really a minor issue, but I believe that switching it back to /bin/bash would remove one portability problem for most systems. For instance, to run makepkg on a non-Arch system, we download the 'pacman' binary package first, from which we extract the 'makepkg' and the 'makepkg.conf' files. Since the package was built on an Arch system, the shabang is set to /usr/bin/bash. On non-Arch system, we usually need to make to change the shabang back to /bin/bash. What do you think? -- Pierre Neidhardt Oh, get ahold of yourself. Nobody's proposing that we parse English. -- Larry Wall in <199709032332.QAA21669(a)wall.org>

2 4

[pacman-dev] [PATCH] makepkg.8: Fix typo
by Pierre Neidhardt 01 Mar '14

01 Mar '14

Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> --- doc/makepkg.8.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 29f4a03..77a7a83 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -152,7 +152,7 @@ Options *\--allsource*:: Do not actually build the package, but build a source-only tarball that - includes all sources, including those that are normally download via + includes all sources, including those that are normally downloaded via makepkg. This is useful for passing a single tarball to another program such as a chroot or remote builder. It will also satisfy requirements of the GPL when distributing binary packages. -- 1.9.0

1 0

[pacman-dev] [PATCH] makepkg: added a -a, --noarchive option to inhibit archive creation
by Pierre Neidhardt 28 Feb '14

28 Feb '14

1. Packagers who want to test the package() function, i.e. to check the content of the pkg/ folder. 2. Developers who want to check how the packaged version of a program looks, in other words how the pkg/ folder looks. 3. For users of systems with no port tree, makepkg can ease package creation. However the resulting archive of the whole makepkg process is often useless. For all situations, makepkg will usually be called several times. But no archive (the final package) is needed in any cases. The archive creation ends up being a waste of time and resource, especially for big applications and slow machines. Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> --- scripts/makepkg.sh.in | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b69c071..d84b635 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -74,6 +74,7 @@ INFAKEROOT=0 INSTALL=0 LOGGING=0 NEEDED=0 +NOARCHIVE=0 NOBUILD=0 NODEPS=0 NOEXTRACT=0 @@ -1844,6 +1845,10 @@ write_pkginfo() { } create_package() { + if (( NOARCHIVE )); then + return 1 + fi + if [[ ! -d $pkgdir ]]; then error "$(gettext "Missing %s directory.")" "\$pkgdir/" plain "$(gettext "Aborting...")" @@ -2488,6 +2493,7 @@ usage() { printf -- "$(gettext "Usage: %s [options]")\n" "$0" echo printf -- "$(gettext "Options:")\n" + printf -- "$(gettext " -a, --noarchive Do not create archive from %s and do not install")\n" "\$pkgdir" printf -- "$(gettext " -A, --ignorearch Ignore incomplete %s field in %s")\n" "arch" "$BUILDSCRIPT" printf -- "$(gettext " -c, --clean Clean up work files after build")\n" printf -- "$(gettext " -C, --cleanbuild Remove %s dir before building the package")\n" "\$srcdir/" @@ -2557,11 +2563,12 @@ fi ARGLIST=("$@") # Parse Command Line Options. -OPT_SHORT="AcCdefFghiLmop:rRsSV" +OPT_SHORT="aAcCdefFghiLmop:rRsSV" + OPT_LONG=('allsource' 'asroot' 'check' 'clean' 'cleanbuild' 'config:' 'force' 'geninteg' - 'help' 'holdver' 'ignorearch' 'install' 'key:' 'log' 'nobuild' 'nocolor' - 'nocheck' 'nodeps' 'noextract' 'noprepare' 'nosign' 'pkg:' 'repackage' 'rmdeps' - 'sign' 'skipchecksums' 'skipinteg' 'skippgpcheck' 'source' 'syncdeps' + 'help' 'holdver' 'ignorearch' 'install' 'key:' 'log' 'noarchive' 'nobuild' + 'nocolor' 'nocheck' 'nodeps' 'noextract' 'noprepare' 'nosign' 'pkg:' 'repackage' + 'rmdeps' 'sign' 'skipchecksums' 'skipinteg' 'skippgpcheck' 'source' 'syncdeps' 'verifysource' 'version') # Pacman Options @@ -2584,6 +2591,7 @@ while true; do # Makepkg Options --allsource) SOURCEONLY=2 ;; --asroot) ASROOT=1 ;; + -a|--noarchive) NOARCHIVE=1; INSTALL=0 ;; -A|--ignorearch) IGNOREARCH=1 ;; -c|--clean) CLEANUP=1 ;; -C|--cleanbuild) CLEANBUILD=1 ;; @@ -2595,7 +2603,7 @@ while true; do -F) INFAKEROOT=1 ;; -g|--geninteg) GENINTEG=1 ;; --holdver) HOLDVER=1 ;; - -i|--install) INSTALL=1 ;; + -i|--install) INSTALL=1; NOARCHIVE=0 ;; --key) shift; GPGKEY=$1 ;; -L|--log) LOGGING=1 ;; -m|--nocolor) USE_COLOR='n' ;; -- 1.9.0

3 3