- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Do not warn about missing database if being downloaded
by Allan McRae 29 Oct '12

29 Oct '12

When a configured repo database is not already downloaded, a warning message such as "warning: database file for 'testing' does not exist" is printed. Disable this warning when the database is scheduled to be downloaded in the transaction. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/alpm.h | 4 +++- lib/libalpm/be_sync.c | 3 +-- src/pacman/callback.c | 6 ++++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 66cd6b0..fb4d845 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -358,7 +358,9 @@ typedef enum _alpm_event_t { ALPM_EVENT_DISKSPACE_DONE, /** An optdepend for another package is being removed * The requiring package and its dependency are passed to the callback */ - ALPM_EVENT_OPTDEP_REQUIRED + ALPM_EVENT_OPTDEP_REQUIRED, + /** A configured repository database is missing */ + ALPM_EVENT_DATABASE_MISSING } alpm_event_t; /** Event callback */ diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 033f8b7..f980246 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -89,8 +89,7 @@ static int sync_db_validate(alpm_db_t *db) if(_alpm_access(db->handle, NULL, dbpath, R_OK) != 0 && errno == ENOENT) { db->status &= ~DB_STATUS_EXISTS; db->status |= DB_STATUS_MISSING; - _alpm_log(db->handle, ALPM_LOG_WARNING, - "database file for '%s' does not exist\n", db->treename); + EVENT(db->handle, ALPM_EVENT_DATABASE_MISSING, db->treename, NULL); goto valid; } db->status |= DB_STATUS_EXISTS; diff --git a/src/pacman/callback.c b/src/pacman/callback.c index a51aa4b..a249a6e 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -243,6 +243,12 @@ void cb_event(alpm_event_t event, void *data1, void *data2) printf(_(":: %s optionally requires %s\n"), alpm_pkg_get_name(data1), alpm_dep_compute_string(data2)); break; + case ALPM_EVENT_DATABASE_MISSING: + if(!config->op_s_sync) { + pm_printf(ALPM_LOG_WARNING, + "database file for '%s' does not exist\n", (char *)data1); + } + break; /* all the simple done events, with fallthrough for each */ case ALPM_EVENT_FILECONFLICTS_DONE: case ALPM_EVENT_CHECKDEPS_DONE: -- 1.8.0

1 0

[pacman-dev] [PATCH] pactree: unindent first limb
by Andrew Gregory 26 Oct '12

26 Oct '12

Removing the leader for the toplevel package shifted the name left but not it's limb. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- For the pactree-cleanup branch. src/util/pactree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/pactree.c b/src/util/pactree.c index 7b8fd93..0c1710f 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -336,7 +336,7 @@ static void print_text(const char *pkg, const char *provision, tdepth *depth, int last) { const char* tip = ""; - int level = 0; + int level = 1; if(!pkg && !provision) { /* not much we can do */ return; -- 1.8.0

1 0

[pacman-dev] [PATCH] makepkg: use --apparent-size when du supports it
by Allan McRae 23 Oct '12

23 Oct '12

Amazingly, using "sleep 1" to convince btrfs to report correct file sizes is only a 90% fix. Sometimes more sleep is needed. Instead we use the --apparent-size argument to du to get actual file sizes. This is used only on Linux as the various BSDs do not support this argument. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- configure.ac | 2 ++ scripts/Makefile.am | 1 + scripts/makepkg.sh.in | 7 +------ 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 03fb015..2323669 100644 --- a/configure.ac +++ b/configure.ac @@ -300,11 +300,13 @@ GCC_GNU89_INLINE_CC INODECMD="stat -c '%i %n'" SIZECMD="stat -c %s" SEDINPLACE="sed -i" +DUFLAGS="-sk --apparent-size" case "${host_os}" in *bsd*) INODECMD="stat -f '%i %n'" SIZECMD="stat -f %z" SEDINPLACE="sed -i \"\"" + DUFLAGS="-sk" ;; esac diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 2bd6411..da7047b 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -58,6 +58,7 @@ edit = sed \ -e 's|@SIZECMD[@]|$(SIZECMD)|g' \ -e 's|@SEDINPLACE[@]|$(SEDINPLACE)|g' \ -e 's|@DUPATH[@]|$(DUPATH)|g' \ + -e 's|@DUFLAGS[@]|$(DUFLAGS)|g' \ -e 's|@SCRIPTNAME[@]|$@|g' \ -e 's|@configure_input[@]|Generated from $@.sh.in; do not edit by hand.|g' diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 5822843..1e9068b 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1704,12 +1704,7 @@ write_pkginfo() { local packager="Unknown Packager" fi - # btrfs's delayed allocation causes the stat buffers from the kernel to "lie" - # to us momentarily and report 0 blocks allocated (which is how du calculates - # size). Sleeping for a second here is about the dirtiest thing possible, - # but avoids reporting entirely bogus install sizes. - sleep 1 - local size="$(@DUPATH@ -sk)" + local size="$(@DUPATH@ @DUFLAGS@)" size="$(( ${size%%[^0-9]*} * 1024 ))" msg2 "$(gettext "Generating %s file...")" ".PKGINFO" -- 1.8.0

1 0

[pacman-dev] [PATCH 1/2] pactree: fix --sync getopt value
by Andrew Gregory 15 Oct '12

15 Oct '12

The long --sync options has apparently never worked. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/util/pactree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/pactree.c b/src/util/pactree.c index 4488645..ab5d90a 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -217,7 +217,7 @@ static int parse_options(int argc, char *argv[]) {"help", no_argument, 0, 'h'}, {"linear", no_argument, 0, 'l'}, {"reverse", no_argument, 0, 'r'}, - {"sync", no_argument, 0, 'S'}, + {"sync", no_argument, 0, 's'}, {"unique", no_argument, 0, 'u'}, {"config", required_argument, 0, OP_CONFIG}, -- 1.7.12.2

3 5

[pacman-dev] [PATCH 1/3] makepkg: allow debug package suffix to be configurable
by Allan McRae 29 Sep '12

29 Sep '12

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- configure.ac | 8 ++++++++ scripts/Makefile.am | 1 + scripts/makepkg.sh.in | 30 +++++++++++++++--------------- 3 files changed, 24 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index 036dda2..48aa4c5 100644 --- a/configure.ac +++ b/configure.ac @@ -97,6 +97,11 @@ AC_ARG_WITH(buildscript, AS_HELP_STRING([--with-buildscript=name], [set the build script name used by makepkg]), [BUILDSCRIPT=$withval], [BUILDSCRIPT=PKGBUILD]) +# Help line for debug package suffix +AC_ARG_WITH(debug-suffix, + AS_HELP_STRING([--with-debux-suffix=name], [set the suffix for split debugging symbol packages used by makepkg]), + [DEBUGSUFFIX=$withval], [DEBUGSUFFIX=debug]) + # Help line for changing shell used to run install scriptlets AC_ARG_WITH(scriptlet-shell, AS_HELP_STRING([--with-scriptlet-shell=shell], @@ -425,6 +430,9 @@ AC_DEFINE_UNQUOTED([SRCEXT], "$SRCEXT", [The file extension used by pacman sourc # Set makepkg build script name AC_SUBST(BUILDSCRIPT) AC_DEFINE_UNQUOTED([BUILDSCRIPT], "$BUILDSCRIPT", [The build script name used by makepkg]) +# Set makepkg split debugging symbol package suffix +AC_SUBST(DEBUGSUFFIX) +AC_DEFINE_UNQUOTED([DEBUGSUFFIX], "$DEBUGSUFFIX", [The suffix for debugging symbol packages used by makepkg]) # Set shell used by install scriptlets AC_SUBST(SCRIPTLET_SHELL) AC_DEFINE_UNQUOTED([SCRIPTLET_SHELL], "$SCRIPTLET_SHELL", [The shell used to run install scriptlets]) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 29c81aa..2bd6411 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -53,6 +53,7 @@ edit = sed \ -e 's|@PACKAGE_BUGREPORT[@]|$(PACKAGE_BUGREPORT)|g' \ -e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \ -e 's|@BUILDSCRIPT[@]|$(BUILDSCRIPT)|g' \ + -e 's|@DEBUGSUFFIX[@]|$(DEBUGSUFFIX)|g' \ -e "s|@INODECMD[@]|$(INODECMD)|g" \ -e 's|@SIZECMD[@]|$(SIZECMD)|g' \ -e 's|@SEDINPLACE[@]|$(SEDINPLACE)|g' \ diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 337ada9..bb2391f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1438,38 +1438,38 @@ strip_file() { # has this file already been stripped if [[ -n "$bid" ]]; then - if [[ -f "$pkgdir-debug"/usr/lib/debug/.build_id/${bid:0:2}/${bid:2}.debug ]]; then + if [[ -f "$pkgdir-@DEBUGSUFFIX@"/usr/lib/debug/.build_id/${bid:0:2}/${bid:2}.debug ]]; then return fi - elif [[ -f "$pkgdir-debug/usr/lib/debug/$binary.debug" ]]; then + elif [[ -f "$pkgdir-@DEBUGSUFFIX@/usr/lib/debug/$binary.debug" ]]; then return fi - mkdir -p "$pkgdir-debug/usr/lib/debug/${binary%/*}" - objcopy --only-keep-debug "$binary" "$pkgdir-debug/usr/lib/debug/$binary.debug" - objcopy --add-gnu-debuglink="$pkgdir-debug/usr/lib/debug/${binary#/}.debug" "$binary" + mkdir -p "$pkgdir-@DEBUGSUFFIX@/usr/lib/debug/${binary%/*}" + objcopy --only-keep-debug "$binary" "$pkgdir-@DEBUGSUFFIX@/usr/lib/debug/$binary.debug" + objcopy --add-gnu-debuglink="$pkgdir-@DEBUGSUFFIX@/usr/lib/debug/${binary#/}.debug" "$binary" # create any needed hardlinks while read -d '' file ; do if [[ "${binary}" -ef "${file}" && - ! -f "$pkgdir-debug/usr/lib/debug/${file}.debug" ]]; then - mkdir -p "$pkgdir-debug/usr/lib/debug/${file%/*}" - ln "$pkgdir-debug/usr/lib/debug/${binary}.debug" \ - "$pkgdir-debug/usr/lib/debug/${file}.debug" + ! -f "$pkgdir-@DEBUGSUFFIX@/usr/lib/debug/${file}.debug" ]]; then + mkdir -p "$pkgdir-@DEBUGSUFFIX@/usr/lib/debug/${file%/*}" + ln "$pkgdir-@DEBUGSUFFIX@/usr/lib/debug/${binary}.debug" \ + "$pkgdir-@DEBUGSUFFIX@/usr/lib/debug/${file}.debug" fi done < <(find . -type f -perm -u+w -print0 2>/dev/null) if [[ -n "$bid" ]]; then local target - mkdir -p "$pkgdir-debug/usr/lib/debug/.build_id/${bid:0:2}" + mkdir -p "$pkgdir-@DEBUGSUFFIX@/usr/lib/debug/.build_id/${bid:0:2}" target="../../../../../${binary#./}" target="${target/..\/..\/usr\/lib\/}" target="${target/..\/usr\/}" - ln -s "$target" "$pkgdir-debug/usr/lib/debug/.build_id/${bid:0:2}/${bid:2}" + ln -s "$target" "$pkgdir-@DEBUGSUFFIX@/usr/lib/debug/.build_id/${bid:0:2}/${bid:2}" target="../../${binary#./}.debug" - ln -s "$target" "$pkgdir-debug/usr/lib/debug/.build_id/${bid:0:2}/${bid:2}.debug" + ln -s "$target" "$pkgdir-@DEBUGSUFFIX@/usr/lib/debug/.build_id/${bid:0:2}/${bid:2}.debug" fi fi @@ -1532,7 +1532,7 @@ tidy_install() { [[ -z ${STRIP_STATIC+x} ]] && STRIP_STATIC="-S" if check_option "debug" "y"; then - mkdir -p $pkgdir-debug/usr/lib/debug + mkdir -p $pkgdir-@DEBUGSUFFIX@/usr/lib/debug fi local binary strip_flags @@ -1876,7 +1876,7 @@ create_debug_package() { return fi - pkgdir="${pkgdir}-debug" + pkgdir="${pkgdir}-@DEBUGSUFFIX@" # check if we have any debug symbols to package if dir_is_empty "$pkgdir/usr/lib/debug"; then @@ -1885,7 +1885,7 @@ create_debug_package() { depends=("$pkgname=$(get_full_version)") pkgdesc="Detached debugging symbols for $pkgname" - pkgname=$pkgname-debug + pkgname=$pkgname-@DEBUGSUFFIX@ unset groups optdepends provides conflicts replaces backup install changelog -- 1.7.12.1

1 2

[pacman-dev] packages not signed
by Christian Hesse 26 Sep '12

26 Sep '12

Hello everybody, I have just installed pacman-git v4.0.3.402.g2abe1f1-1. Everything works just fine except one thing: package signing does not work though it is requested in makepkg.conf with BUILDENV=(... sign). Giving --sign to makepkg works, however. What is wrong with the BUILDENV array in makepkg.conf? -- main(a){char*c=/* Schoene Gruesse */"B?IJj;MEH" "CX:;",b;for(a/* Chris get my mail address: */=0;b=c[a++];) putchar(b-1/(/* gcc -o sig sig.c && ./sig */b/42*2-3)*42);}

3 4

[pacman-dev] [PATCH 1/3] configure.ac: cleanup duplication in --enable-git-version
by Dave Reisner 25 Sep '12

25 Sep '12

Avoid adding our own messaging, as autoconf will add this for us with the result of the AC_CHECK_FILE test. Reuse the cache variable from autoconf to set our local variable. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- configure.ac | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 7fe696a..7c65a75 100644 --- a/configure.ac +++ b/configure.ac @@ -424,13 +424,9 @@ AC_MSG_CHECKING(whether to use git version if available) if test "x$wantgitver" = "xyes" ; then AC_CHECK_PROGS([GIT], [git]) AC_CHECK_FILE([.git/], hasgitdir=yes) + usegitver=$ac_cv_file__git if test $GIT -a "x$hasgitdir" = "xyes"; then - AC_MSG_RESULT([yes]) - usegitver=yes AC_DEFINE([USE_GIT_VERSION], , [Use GIT version in version string]) - else - AC_MSG_RESULT([no, git or .git dir missing]) - usegitver=no fi else AC_MSG_RESULT([no, disabled by configure]) -- 1.7.12.1

3 7

[pacman-dev] [PATCH] repo-add: quote filename for consistent output style
by Allan McRae 25 Sep '12

25 Sep '12

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/repo-add.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 504cae9..5a3bf23 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -208,7 +208,7 @@ create_signature() { gpg --detach-sign --use-agent ${SIGNWITHKEY} "$dbfile" &>/dev/null || ret=$? if (( ! ret )); then - msg2 "$(gettext "Created signature file %s.")" "${dbfile##*/.tmp.}.sig" + msg2 "$(gettext "Created signature file '%s'")" "${dbfile##*/.tmp.}.sig" else warning "$(gettext "Failed to sign package database.")" fi -- 1.7.12.1

1 0

[pacman-dev] [PATCH] makepkg: deprecate PKGBUILDs without a package() function
by Allan McRae 24 Sep '12

24 Sep '12

The package() function has been around since pacman-3.3 and has significant advantages including limited fakeroot usage and correct repackaging. The ability to use PKGBUILDs without a package function will be removed in a future release. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8a300cb..337ada9 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2785,6 +2785,10 @@ fi fullver=$(get_full_version) msg "$(gettext "Making package: %s")" "$pkgbase $fullver ($(date))" +if (( !PKGFUNC && !SPLITPKG )); then + warning "$(gettext "Using a %s without a %s function is deprecated.")" "$BUILDSCRIPT" "package()" +fi + # if we are creating a source-only package, go no further if (( SOURCEONLY )); then if [[ -f $SRCPKGDEST/${pkgbase}-${fullver}${SRCEXT} ]] \ -- 1.7.12.1

1 1

[pacman-dev] [PATCH 0/7] Split debugging symbols into separate package
by Allan McRae 23 Sep '12

23 Sep '12

This patchset allows makepkg to automatically create packages from the stripped debugging symbols. Patches 1, 4 and 6 are only mildly related... but a fixes that were "needed" along the way. The idea is to add options=('debug') to your PKGBUILD or in makepkg.conf and then makepkg will add DEBUG_CFLAGS and DEBUG_CXXFLAGS (defined in makepkg.conf) to their buildflag counterparts. When both "debug" and "strip" are specified in the options, the debug symbols are copied into a separate folder before the files are stripped. The main debugging symbols are in /usr/lib/debug/path/to/file (e.g. /usr/lib/debug/usr/bin/pacman) and are hardlinked if required. If the binary was linked with a build ID, the relevant symlinks in /usr/lib/debug/.build_id are created. Testing is needed... Allan McRae (7): makepkg: always run tidy_install on repackaging makepkg: add option to include debugging compiler flags makepkg: move debug symbol stripping to separate function makepkg: always use pkg/$pkgname as $pkgdir makepkg: strip debugging symbols into separate folder makepkg: output the name of the package being created makepkg: create package from stripped debug symbols doc/PKGBUILD.5.txt | 5 ++ doc/makepkg.conf.5.txt | 13 +++++ etc/makepkg.conf.in | 8 ++- scripts/makepkg.sh.in | 137 ++++++++++++++++++++++++++++++++++++++++--------- 4 files changed, 136 insertions(+), 27 deletions(-) -- 1.7.12.1

2 16