| Message ID | 1367941611-12223-3-git-send-email-anisse@astier.eu |
|---|---|
| State | New |
| Headers | show |
On Tue, 2013-05-07 at 17:46 +0200, Anisse Astier wrote: > This can reduce almost 3 times the size of the linux-image package, > while keeping the debug symbols available for this particular build, in > their own package. > > This mimics the way kernels are built in debian, ubuntu, or with > make-kpkg, and comes at the price of a small slowdown in the building of > packages. > > Signed-off-by: Anisse Astier <anisse@astier.eu> > --- > scripts/package/builddeb | 43 ++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 42 insertions(+), 1 deletion(-) > > diff --git a/scripts/package/builddeb b/scripts/package/builddeb > index 2d84671..797484b 100644 > --- a/scripts/package/builddeb > +++ b/scripts/package/builddeb > @@ -78,17 +78,21 @@ tmpdir="$objtree/debian/tmp" > fwdir="$objtree/debian/fwtmp" > kernel_headers_dir="$objtree/debian/hdrtmp" > libc_headers_dir="$objtree/debian/headertmp" > +dbg_dir="$objtree/debian/dbgtmp" > packagename=linux-image-$version > fwpackagename=linux-firmware-image > kernel_headers_packagename=linux-headers-$version > libc_headers_packagename=linux-libc-dev > +dbg_packagename=$packagename-dbg > > if [ "$ARCH" = "um" ] ; then > packagename=user-mode-linux-$version > fi > > +BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $objtree/$KCONFIG_CONFIG || true)" As in the previous patch, you can omit $objtree/ here. [...] > @@ -128,6 +136,20 @@ if grep -q '^CONFIG_MODULES=y' $objtree/$KCONFIG_CONFIG ; then > mv "$tmpdir/lib/modules/$version"/* "$tmpdir/usr/lib/uml/modules/$version/" > rmdir "$tmpdir/lib/modules/$version" > fi > + if [ -n "$BUILD_DEBUG" ] ; then > + ( > + cd $tmpdir > + for module in $(find lib/modules/ -name *.ko); do What if this is a non-modular kernel? [...] > +if [ -n "$BUILD_DEBUG" ] ; then > + # Build debug package > + mkdir -p $dbg_dir/usr/lib/debug/lib/modules/$version/ > + cp vmlinux $dbg_dir/usr/lib/debug/lib/modules/$version/ [...] Different tools have different ideas about where vmlinux debuginfo should be. What I ended up doing in Debian's own kernel debug packages in wheezy was installing/symlinking to all of: /usr/lib/debug/boot/vmlinux-$version [systemtap] /usr/lib/debug/lib/modules/$version/vmlinux [perf] /usr/lib/debug/vmlinux-$version [kdump-tools] So unless anyone has a better suggestion I think you'd better do the same here. (But really, the Linux development community ought to agree on a single canonical path format that all such tools will support.) Ben.
Hi Ben, On Wed, May 8, 2013 at 5:14 AM, Ben Hutchings <ben@decadent.org.uk> wrote: > On Tue, 2013-05-07 at 17:46 +0200, Anisse Astier wrote: >> This can reduce almost 3 times the size of the linux-image package, >> while keeping the debug symbols available for this particular build, in >> their own package. >> >> This mimics the way kernels are built in debian, ubuntu, or with >> make-kpkg, and comes at the price of a small slowdown in the building of >> packages. >> >> Signed-off-by: Anisse Astier <anisse@astier.eu> >> --- >> scripts/package/builddeb | 43 ++++++++++++++++++++++++++++++++++++++++++- >> 1 file changed, 42 insertions(+), 1 deletion(-) >> >> diff --git a/scripts/package/builddeb b/scripts/package/builddeb >> index 2d84671..797484b 100644 >> --- a/scripts/package/builddeb >> +++ b/scripts/package/builddeb >> @@ -78,17 +78,21 @@ tmpdir="$objtree/debian/tmp" >> fwdir="$objtree/debian/fwtmp" >> kernel_headers_dir="$objtree/debian/hdrtmp" >> libc_headers_dir="$objtree/debian/headertmp" >> +dbg_dir="$objtree/debian/dbgtmp" >> packagename=linux-image-$version >> fwpackagename=linux-firmware-image >> kernel_headers_packagename=linux-headers-$version >> libc_headers_packagename=linux-libc-dev >> +dbg_packagename=$packagename-dbg >> >> if [ "$ARCH" = "um" ] ; then >> packagename=user-mode-linux-$version >> fi >> >> +BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $objtree/$KCONFIG_CONFIG || true)" > > As in the previous patch, you can omit $objtree/ here. > > [...] >> @@ -128,6 +136,20 @@ if grep -q '^CONFIG_MODULES=y' $objtree/$KCONFIG_CONFIG ; then >> mv "$tmpdir/lib/modules/$version"/* "$tmpdir/usr/lib/uml/modules/$version/" >> rmdir "$tmpdir/lib/modules/$version" >> fi >> + if [ -n "$BUILD_DEBUG" ] ; then >> + ( >> + cd $tmpdir >> + for module in $(find lib/modules/ -name *.ko); do > > What if this is a non-modular kernel? It's not entirely apparent in the diff, but this code is inside an if checking CONFIG_MODULES.. > > [...] >> +if [ -n "$BUILD_DEBUG" ] ; then >> + # Build debug package >> + mkdir -p $dbg_dir/usr/lib/debug/lib/modules/$version/ >> + cp vmlinux $dbg_dir/usr/lib/debug/lib/modules/$version/ > [...] > > Different tools have different ideas about where vmlinux debuginfo > should be. What I ended up doing in Debian's own kernel debug packages > in wheezy was installing/symlinking to all of: > > /usr/lib/debug/boot/vmlinux-$version [systemtap] > /usr/lib/debug/lib/modules/$version/vmlinux [perf] > /usr/lib/debug/vmlinux-$version [kdump-tools] > > So unless anyone has a better suggestion I think you'd better do the > same here. > > (But really, the Linux development community ought to agree on a single > canonical path format that all such tools will support.) I'll add the symlinks for the next iteration. Thanks a lot for your review time. Anisse
diff --git a/scripts/package/builddeb b/scripts/package/builddeb index 2d84671..797484b 100644 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -78,17 +78,21 @@ tmpdir="$objtree/debian/tmp" fwdir="$objtree/debian/fwtmp" kernel_headers_dir="$objtree/debian/hdrtmp" libc_headers_dir="$objtree/debian/headertmp" +dbg_dir="$objtree/debian/dbgtmp" packagename=linux-image-$version fwpackagename=linux-firmware-image kernel_headers_packagename=linux-headers-$version libc_headers_packagename=linux-libc-dev +dbg_packagename=$packagename-dbg if [ "$ARCH" = "um" ] ; then packagename=user-mode-linux-$version fi +BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $objtree/$KCONFIG_CONFIG || true)" + # Setup the directory structure -rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir" +rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" mkdir -m 755 -p "$tmpdir/DEBIAN" mkdir -p "$tmpdir/lib" "$tmpdir/boot" "$tmpdir/usr/share/doc/$packagename" mkdir -m 755 -p "$fwdir/DEBIAN" @@ -101,6 +105,10 @@ mkdir -p "$kernel_headers_dir/lib/modules/$version/" if [ "$ARCH" = "um" ] ; then mkdir -p "$tmpdir/usr/lib/uml/modules/$version" "$tmpdir/usr/bin" fi +if [ -n "$BUILD_DEBUG" ] ; then + mkdir -p "$dbg_dir/usr/share/doc/$dbg_packagename" + mkdir -m 755 -p "$dbg_dir/DEBIAN" +fi # Build and install the kernel if [ "$ARCH" = "um" ] ; then @@ -128,6 +136,20 @@ if grep -q '^CONFIG_MODULES=y' $objtree/$KCONFIG_CONFIG ; then mv "$tmpdir/lib/modules/$version"/* "$tmpdir/usr/lib/uml/modules/$version/" rmdir "$tmpdir/lib/modules/$version" fi + if [ -n "$BUILD_DEBUG" ] ; then + ( + cd $tmpdir + for module in $(find lib/modules/ -name *.ko); do + mkdir -p $(dirname $dbg_dir/usr/lib/debug/$module) + # only keep debug symbols in the debug file + objcopy --only-keep-debug $module $dbg_dir/usr/lib/debug/$module + # strip original module from debug symbols + objcopy --strip-debug $module + # then add a link to those + objcopy --add-gnu-debuglink=$dbg_dir/usr/lib/debug/$module $module + done + ) + fi fi if [ "$ARCH" != "um" ]; then @@ -299,4 +321,23 @@ fi create_package "$packagename" "$tmpdir" +if [ -n "$BUILD_DEBUG" ] ; then + # Build debug package + mkdir -p $dbg_dir/usr/lib/debug/lib/modules/$version/ + cp vmlinux $dbg_dir/usr/lib/debug/lib/modules/$version/ + + cat <<EOF >> debian/control + +Package: $dbg_packagename +Section: debug +Provides: linux-debug, linux-debug-$version +Architecture: any +Description: Linux kernel debugging symbols for $version + This package will come in handy if you need to debug the kernel. It provides + all the necessary debug symbols for the kernel and its modules. +EOF + + create_package "$dbg_packagename" "$dbg_dir" +fi + exit 0
This can reduce almost 3 times the size of the linux-image package, while keeping the debug symbols available for this particular build, in their own package. This mimics the way kernels are built in debian, ubuntu, or with make-kpkg, and comes at the price of a small slowdown in the building of packages. Signed-off-by: Anisse Astier <anisse@astier.eu> --- scripts/package/builddeb | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-)