Message ID | 1363946761-7449-1-git-send-email-anisse@astier.eu (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Any comments ? Anisse On Fri, 22 Mar 2013 11:06:00 +0100, Anisse Astier <anisse@astier.eu> 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 | 33 ++++++++++++++++++++++++++++++++- > 1 file changed, 32 insertions(+), 1 deletion(-) > > diff --git a/scripts/package/builddeb b/scripts/package/builddeb > index acb8650..7f7a7fd 100644 > --- a/scripts/package/builddeb > +++ b/scripts/package/builddeb > @@ -78,17 +78,19 @@ 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 > > # 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" > @@ -98,6 +100,8 @@ mkdir -p "$libc_headers_dir/usr/share/doc/$libc_headers_packagename" > mkdir -m 755 -p "$kernel_headers_dir/DEBIAN" > mkdir -p "$kernel_headers_dir/usr/share/doc/$kernel_headers_packagename" > mkdir -p "$kernel_headers_dir/lib/modules/$version/" > +mkdir -p "$dbg_dir/usr/share/doc/$dbg_packagename" > +mkdir -m 755 -p "$dbg_dir/DEBIAN" > if [ "$ARCH" = "um" ] ; then > mkdir -p "$tmpdir/usr/lib/uml/modules/$version" "$tmpdir/usr/bin" > fi > @@ -128,8 +132,24 @@ if grep -q '^CONFIG_MODULES=y' .config ; then > mv "$tmpdir/lib/modules/$version"/* "$tmpdir/usr/lib/uml/modules/$version/" > rmdir "$tmpdir/lib/modules/$version" > fi > + # Build debug package > + ( > + 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 > > +mkdir -p $dbg_dir/usr/lib/debug/lib/modules/$version/ > +cp vmlinux $dbg_dir/usr/lib/debug/lib/modules/$version/ > + > if [ "$ARCH" != "um" ]; then > $MAKE headers_check KBUILD_SRC= > $MAKE headers_install KBUILD_SRC= INSTALL_HDR_PATH="$libc_headers_dir/usr" > @@ -297,6 +317,17 @@ if [ "$ARCH" != "um" ]; then > create_package "$libc_headers_packagename" "$libc_headers_dir" > fi > > +cat <<EOF >> debian/control > + > +Package: $dbg_packagename > +Section: devel > +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. > +EOF > + > +create_package "$dbg_packagename" "$dbg_dir" > create_package "$packagename" "$tmpdir" > > exit 0 -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 22.3.2013 11:06, 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. Shouldn't the debug subpackage only be created if CONFIG_DEBUG_INFO=y? Thanks, Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/scripts/package/builddeb b/scripts/package/builddeb index acb8650..7f7a7fd 100644 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -78,17 +78,19 @@ 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 # 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" @@ -98,6 +100,8 @@ mkdir -p "$libc_headers_dir/usr/share/doc/$libc_headers_packagename" mkdir -m 755 -p "$kernel_headers_dir/DEBIAN" mkdir -p "$kernel_headers_dir/usr/share/doc/$kernel_headers_packagename" mkdir -p "$kernel_headers_dir/lib/modules/$version/" +mkdir -p "$dbg_dir/usr/share/doc/$dbg_packagename" +mkdir -m 755 -p "$dbg_dir/DEBIAN" if [ "$ARCH" = "um" ] ; then mkdir -p "$tmpdir/usr/lib/uml/modules/$version" "$tmpdir/usr/bin" fi @@ -128,8 +132,24 @@ if grep -q '^CONFIG_MODULES=y' .config ; then mv "$tmpdir/lib/modules/$version"/* "$tmpdir/usr/lib/uml/modules/$version/" rmdir "$tmpdir/lib/modules/$version" fi + # Build debug package + ( + 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 +mkdir -p $dbg_dir/usr/lib/debug/lib/modules/$version/ +cp vmlinux $dbg_dir/usr/lib/debug/lib/modules/$version/ + if [ "$ARCH" != "um" ]; then $MAKE headers_check KBUILD_SRC= $MAKE headers_install KBUILD_SRC= INSTALL_HDR_PATH="$libc_headers_dir/usr" @@ -297,6 +317,17 @@ if [ "$ARCH" != "um" ]; then create_package "$libc_headers_packagename" "$libc_headers_dir" fi +cat <<EOF >> debian/control + +Package: $dbg_packagename +Section: devel +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. +EOF + +create_package "$dbg_packagename" "$dbg_dir" create_package "$packagename" "$tmpdir" 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 | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-)