- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: Remove upx and optipng support
by Allan McRae 20 Feb '16

20 Feb '16

These options were added before libmakepkg allowed passes like this to be dropped in. I prefer only real core packaging tasks to be included in makepkg and additional things like this to be dropped in by a user or distribution that wants to support them. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- contrib/PKGBUILD.vim | 2 +- doc/PKGBUILD.5.txt | 6 ----- doc/makepkg.conf.5.txt | 10 +------- etc/makepkg.conf.in | 6 ++--- scripts/Makefile.am | 2 -- scripts/libmakepkg/tidy/optipng.sh.in | 44 --------------------------------- scripts/libmakepkg/tidy/upx.sh.in | 46 ----------------------------------- scripts/makepkg.sh.in | 16 ------------ scripts/po/POTFILES.in | 2 -- 9 files changed, 4 insertions(+), 130 deletions(-) delete mode 100644 scripts/libmakepkg/tidy/optipng.sh.in delete mode 100644 scripts/libmakepkg/tidy/upx.sh.in diff --git a/contrib/PKGBUILD.vim b/contrib/PKGBUILD.vim index 35ca6bd..110bbc7 100644 --- a/contrib/PKGBUILD.vim +++ b/contrib/PKGBUILD.vim @@ -211,7 +211,7 @@ hi def link pbValidSha512sums Number " options syn keyword pb_k_options options contained -syn match pbOptions /$no$\?$strip\|docs\|libtool\|emptydirs\|zipman\|purge\|upx\|optipng\|distcc\|color\|ccache\|check\|sign\|makeflags\|buildflags$/ contained +syn match pbOptions /$no$\?$strip\|docs\|libtool\|emptydirs\|zipman\|purge\|distcc\|color\|ccache\|check\|sign\|makeflags\|buildflags$/ contained syn match pbOptionsNeg /\!/ contained syn match pbOptionsDeprec /no/ contained syn region pbOptionsGroup start=/^options=(/ end=/)/ contains=pb_k_options,pbOptions,pbOptionsNeg,pbOptionsDeprec,pbIllegalOption diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index e410481..e19a81c 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -293,12 +293,6 @@ underscore and the architecture name e.g., 'replaces_x86_64=()'. *zipman*;; Compress man and info pages with gzip. - *upx*;; - Compress binary executable files using UPX. - - *optipng*;; - Optimize PNG images with optipng. - *ccache*;; Allow the use of ccache during build. More useful in its negative form `!ccache` with select packages that have problems building diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index e35eb8a..5bd3472 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -141,7 +141,7 @@ Options Specify a key to use for GPG signing instead of the default key in the keyring. Can be overridden with makepkg's '\--key' option. -**OPTIONS=(**strip docs libtool staticlibs emptydirs zipman purge !upx !optipng**)**:: +**OPTIONS=(**strip docs libtool staticlibs emptydirs zipman purge**)**:: This array contains options that affect default packaging. They are equivalent to options that can be placed in the PKGBUILD; the defaults are shown here. All options should always be left in the array; to enable or @@ -178,14 +178,6 @@ Options Remove files specified by the `PURGE_TARGETS` variable from the package. - *upx*;; - Compress binary executable files using UPX. Additional options - can be passed to UPX by specifying the `UPXFLAGS` array variable. - - *optipng*;; - Optimize PNG images with optipng. Additional options can be passed - to optipng by specifying the `OPTIPNGFLAGS` array variable. - *debug*;; Add the user-specified debug flags as specified in DEBUG_CFLAGS and DEBUG_CXXFLAGS to their counterpart buildflags. Creates a separate diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 71ec624..efac16a 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -71,7 +71,7 @@ BUILDENV=(!distcc color !ccache check !sign) # These are default values for the options=() settings ######################################################################### # -# Default: OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !optipng !debug) +# Default: OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !debug) # A negated option will do the opposite of the comments below. # #-- strip: Strip symbols from binaries/libraries @@ -81,11 +81,9 @@ BUILDENV=(!distcc color !ccache check !sign) #-- emptydirs: Leave empty directories in packages #-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip #-- purge: Remove files specified by PURGE_TARGETS -#-- upx: Compress binary executable files using UPX -#-- optipng: Optimize PNG images with optipng #-- debug: Add debugging flags as specified in DEBUG_* variables # -OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !optipng !debug) +OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !debug) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index d660c0b..6f9abb8 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -85,11 +85,9 @@ LIBMAKEPKG_IN = \ libmakepkg/tidy/docs.sh \ libmakepkg/tidy/emptydirs.sh \ libmakepkg/tidy/libtool.sh \ - libmakepkg/tidy/optipng.sh \ libmakepkg/tidy/purge.sh \ libmakepkg/tidy/staticlibs.sh \ libmakepkg/tidy/strip.sh \ - libmakepkg/tidy/upx.sh \ libmakepkg/tidy/zipman.sh \ libmakepkg/util.sh \ libmakepkg/util/pkgbuild.sh \ diff --git a/scripts/libmakepkg/tidy/optipng.sh.in b/scripts/libmakepkg/tidy/optipng.sh.in deleted file mode 100644 index 4c07674..0000000 --- a/scripts/libmakepkg/tidy/optipng.sh.in +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash -# -# optipng.sh - Compress PNG files using optpng -# -# Copyright (c) 2015-2016 Pacman Development Team <pacman-dev(a)archlinux.org> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# - -[[ -n "$LIBMAKEPKG_TIDY_OPTIPNG_SH" ]] && return -LIBMAKEPKG_TIDY_OPTIPNG_SH=1 - -LIBRARY=${LIBRARY:-'@libmakepkgdir@'} - -source "$LIBRARY/util/message.sh" -source "$LIBRARY/util/option.sh" - - -packaging_options+=('optipng') -tidy_modify+=('tidy_optipng') - -tidy_optipng() { - if check_option "optipng" "y"; then - msg2 "$(gettext "Optimizing PNG images...")" - local png - find . -type f -iname "*.png" 2>/dev/null | while read -r png ; do - if [[ $(file --brief --mime-type "$png") = 'image/png' ]]; then - optipng "${OPTIPNGFLAGS[@]}" "$png" &>/dev/null || - warning "$(gettext "Could not optimize PNG image : %s")" "${png/$pkgdir\//}" - fi - done - fi -} diff --git a/scripts/libmakepkg/tidy/upx.sh.in b/scripts/libmakepkg/tidy/upx.sh.in deleted file mode 100644 index f638335..0000000 --- a/scripts/libmakepkg/tidy/upx.sh.in +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash -# -# upx.sh - Compress package binaries with UPX -# -# Copyright (c) 2011-2016 Pacman Development Team <pacman-dev(a)archlinux.org> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# - -[[ -n "$LIBMAKEPKG_TIDY_UPX_SH" ]] && return -LIBMAKEPKG_TIDY_UPX_SH=1 - -LIBRARY=${LIBRARY:-'@libmakepkgdir@'} - -source "$LIBRARY/util/message.sh" -source "$LIBRARY/util/option.sh" - - -packaging_options+=('upx') -tidy_modify+=('tidy_upx') - -tidy_upx() { - if check_option "upx" "y"; then - msg2 "$(gettext "Compressing binaries with %s...")" "UPX" - local binary - find . -type f -perm -u+w 2>/dev/null | while read -r binary ; do - case "$(file --brief --mime-type "$binary")" in - 'application/x-executable' | 'application/x-dosexec') - upx "${UPXFLAGS[@]}" "$binary" &>/dev/null || - warning "$(gettext "Could not compress binary : %s")" "${binary/$pkgdir\//}" - ;; - esac - done - fi -} diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 29ccaad..fc299eb 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1549,22 +1549,6 @@ check_software() { fi fi - # upx - binary compression - if check_option "upx" "y"; then - if ! type -p upx >/dev/null; then - error "$(gettext "Cannot find the %s binary required for compressing binaries.")" "upx" - ret=1 - fi - fi - - # optipng - PNG image optimization - if check_option "optipng" "y"; then - if ! type -p optipng >/dev/null; then - error "$(gettext "Cannot find the %s binary required for optimizing PNG images.")" "optipng" - ret=1 - fi - fi - # distcc - compilation with distcc if check_buildoption "distcc" "y"; then if ! type -p distcc >/dev/null; then diff --git a/scripts/po/POTFILES.in b/scripts/po/POTFILES.in index 3ac5a43..d115d89 100644 --- a/scripts/po/POTFILES.in +++ b/scripts/po/POTFILES.in @@ -40,11 +40,9 @@ scripts/libmakepkg/tidy.sh.in scripts/libmakepkg/tidy/docs.sh.in scripts/libmakepkg/tidy/emptydirs.sh.in scripts/libmakepkg/tidy/libtool.sh.in -scripts/libmakepkg/tidy/optipng.sh.in scripts/libmakepkg/tidy/purge.sh.in scripts/libmakepkg/tidy/staticlibs.sh.in scripts/libmakepkg/tidy/strip.sh.in -scripts/libmakepkg/tidy/upx.sh.in scripts/libmakepkg/tidy/zipman.sh.in scripts/libmakepkg/util/message.sh scripts/libmakepkg/util/source.sh.in -- 2.7.1

2 1

[pacman-dev] [PATCH] alpm-hooks.5: document hook running order
by Allan McRae 20 Feb '16

20 Feb '16

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Not sure if this is worded correctly... Suggestions welcome. doc/alpm-hooks.5.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/alpm-hooks.5.txt b/doc/alpm-hooks.5.txt index 979af49..7c523e2 100644 --- a/doc/alpm-hooks.5.txt +++ b/doc/alpm-hooks.5.txt @@ -34,7 +34,8 @@ libalpm provides the ability to specify hooks to run before or after transactions based on the packages and/or files being modified. Hooks consist of a single '[Action]' section describing the action to be run and one or more '[Trigger]' section describing which transactions it should be run for. Hook -file names are required to have the suffix ".hook". +file names are required to have the suffix ".hook". Hooks are run in +alphabetical order of their file name. TRIGGERS -------- -- 2.7.1

1 0

[pacman-dev] [PATCH] test version range restrictions corner case
by Dominik Fischer 19 Feb '16

19 Feb '16

The test introduced herein illustrates a behavior that may be unexpected to package writers. It creates a package "pkg3" that is configured to depend on a "dependency" which version is between 3 and 4, inclusive. Two other packages are already present, providing "dependency" in version 2 and 5, respectively. So, the situation looks roughly like this: pkg1 pkg3 pkg2 provides depends on provides | <------------> | version __________2____________3____________4____________5___________... This seems to be enough to satisfy pacman when installing "pkg3". From an iterative standpoint, this is completely logical: First, the requirement "dependency>=3" is checked. There is a package that satisfies this restriction, it is called "pkg2". Afterwards, "dependency<=4" is covered in the same way by "pkg1". Nonetheless, what a package writer intends when specifying depends=('dependency>=3' 'dependency<=4') is most probably that pacman should only allow this package to be installed when there indeed is a package present that provides a version of "dependency" that lies _between_ 3 and 5. Signed-off-by: Dominik Fischer <d dot f dot fischer at web dot de> --- This behavior may be intended though. If so, this corner case should perhaps be noted in the documentation. Please review and comment. test/pacman/tests/TESTS | 1 + test/pacman/tests/deprange001.py | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 test/pacman/tests/deprange001.py diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index bee7c8e..f35ec1a 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -15,6 +15,7 @@ TESTS += test/pacman/tests/depconflict110.py TESTS += test/pacman/tests/depconflict111.py TESTS += test/pacman/tests/depconflict120.py TESTS += test/pacman/tests/dependency-cycle-fixed-by-upgrade.py +TESTS += test/pacman/tests/deprange001.py TESTS += test/pacman/tests/deptest001.py TESTS += test/pacman/tests/dummy001.py TESTS += test/pacman/tests/epoch001.py diff --git a/test/pacman/tests/deprange001.py b/test/pacman/tests/deprange001.py new file mode 100644 index 0000000..bab52fa --- /dev/null +++ b/test/pacman/tests/deprange001.py @@ -0,0 +1,17 @@ +self.description = "undetected conflict with version range" + +lp1 = pmpkg("pkg1") +lp1.provides = ["dependency=2"] +self.addpkg2db("local", lp1) + +lp2 = pmpkg("pkg2") +lp2.provides = ["dependency=5"] +self.addpkg2db("local", lp2) + +p = pmpkg("pkg3") +p.depends = ["dependency>3", "dependency<4"] +self.addpkg(p) + +self.args = "-U %s" % p.filename() +self.addrule("PACMAN_RETCODE=1") +self.addrule("!PKG_EXIST=pkg3") -- 2.6.3

4 8

[pacman-dev] [PATCH] RFC: remove upx and optipng support from makepkg
by Allan McRae 17 Feb '16

17 Feb '16

These options were added before libmakepkg allowed passes like this to be dropped in. I prefer only real core packaging tasks to be included in makepkg and additional things like this to be dropped in by a user or distribution that wants to support them. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- BAH! I reluctently accepted the optipng patch before I split out libmakepkg. I never thought of removing it before it saw a release... scripts/Makefile.am | 2 -- scripts/libmakepkg/tidy/optipng.sh.in | 44 --------------------------------- scripts/libmakepkg/tidy/upx.sh.in | 46 ----------------------------------- scripts/po/POTFILES.in | 2 -- 4 files changed, 94 deletions(-) delete mode 100644 scripts/libmakepkg/tidy/optipng.sh.in delete mode 100644 scripts/libmakepkg/tidy/upx.sh.in diff --git a/scripts/Makefile.am b/scripts/Makefile.am index d660c0b..6f9abb8 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -85,11 +85,9 @@ LIBMAKEPKG_IN = \ libmakepkg/tidy/docs.sh \ libmakepkg/tidy/emptydirs.sh \ libmakepkg/tidy/libtool.sh \ - libmakepkg/tidy/optipng.sh \ libmakepkg/tidy/purge.sh \ libmakepkg/tidy/staticlibs.sh \ libmakepkg/tidy/strip.sh \ - libmakepkg/tidy/upx.sh \ libmakepkg/tidy/zipman.sh \ libmakepkg/util.sh \ libmakepkg/util/pkgbuild.sh \ diff --git a/scripts/libmakepkg/tidy/optipng.sh.in b/scripts/libmakepkg/tidy/optipng.sh.in deleted file mode 100644 index 4c07674..0000000 --- a/scripts/libmakepkg/tidy/optipng.sh.in +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash -# -# optipng.sh - Compress PNG files using optpng -# -# Copyright (c) 2015-2016 Pacman Development Team <pacman-dev(a)archlinux.org> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# - -[[ -n "$LIBMAKEPKG_TIDY_OPTIPNG_SH" ]] && return -LIBMAKEPKG_TIDY_OPTIPNG_SH=1 - -LIBRARY=${LIBRARY:-'@libmakepkgdir@'} - -source "$LIBRARY/util/message.sh" -source "$LIBRARY/util/option.sh" - - -packaging_options+=('optipng') -tidy_modify+=('tidy_optipng') - -tidy_optipng() { - if check_option "optipng" "y"; then - msg2 "$(gettext "Optimizing PNG images...")" - local png - find . -type f -iname "*.png" 2>/dev/null | while read -r png ; do - if [[ $(file --brief --mime-type "$png") = 'image/png' ]]; then - optipng "${OPTIPNGFLAGS[@]}" "$png" &>/dev/null || - warning "$(gettext "Could not optimize PNG image : %s")" "${png/$pkgdir\//}" - fi - done - fi -} diff --git a/scripts/libmakepkg/tidy/upx.sh.in b/scripts/libmakepkg/tidy/upx.sh.in deleted file mode 100644 index f638335..0000000 --- a/scripts/libmakepkg/tidy/upx.sh.in +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash -# -# upx.sh - Compress package binaries with UPX -# -# Copyright (c) 2011-2016 Pacman Development Team <pacman-dev(a)archlinux.org> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# - -[[ -n "$LIBMAKEPKG_TIDY_UPX_SH" ]] && return -LIBMAKEPKG_TIDY_UPX_SH=1 - -LIBRARY=${LIBRARY:-'@libmakepkgdir@'} - -source "$LIBRARY/util/message.sh" -source "$LIBRARY/util/option.sh" - - -packaging_options+=('upx') -tidy_modify+=('tidy_upx') - -tidy_upx() { - if check_option "upx" "y"; then - msg2 "$(gettext "Compressing binaries with %s...")" "UPX" - local binary - find . -type f -perm -u+w 2>/dev/null | while read -r binary ; do - case "$(file --brief --mime-type "$binary")" in - 'application/x-executable' | 'application/x-dosexec') - upx "${UPXFLAGS[@]}" "$binary" &>/dev/null || - warning "$(gettext "Could not compress binary : %s")" "${binary/$pkgdir\//}" - ;; - esac - done - fi -} diff --git a/scripts/po/POTFILES.in b/scripts/po/POTFILES.in index 3ac5a43..d115d89 100644 --- a/scripts/po/POTFILES.in +++ b/scripts/po/POTFILES.in @@ -40,11 +40,9 @@ scripts/libmakepkg/tidy.sh.in scripts/libmakepkg/tidy/docs.sh.in scripts/libmakepkg/tidy/emptydirs.sh.in scripts/libmakepkg/tidy/libtool.sh.in -scripts/libmakepkg/tidy/optipng.sh.in scripts/libmakepkg/tidy/purge.sh.in scripts/libmakepkg/tidy/staticlibs.sh.in scripts/libmakepkg/tidy/strip.sh.in -scripts/libmakepkg/tidy/upx.sh.in scripts/libmakepkg/tidy/zipman.sh.in scripts/libmakepkg/util/message.sh scripts/libmakepkg/util/source.sh.in -- 2.7.0

5 6

[pacman-dev] [Pacman v5.0.0] alias: -g: invalid option
by 秦凡东 16 Feb '16

16 Feb '16

Hi When I install/uninstall/upgrade some package, pacman will report "alias: -g: invalid option". This is only for pacman 5.0, and everything is well for pacman 4.X. These `alias -g` are from my profile for zsh, `alias -g` is avaliable in zsh, but not in bash. I noticed that pacman will run **bash** sometime. I think this is the reason of this issue. For more info you can see: https://github.com/Arondight/profile/blob/master/zsh/.zsh/alias/global_alia… and (I do not good at English so I write in Chinese) https://github.com/Arondight/profile/issues/1 Here is the log: debug: updating database debug: adding database entry 'libreoffice-fresh' debug: writing libreoffice-fresh-5.1.0-1 DESC information back to db debug: writing libreoffice-fresh-5.1.0-1 FILES information back to db debug: adding entry 'libreoffice-fresh' in 'local' cache debug: executing ". /tmp/alpm_K4Tgli/.INSTALL; post_install 5.1.0-1" debug: executing "/usr/bin/bash" under chroot "/" /home/ispeller/.zsh/alias/global_alias.zsh: line 13: alias: -g: invalid option alias: usage: alias [-p] [name[=value] ... ] /home/ispeller/.zsh/alias/global_alias.zsh: line 20: alias: -g: invalid option alias: usage: alias [-p] [name[=value] ... ] /home/ispeller/.zsh/alias/global_alias.zsh: line 21: alias: -g: invalid option alias: usage: alias [-p] [name[=value] ... ] /home/ispeller/.zsh/alias/global_alias.zsh: line 22: alias: -g: invalid option alias: usage: alias [-p] [name[=value] ... ] /home/ispeller/.zsh/alias/global_alias.zsh: line 23: alias: -g: invalid option alias: usage: alias [-p] [name[=value] ... ] debug: call to waitpid succeeded I don't kown whether it is a bug, I am very sorry if this is not a bug. ------------------ /************************* * 秦凡东 * arondight.me * @Arondight *************************/

3 4

[pacman-dev] [PATCH] makepkg: optionally attach minimal debuginfo to binaries
by Leo Wolf 16 Feb '16

16 Feb '16

The "minidebug" option adds a .gdb_debugdata section to executables and shared libraries containing LZMA compressed function symbols. GDB (and by extension systemd-coredump) can use this information to display useful backtraces without full debuginfo being installed. (see https://sourceware.org/gdb/onlinedocs/gdb/MiniDebugInfo.html) This benefit comes at the cost of slightly increased binary sizes. (https://fedoraproject.org/wiki/Features/MiniDebugInfo#Detailed_Description) Signed-off-by: Leo Wolf <jclw(a)jclw.de> --- doc/makepkg.conf.5.txt | 10 +++++++ scripts/libmakepkg/tidy/strip.sh.in | 60 +++++++++++++++++++++++++++++++++---- scripts/makepkg.sh.in | 2 +- 3 files changed, 66 insertions(+), 6 deletions(-) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index e35eb8a..b86fd04 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -191,6 +191,16 @@ Options DEBUG_CXXFLAGS to their counterpart buildflags. Creates a separate package containing the debug symbols when used with `strip'. + *minidebug*;; + Enable useful backtraces at the cost of slightly larger binaries by + adding a section containing compressed function symbols to stripped + executables and shared libraries. (see + https://sourceware.org/gdb/onlinedocs/gdb/MiniDebugInfo.html) Like + `debug', this option will add the user-specified debug flags as + specified in DEBUG_CFLAGS and DEBUG_CXXFLAGS to their counterpart + buildflags. `minidebug' is only useful with `strip', but can be used + with or without `debug'. + **INTEGRITY_CHECK=(**check1 ...**)**:: File integrity checks to use. Multiple checks may be specified; this affects both generation and checking. The current valid options are: diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in index 1c7aacf..184502d 100644 --- a/scripts/libmakepkg/tidy/strip.sh.in +++ b/scripts/libmakepkg/tidy/strip.sh.in @@ -37,6 +37,7 @@ build_id() { strip_file() { local binary=$1; shift + local minidebug_applicable=$1; shift if check_option "debug" "y"; then local bid=$(build_id "$binary") @@ -76,7 +77,51 @@ strip_file() { fi fi + # Generate minidebuginfo if requested + if check_option "minidebug" "y" && [[ $minidebug_applicable == "y" ]]; then + # make sure not to operate on the same file twice + if ! check_option "debug" "y" && objdump -h "$binary" | grep -q .gnu_debugdata; then + return; + fi + if ! check_option "debug" "y"; then + local debug=$(mktemp) + objcopy --only-keep-debug "$binary" "$debug" + else + local debug="$dbgdir/$binary.debug" + fi + add_minidebug "$binary" "$debug" + if ! check_option "debug" "y"; then + rm -f "$debug" + fi + fi + strip $@ "$binary" + +} + + +# This function is based on the one written for use in RPM by Alexander Larsson. +# (https://bugzilla.redhat.com/attachment.cgi?id=594198) +add_minidebug() { + local dynsyms=$(mktemp) + local funcsyms=$(mktemp) + local keep_symbols=$(mktemp) + # Extract the dynamic symbols from the main binary, there is no need to also have these + LC_ALL=C nm -D "$1" --format=posix --defined-only | awk '{ print $1 }' | sort > "$dynsyms" + # Extract all function symbols (see https://bugzilla.redhat.com/show_bug.cgi?id=1052415#c11) + LC_ALL=C nm "$1" --format=sysv --defined-only | awk -F \| '{ if ($4 ~ "FUNC") print $1 }' | sort > "$funcsyms" + # Keep all the function symbols not already in the dynamic symbol table + LC_ALL=C comm -13 "$dynsyms" "$funcsyms" > "$keep_symbols" + if [[ -s "$keep_symbols" ]]; then + local minidebug=$(mktemp) + # Copy the full debuginfo, keeping only a minimal set of symbols and removing some unnecessary sections. + objcopy --strip-all --remove-section .gdb_index --remove-section .comment --keep-symbols="$keep_symbols" \ + "$2" "$minidebug" + xz "$minidebug" + objcopy --add-section .gnu_debugdata="$minidebug.xz" "$binary" + rm -f "$minidebug.xz" + fi + rm -f "$dynsyms" "$funcsyms" "$keep_symbols" } @@ -93,25 +138,30 @@ tidy_strip() { fi local binary strip_flags + local minidebug_applicable # MiniDebugInfo is only useful with shared libraries and executables find . -type f -perm -u+w -print0 2>/dev/null | while read -rd '' binary ; do case "$(file -bi "$binary")" in *application/x-sharedlib*) # Libraries (.so) - strip_flags="$STRIP_SHARED";; + strip_flags="$STRIP_SHARED" + minidebug_applicable="y";; *application/x-archive*) # Libraries (.a) - strip_flags="$STRIP_STATIC";; + strip_flags="$STRIP_STATIC" + minidebug_applicable="n";; *application/x-object*) case "$binary" in *.ko) # Kernel module - strip_flags="$STRIP_SHARED";; + strip_flags="$STRIP_SHARED" + minidebug_applicable="n";; *) continue;; esac;; *application/x-executable*) # Binaries - strip_flags="$STRIP_BINARIES";; + strip_flags="$STRIP_BINARIES" + minidebug_applicable="y";; *) continue ;; esac - strip_file "$binary" ${strip_flags} + strip_file "$binary" $minidebug_applicable ${strip_flags} done fi } diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 80b95f4..b6195b5 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -791,7 +791,7 @@ run_function() { unset CPPFLAGS CFLAGS CXXFLAGS LDFLAGS fi - if check_option "debug" "y"; then + if check_option "debug" "y" || check_option "minidebug" "y"; then CFLAGS+=" $DEBUG_CFLAGS" CXXFLAGS+=" $DEBUG_CXXFLAGS" fi -- 2.7.0

3 4

[pacman-dev] [PATCH] makepkg: remove pkg from OPT_LONG array
by Allan McRae 16 Feb '16

16 Feb '16

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 1c3758b..29ccaad 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1772,7 +1772,7 @@ OPT_SHORT="AcCdefFghiLmop:rRsSV" OPT_LONG=('allsource' 'check' 'clean' 'cleanbuild' 'config:' 'force' 'geninteg' 'help' 'holdver' 'ignorearch' 'install' 'key:' 'log' 'noarchive' 'nobuild' 'nocolor' 'nocheck' 'nodeps' 'noextract' 'noprepare' 'nosign' 'packagelist' - 'pkg:' 'printsrcinfo' 'repackage' 'rmdeps' 'sign' 'skipchecksums' 'skipinteg' + 'printsrcinfo' 'repackage' 'rmdeps' 'sign' 'skipchecksums' 'skipinteg' 'skippgpcheck' 'source' 'syncdeps' 'verifysource' 'version') # Pacman Options -- 2.7.1

1 0

[pacman-dev] makepkg --pkg for selective installation of split packages
by Xyne 15 Feb '16

15 Feb '16

Hi, I completely missed the discussion in September about removing the "--pkg" option from makepkg. Without that option, "makepkg -irs" can only be used to install all packages from a split PKGBUILD, but a user often wants to install just one package (e.g [1]). Makepkg's automatic dependency resolution and installation is very useful for automation, and scripting "pacman -U" requires assumptions about expected package names that are likely error-prone and thus not a viable alternative. I opened a bug report about this before seeing the thread. I bring it up here for further discussion as this is where its removal was discussed. Regards, Xyne [1] https://bbs.archlinux.org/viewtopic.php?pid=1604418#p1604418

3 10

[pacman-dev] [PATCH] Revert "makepkg: Empty/create only $pkgdir's relevant to current PKGBUILD"
by Allan McRae 12 Feb '16

12 Feb '16

This reverts commit f9423cfa5d5b9f2041b70676438082faad1cd1ee. This created issue when building packages with debug info multiple times. It could be fixed, but it confirmed my initial opinion that keeping other directories in $pkgdirbase was wrong. Use different BUILDDIRs if you want to build different things from a single PKGBUILD. --- scripts/makepkg.sh.in | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 16c21b7..1c3758b 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2223,13 +2223,10 @@ if (( NOBUILD )); then msg "$(gettext "Sources are ready.")" exit 0 #E_OK else - # clean existing pkg directories + # clean existing pkg directory if [[ -d $pkgdirbase ]]; then msg "$(gettext "Removing existing %s directory...")" "\$pkgdir/" - for pkg in "${pkgname[@]}"; do - rm -rf "$pkgdirbase/$pkg" - done - unset pkg + rm -rf "$pkgdirbase" fi mkdir -p "$pkgdirbase" chmod a-srw "$pkgdirbase" -- 2.7.1

2 1

[pacman-dev] repo-add -v
by Johannes Ernst 08 Feb '16

08 Feb '16

repo-add -v something.db.tar.xz (no packages to add) works without complaint. But then if I run it again, it says “bad signature”. This is quite befuddling. Suggestion: disallow the invocation above, on the grounds that -v is not a standalone verify operation (which I originally thought it was) but one that is supposed to verify the db before actually adding something. Or allow the invocation, and make it a standalone verification operation that does not change the tar file or the signature. My $0.02 Cheers, Johannes. Johannes Ernst upon2020.com <http://upon2020.com/> @Johannes_Ernst GPG: http://upon2020.com/public/pubkey.txt <http://upon2020.com/public/pubkey.txt> Check out UBOS, the Linux distro for personal servers I work on: http://ubos.net/ <http://ubos.net/>

2 1