[pacman-dev] [PATCH 0/7] Split debugging symbols into separate package

older
[pacman-dev] Dropping support for...

Allan McRae

23 Sep 2012 23 Sep '12

2:44 p.m.

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

Show replies by date

Allan McRae

23 Sep 23 Sep

2:44 p.m.

New subject: [pacman-dev] [PATCH 1/7] makepkg: always run tidy_install on repackaging

When using "makepkg -R" without a packge function, we should still run tidy_install as the user might have added other packaging options such as (e.g.) '!emptydir' to remove enpty directories on repackaging. Of course we can not revert some options when repackaging without a package function. Signed-off-by: Allan McRae --- scripts/makepkg.sh.in | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d387b7d..40e8c2f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2669,7 +2669,6 @@ if (( INFAKEROOT )); then if (( BUILDFUNC )); then run_build (( CHECKFUNC )) && run_check - tidy_install fi else warning "$(gettext "Repackaging without the use of a %s function is deprecated.")" "package()" @@ -2677,8 +2676,8 @@ if (( INFAKEROOT )); then fi else run_package - tidy_install fi + tidy_install create_package else run_split_packaging @@ -2808,15 +2807,11 @@ else if (( ! SPLITPKG )); then if (( PKGFUNC )); then run_package - tidy_install - else - if (( ! REPKG )); then - tidy_install - else + elif (( REPKG )); then warning "$(gettext "Repackaging without the use of a %s function is deprecated.")" "package()" plain "$(gettext "File permissions may not be preserved.")" - fi fi + tidy_install create_package else run_split_packaging -- 1.7.12.1

Dave Reisner

3:49 p.m.

New subject: [pacman-dev] [PATCH 1/7] makepkg: always run tidy_install on repackaging

On Mon, Sep 24, 2012 at 12:44:29AM +1000, Allan McRae wrote:

...

When using "makepkg -R" without a packge function, we should still run tidy_install as the user might have added other packaging options such as (e.g.) '!emptydir' to remove enpty directories on repackaging. Of course we can not revert some options when repackaging without a package function.

Ack, assuming you fix the typos in the commit message.

...

Signed-off-by: Allan McRae --- scripts/makepkg.sh.in | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d387b7d..40e8c2f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2669,7 +2669,6 @@ if (( INFAKEROOT )); then if (( BUILDFUNC )); then run_build (( CHECKFUNC )) && run_check - tidy_install fi else warning "$(gettext "Repackaging without the use of a %s function is deprecated.")" "package()" @@ -2677,8 +2676,8 @@ if (( INFAKEROOT )); then fi else run_package - tidy_install fi + tidy_install create_package else run_split_packaging @@ -2808,15 +2807,11 @@ else if (( ! SPLITPKG )); then if (( PKGFUNC )); then run_package - tidy_install - else - if (( ! REPKG )); then - tidy_install - else + elif (( REPKG )); then warning "$(gettext "Repackaging without the use of a %s function is deprecated.")" "package()"

Isn't it time we made this an error?

...

plain "$(gettext "File permissions may not be preserved.")" - fi fi + tidy_install create_package else run_split_packaging -- 1.7.12.1

Allan McRae

11:51 p.m.

New subject: [pacman-dev] [PATCH 1/7] makepkg: always run tidy_install on repackaging

On 24/09/12 01:49, Dave Reisner wrote:

...

...
+ elif (( REPKG )); then

...
warning "$(gettext "Repackaging without the use of a %s function is deprecated.")" "package()"

Isn't it time we made this an error?

I just looked up when we introduced the package() function and it was more than three years ago... I suggest we just remove support of PKGBUILDs without a package() function. This would make it easy to unify the single and split packaging. Do we just do that straight away for pacman-4.1, or add a deprecation notice whenever there is a build() function but no package()? Allan

Allan McRae

2:44 p.m.

New subject: [pacman-dev] [PATCH 2/7] makepkg: add option to include debugging compiler flags

Add a "debug" option that appends the compiler flags specified in the variables DEBUG_CFLAGS and DEBUG_CXXFLAGS in makepkg.conf to their counterpart buildflags. Signed-off-by: Allan McRae --- doc/PKGBUILD.5.txt | 3 +++ doc/makepkg.conf.5.txt | 12 ++++++++++++ etc/makepkg.conf.in | 8 ++++++-- scripts/makepkg.sh.in | 8 +++++++- 4 files changed, 28 insertions(+), 3 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 0dca4a2..113e2c4 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -274,6 +274,9 @@ A normal sync or upgrade will not use its value. `!makeflags` with select packages that have problems building with custom makeflags such as `-j2` (or higher). + *debug*;; + Add the user-specified debug flags (DEBUG_CFLAGS, DEBUG_CXXFLAGS) to + their counterpart buildflags as specified in linkman:makepkg.conf[5]. build() Function ---------------- diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 3dbaea1..cf7026c 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -77,6 +77,14 @@ Options This is often used to set the number of jobs used, for example, `-j2`. Other flags that make accepts can also be passed. +**DEBUG_CFLAGS=**"debug_cflags":: + Additional compiler flags appended to CFLAGS for use in debugging. Usually + this would include: ``-g''. Read gcc(1) for more details on the wide + variety of compiler flags available. + +**DEBUG_CXXFLAGS=**"debug_cxxflags":: + Debug flags used for the C++ compiler; see DEBUG_CFLAGS for more info. + **BUILDENV=(**fakeroot !distcc color !ccache check !sign**)**:: This array contains options that affect the build environment, the defaults are shown here. All options should always be left in the array; to enable @@ -165,6 +173,10 @@ Options Compress binary executable files using UPX. Additional options can be passed to UPX by specifying the `UPXFLAGS` variable. + *debug*;; + Add the user-specified debug flags as specified in DEBUG_CFLAGS and + DEBUG_CXXFLAGS to their counterpart buildflags. + **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/etc/makepkg.conf.in b/etc/makepkg.conf.in index dcec6f5..0de85c9 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -33,6 +33,9 @@ CHOST="@CHOST@" #LDFLAGS="" #-- Make Flags: change this for DistCC/SMP systems #MAKEFLAGS="-j2" +#-- Debugging flags +#DEBUG_CFLAGS="-g" +#DEBUG_CXXFLAGS="-g" ######################################################################### # BUILD ENVIRONMENT @@ -62,7 +65,7 @@ BUILDENV=(fakeroot !distcc color !ccache check !sign) # These are default values for the options=() settings ######################################################################### # -# Default: OPTIONS=(strip docs libtool emptydirs zipman purge !upx) +# Default: OPTIONS=(strip docs libtool emptydirs zipman purge !upx !debug) # A negated option will do the opposite of the comments below. # #-- strip: Strip symbols from binaries/libraries @@ -72,8 +75,9 @@ BUILDENV=(fakeroot !distcc color !ccache check !sign) #-- 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 +#-- debug: Add debugging flags as specified in DEBUG_* variables # -OPTIONS=(strip docs libtool emptydirs zipman purge !upx) +OPTIONS=(strip docs libtool emptydirs zipman purge !upx !debug) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 40e8c2f..7b516ff 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -44,7 +44,8 @@ declare -r confdir='@sysconfdir@' declare -r BUILDSCRIPT='@BUILDSCRIPT@' declare -r startdir="$PWD" -packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'purge' 'upx') +packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'purge' 'upx' \ + 'debug') other_options=('ccache' 'distcc' 'buildflags' 'makeflags') splitpkg_overrides=('pkgver' 'pkgrel' 'epoch' 'pkgdesc' 'arch' 'url' 'license' \ 'groups' 'depends' 'optdepends' 'provides' 'conflicts' \ @@ -1335,6 +1336,11 @@ run_function() { unset CPPFLAGS CFLAGS CXXFLAGS LDFLAGS fi + if check_option "debug" "y"; then + CFLAGS+=" $DEBUG_CFLAGS" + CXXFLAGS+=" $DEBUG_CXXFLAGS" + fi + # clear user-specified makeflags if requested if check_option "makeflags" "n"; then unset MAKEFLAGS -- 1.7.12.1

Allan McRae

2:44 p.m.

New subject: [pacman-dev] [PATCH 3/7] makepkg: move debug symbol stripping to separate function

Move stripping of files to a spearate function that will be expanded for the handling of creating debug symbol packages. Signed-off-by: Allan McRae --- scripts/makepkg.sh.in | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 7b516ff..5283d73 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1421,6 +1421,11 @@ run_package() { run_function_safe "$pkgfunc" } +strip_file() { + local binary=$1; shift + strip $@ $binary +} + tidy_install() { cd_safe "$pkgdir" msg "$(gettext "Tidying install...")" @@ -1475,16 +1480,19 @@ tidy_install() { # make sure library stripping variables are defined to prevent excess stripping [[ -z ${STRIP_SHARED+x} ]] && STRIP_SHARED="-S" [[ -z ${STRIP_STATIC+x} ]] && STRIP_STATIC="-S" - local binary + local binary strip_flags find . -type f -perm -u+w -print0 2>/dev/null | while read -d '' binary ; do case "$(file -bi "$binary")" in *application/x-sharedlib*) # Libraries (.so) - strip $STRIP_SHARED "$binary";; + strip_flags=($STRIP_SHARED);; *application/x-archive*) # Libraries (.a) - strip $STRIP_STATIC "$binary";; + strip_flags=($STRIP_STATIC);; *application/x-executable*) # Binaries - strip $STRIP_BINARIES "$binary";; + strip_flags=($STRIP_BINARIES);; + *) + continue ;; esac + strip_file $binary ${strip_flags[@]} done fi -- 1.7.12.1

Dave Reisner

3:53 p.m.

New subject: [pacman-dev] [PATCH 3/7] makepkg: move debug symbol stripping to separate function

On Mon, Sep 24, 2012 at 12:44:31AM +1000, Allan McRae wrote:

...

Move stripping of files to a spearate function that will be expanded for the handling of creating debug symbol packages.

Signed-off-by: Allan McRae --- scripts/makepkg.sh.in | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 7b516ff..5283d73 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1421,6 +1421,11 @@ run_package() { run_function_safe "$pkgfunc" }

+strip_file() { + local binary=$1; shift + strip $@ $binary

"$binary"

...

+} + tidy_install() { cd_safe "$pkgdir" msg "$(gettext "Tidying install...")" @@ -1475,16 +1480,19 @@ tidy_install() { # make sure library stripping variables are defined to prevent excess stripping [[ -z ${STRIP_SHARED+x} ]] && STRIP_SHARED="-S" [[ -z ${STRIP_STATIC+x} ]] && STRIP_STATIC="-S" - local binary + local binary strip_flags find . -type f -perm -u+w -print0 2>/dev/null | while read -d '' binary ; do case "$(file -bi "$binary")" in *application/x-sharedlib*) # Libraries (.so) - strip $STRIP_SHARED "$binary";; + strip_flags=($STRIP_SHARED);;

This is a little strange since $STRIP_SHARED and friends are simple variables. Why not just leave it as a simple string assignment?

...

*application/x-archive*) # Libraries (.a) - strip $STRIP_STATIC "$binary";; + strip_flags=($STRIP_STATIC);; *application/x-executable*) # Binaries - strip $STRIP_BINARIES "$binary";; + strip_flags=($STRIP_BINARIES);; + *) + continue ;; esac + strip_file $binary ${strip_flags[@]}

"$binary"

...

done fi

-- 1.7.12.1

Allan McRae

2:44 p.m.

New subject: [pacman-dev] [PATCH 4/7] makepkg: always use pkg/$pkgname as $pkgdir

Unify split and single packages to always use a folder within pkg/ as thier $pkgdir. This will allow a folder for storing a package with stripped debug symbols to be added within pkg/ too. Signed-off-by: Allan McRae --- scripts/makepkg.sh.in | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 5283d73..c857060 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2678,6 +2678,9 @@ if (( INFAKEROOT )); then fi if (( ! SPLITPKG )); then + pkgdir="$pkgdir/$pkgname" + mkdir -p "$pkgdir" + chmod a-s "$pkgdir" if (( ! PKGFUNC )); then if (( ! REPKG )); then if (( BUILDFUNC )); then @@ -2693,6 +2696,7 @@ if (( INFAKEROOT )); then fi tidy_install create_package + pkgdir="${pkgdir%/*}" else run_split_packaging fi @@ -2819,6 +2823,9 @@ else (( CHECKFUNC )) && run_check fi if (( ! SPLITPKG )); then + pkgdir="$pkgdir/$pkgname" + mkdir -p "$pkgdir" + chmod a-s "$pkgdir" if (( PKGFUNC )); then run_package elif (( REPKG )); then @@ -2827,6 +2834,7 @@ else fi tidy_install create_package + pkgdir="${pkgdir%/*}" else run_split_packaging fi -- 1.7.12.1

Dave Reisner

3:55 p.m.

New subject: [pacman-dev] [PATCH 4/7] makepkg: always use pkg/$pkgname as $pkgdir

On Mon, Sep 24, 2012 at 12:44:32AM +1000, Allan McRae wrote:

...

Unify split and single packages to always use a folder within pkg/ as thier $pkgdir. This will allow a folder for storing a package with stripped debug symbols to be added within pkg/ too.

Signed-off-by: Allan McRae --- scripts/makepkg.sh.in | 8 ++++++++ 1 file changed, 8 insertions(+)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 5283d73..c857060 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2678,6 +2678,9 @@ if (( INFAKEROOT )); then fi

if (( ! SPLITPKG )); then + pkgdir="$pkgdir/$pkgname" + mkdir -p "$pkgdir" + chmod a-s "$pkgdir"

Can't we just use mkdir's -m flag here? It's specified by POSIX.

...

if (( ! PKGFUNC )); then if (( ! REPKG )); then if (( BUILDFUNC )); then @@ -2693,6 +2696,7 @@ if (( INFAKEROOT )); then fi tidy_install create_package + pkgdir="${pkgdir%/*}" else run_split_packaging fi @@ -2819,6 +2823,9 @@ else (( CHECKFUNC )) && run_check fi if (( ! SPLITPKG )); then + pkgdir="$pkgdir/$pkgname" + mkdir -p "$pkgdir" + chmod a-s "$pkgdir"

And here...

...

if (( PKGFUNC )); then run_package elif (( REPKG )); then @@ -2827,6 +2834,7 @@ else fi tidy_install create_package + pkgdir="${pkgdir%/*}" else run_split_packaging fi -- 1.7.12.1

Allan McRae

11:51 p.m.

New subject: [pacman-dev] [PATCH 4/7] makepkg: always use pkg/$pkgname as $pkgdir

On 24/09/12 01:55, Dave Reisner wrote:

...

...
+ pkgdir="$pkgdir/$pkgname"

...
+ mkdir -p "$pkgdir" + chmod a-s "$pkgdir" Can't we just use mkdir's -m flag here? It's specified by POSIX.

Note this is used in multiple other places in makepkg. I seem to recall we did not use the "-m" flag for some reason, but I can not remember why. Maybe Dan can shed some light here? Anyway, I have just realized we only need it on the creation of $srcdir and $startdir/pkg. All directories created within them have no need for it... Allan

Allan McRae

2:44 p.m.

New subject: [pacman-dev] [PATCH 5/7] makepkg: strip debugging symbols into separate folder

When using the "debug" option in combination with "strip", move the debugging symbols into a separate directory ($pkgdir-debug/usr/lib/debug) suitable for creating a package from. Create hardlinks between debugging symbols of hardlinked files and add symlinks in the .build_id directory if the binary has a build ID. Signed-off-by: Allan McRae --- scripts/makepkg.sh.in | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c857060..df1823d 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1421,8 +1421,55 @@ run_package() { run_function_safe "$pkgfunc" } +build_id() { + local id + id=$(LANG=C readelf -n $1 | sed -n '/Build ID/ { s/.*: //p; q; }') + printf "%s\n" "$id" +} + strip_file() { local binary=$1; shift + + if check_option "debug" "y"; then + local bid=$(build_id $binary) + + # 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 + return + fi + elif [[ -f $pkgdir-debug/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 + + # 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 + return + 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} + + target="../../../../../${binary#./}" + target=${target/..\/..\/usr\/lib\/} + target=${target/..\/usr\/} + ln -s $target $pkgdir-debug/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 + fi + fi + strip $@ $binary } @@ -1480,6 +1527,11 @@ tidy_install() { # make sure library stripping variables are defined to prevent excess stripping [[ -z ${STRIP_SHARED+x} ]] && STRIP_SHARED="-S" [[ -z ${STRIP_STATIC+x} ]] && STRIP_STATIC="-S" + + if check_option "debug" "y"; then + mkdir -p $pkgdir-debug/usr/lib/debug + fi + local binary strip_flags find . -type f -perm -u+w -print0 2>/dev/null | while read -d '' binary ; do case "$(file -bi "$binary")" in -- 1.7.12.1

Allan McRae

3:16 p.m.

New subject: [pacman-dev] [PATCH 5/7] makepkg: strip debugging symbols into separate folder

On 24/09/12 00:44, Allan McRae wrote:

...

When using the "debug" option in combination with "strip", move the debugging symbols into a separate directory ($pkgdir-debug/usr/lib/debug) suitable for creating a package from.

Create hardlinks between debugging symbols of hardlinked files and add symlinks in the .build_id directory if the binary has a build ID.

Signed-off-by: Allan McRae --- scripts/makepkg.sh.in | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c857060..df1823d 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1421,8 +1421,55 @@ run_package() { run_function_safe "$pkgfunc" }

+build_id() { + local id + id=$(LANG=C readelf -n $1 | sed -n '/Build ID/ { s/.*: //p; q; }') + printf "%s\n" "$id" +} + strip_file() { local binary=$1; shift + + if check_option "debug" "y"; then + local bid=$(build_id $binary) + + # 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 + return + fi + elif [[ -f $pkgdir-debug/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 + + # 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 + return

delete...

...

+ 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} + + target="../../../../../${binary#./}" + target=${target/..\/..\/usr\/lib\/} + target=${target/..\/usr\/} + ln -s $target $pkgdir-debug/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 + fi + fi + strip $@ $binary }

@@ -1480,6 +1527,11 @@ tidy_install() { # make sure library stripping variables are defined to prevent excess stripping [[ -z ${STRIP_SHARED+x} ]] && STRIP_SHARED="-S" [[ -z ${STRIP_STATIC+x} ]] && STRIP_STATIC="-S" + + if check_option "debug" "y"; then + mkdir -p $pkgdir-debug/usr/lib/debug + fi + local binary strip_flags find . -type f -perm -u+w -print0 2>/dev/null | while read -d '' binary ; do case "$(file -bi "$binary")" in

Dave Reisner

4:05 p.m.

New subject: [pacman-dev] [PATCH 5/7] makepkg: strip debugging symbols into separate folder

On Mon, Sep 24, 2012 at 12:44:33AM +1000, Allan McRae wrote:

...

When using the "debug" option in combination with "strip", move the debugging symbols into a separate directory ($pkgdir-debug/usr/lib/debug) suitable for creating a package from.

Create hardlinks between debugging symbols of hardlinked files and add symlinks in the .build_id directory if the binary has a build ID.

Signed-off-by: Allan McRae --- scripts/makepkg.sh.in | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c857060..df1823d 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1421,8 +1421,55 @@ run_package() { run_function_safe "$pkgfunc" }

+build_id() { + local id + id=$(LANG=C readelf -n $1 | sed -n '/Build ID/ { s/.*: //p; q; }') + printf "%s\n" "$id" +}

This whole function should just be the readelf|sed: build_id() { LANG=C readelf -n $1 | sed -n '/Build ID/ { s/.*: //p; q; }' }

...

+ strip_file() { local binary=$1; shift + + if check_option "debug" "y"; then + local bid=$(build_id $binary) + + # 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 + return + fi + elif [[ -f $pkgdir-debug/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

quoting

...

+ + # 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

quoting

...

+ return + 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}

quoting

...

+ + target="../../../../../${binary#./}" + target=${target/..\/..\/usr\/lib\/} + target=${target/..\/usr\/}

Ew.

...

+ ln -s $target $pkgdir-debug/usr/lib/debug/.build_id/${bid:0:2}/${bid:2}

quoting

...

+ + target="../../${binary#./}.debug" + ln -s $target $pkgdir-debug/usr/lib/debug/.build_id/${bid:0:2}/${bid:2}.debug

quoting

...

+ fi + fi + strip $@ $binary }

@@ -1480,6 +1527,11 @@ tidy_install() { # make sure library stripping variables are defined to prevent excess stripping [[ -z ${STRIP_SHARED+x} ]] && STRIP_SHARED="-S" [[ -z ${STRIP_STATIC+x} ]] && STRIP_STATIC="-S" + + if check_option "debug" "y"; then + mkdir -p $pkgdir-debug/usr/lib/debug

"$pkgdir-debug/usr/lib/debug"

...

+ fi + local binary strip_flags find . -type f -perm -u+w -print0 2>/dev/null | while read -d '' binary ; do case "$(file -bi "$binary")" in -- 1.7.12.1

Allan McRae

11:51 p.m.

New subject: [pacman-dev] [PATCH 5/7] makepkg: strip debugging symbols into separate folder

On 24/09/12 02:05, Dave Reisner wrote:

...

...
+ target="../../../../../${binary#./}"

...
+ target=${target/..\/..\/usr\/lib\/} + target=${target/..\/usr\/} Ew.

Yes... but any suggestions on how to improve it? That was the best I could come up with.

Allan McRae

2:44 p.m.

New subject: [pacman-dev] [PATCH 6/7] makepkg: output the name of the package being created

Although it should be currently quite obvious what package is being created when "Creating package..." is printed, it will not be in the future when a debug package is potentially created too. Also, given $pkgname is always correctly set when split packaging now, we no longer need to pass that around. Signed-off-by: Allan McRae --- scripts/makepkg.sh.in | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index df1823d..e247cad 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1716,7 +1716,7 @@ write_pkginfo() { echo "# using $(fakeroot -v)" fi echo "# $(LC_ALL=C date -u)" - printf "pkgname = %s\n" "$1" + printf "pkgname = %s\n" "$pkgname" (( SPLITPKG )) && echo pkgbase = $pkgbase echo "pkgver = $(get_full_version)" printf "pkgdesc = %s\n" "$pkgdesc" @@ -1787,18 +1787,11 @@ create_package() { check_package cd_safe "$pkgdir" - msg "$(gettext "Creating package...")" - - local nameofpkg - if [[ -z $1 ]]; then - nameofpkg="$pkgname" - else - nameofpkg="$1" - fi + msg "$(gettext "Creating package \"%s\"...")" "$pkgname" pkgarch=$(get_pkg_arch) - write_pkginfo $nameofpkg > .PKGINFO + write_pkginfo > .PKGINFO local comp_files=('.PKGINFO') @@ -1818,7 +1811,7 @@ create_package() { msg2 "$(gettext "Compressing package...")" local fullver=$(get_full_version) - local pkg_file="$PKGDEST/${nameofpkg}-${fullver}-${pkgarch}${PKGEXT}" + local pkg_file="$PKGDEST/${pkgname}-${fullver}-${pkgarch}${PKGEXT}" local ret=0 [[ -f $pkg_file ]] && rm -f "$pkg_file" @@ -2327,7 +2320,7 @@ run_split_packaging() { backup_package_variables run_package $pkgname tidy_install - create_package $pkgname + create_package restore_package_variables pkgdir="${pkgdir%/*}" done -- 1.7.12.1

Allan McRae

2:44 p.m.

New subject: [pacman-dev] [PATCH 7/7] makepkg: create package from stripped debug symbols

Signed-off-by: Allan McRae --- doc/PKGBUILD.5.txt | 2 ++ doc/makepkg.conf.5.txt | 3 ++- scripts/makepkg.sh.in | 25 +++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 113e2c4..178519b 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -277,6 +277,8 @@ A normal sync or upgrade will not use its value. *debug*;; Add the user-specified debug flags (DEBUG_CFLAGS, DEBUG_CXXFLAGS) to their counterpart buildflags as specified in linkman:makepkg.conf[5]. + When used in combination with the `strip' option, a separate package + containing the debug symbols is created. build() Function ---------------- diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index cf7026c..cca4121 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -175,7 +175,8 @@ Options *debug*;; Add the user-specified debug flags as specified in DEBUG_CFLAGS and - DEBUG_CXXFLAGS to their counterpart buildflags. + DEBUG_CXXFLAGS to their counterpart buildflags. Creates a separate + package containing the debug symbols with used with `strip'. **INTEGRITY_CHECK=(**check1 ...**)**:: File integrity checks to use. Multiple checks may be specified; this diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e247cad..e48de31 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1861,6 +1861,28 @@ create_package() { fi } +create_debug_package() { + # check if a debug package was requested + if ! check_option "debug" "y" || ! check_option "strip" "y"; then + return + fi + + pkgdir="${pkgdir}-debug" + + # check if we have any debug symbols to package + if dir_is_empty "$pkgdir/usr/lib/debug"; then + return + fi + + depends=("$pkgname=$(get_full_version)") + pkgdesc="Detached debugging symbols for $pkgname" + pkgname=$pkgname-debug + + unset groups optdepends provides conflicts replaces backup install changelog + + create_package +} + create_signature() { if [[ $SIGNPKG != 'y' ]]; then return @@ -2321,6 +2343,7 @@ run_split_packaging() { run_package $pkgname tidy_install create_package + create_debug_package restore_package_variables pkgdir="${pkgdir%/*}" done @@ -2741,6 +2764,7 @@ if (( INFAKEROOT )); then fi tidy_install create_package + create_debug_package pkgdir="${pkgdir%/*}" else run_split_packaging @@ -2879,6 +2903,7 @@ else fi tidy_install create_package + create_debug_package pkgdir="${pkgdir%/*}" else run_split_packaging -- 1.7.12.1

Allan McRae

3:40 p.m.

New subject: [pacman-dev] [PATCH 0/7] Split debugging symbols into separate package

On 24/09/12 00:44, Allan McRae wrote:

...

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...

valgrind without debug package installed: ==27108== Invalid free() / delete / delete[] / realloc() ==27108== at 0x4029F8C: operator delete(void*) (in /usr/lib/valgrind/vgpreload_memcheck-x86-linux.so) ==27108== by 0x8048760: ??? (in /usr/bin/foo) ==27108== by 0x41AD604: (below main) (in /usr/lib/libc-2.16.so) ==27108== Address 0x4342028 is 0 bytes inside a block of size 4 free'd ==27108== at 0x4029F8C: operator delete(void*) (in /usr/lib/valgrind/vgpreload_memcheck-x86-linux.so) ==27108== by 0x8048754: ??? (in /usr/bin/foo) ==27108== by 0x41AD604: (below main) (in /usr/lib/libc-2.16.so) valgrind with debug package: ==27142== Invalid free() / delete / delete[] / realloc() ==27142== at 0x4029F8C: operator delete(void*) (in /usr/lib/valgrind/vgpreload_memcheck-x86-linux.so) ==27142== by 0x8048760: main (test.cpp:8) ==27142== Address 0x4342028 is 0 bytes inside a block of size 4 free'd ==27142== at 0x4029F8C: operator delete(void*) (in /usr/lib/valgrind/vgpreload_memcheck-x86-linux.so) ==27142== by 0x8048754: main (test.cpp:7) Similar things happen with gdb! Allan

4233

Age (days ago)

4233

Last active (days ago)

List overview

Download

16 comments

2 participants

participants (2)

Allan McRae
Dave Reisner

[pacman-dev] [PATCH 0/7] Split debugging symbols into separate package

tags

participants (2)