From patchwork Mon Apr 8 17:06:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anisse Astier X-Patchwork-Id: 2410481 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 78349DFB78 for ; Mon, 8 Apr 2013 17:08:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934482Ab3DHRHV (ORCPT ); Mon, 8 Apr 2013 13:07:21 -0400 Received: from mail-we0-f177.google.com ([74.125.82.177]:45219 "EHLO mail-we0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935556Ab3DHRHR convert rfc822-to-8bit (ORCPT ); Mon, 8 Apr 2013 13:07:17 -0400 Received: by mail-we0-f177.google.com with SMTP id o45so4641829wer.36 for ; Mon, 08 Apr 2013 10:07:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:date:from:to:cc:subject:message-id:in-reply-to :references:x-mailer:mime-version:content-type :content-transfer-encoding:x-gm-message-state; bh=xTC8w3zVwxsSYTMiiAWTsJZCNHn4giGiVLn6CL5bTqI=; b=OknkbwxS5L0MXddaO3GFFv+kp0mrjmdx7H0Dx8ydpMIjUqrhaaIxsFb13vlk7dZGDS A9R8pIKPrtcU0yvWklnbcu9b2TEKjEOxI1P2Bi6PnTCSSBJLSHKTAgxZ/iT0u4L+F8WN TKlVPzR3iILyXjtJxELKn6SQ++TcyifrCNYBKAAVdiUbkWLLYt9+JV+x6r3Rq2PXVS1g fvmmaGCzjqYxOXRZpfGeneN9pd96YHZOPSZxrx2wPCdmAdQkgsrW7/RWPsalLSnYT1/L 0Q1o7YNSSMXDJ7bo+PnzBThiqaEuHlXvxyYZm/k6IC3Fkr+LvJDRywoGlMT/npzBTOD2 eB8Q== X-Received: by 10.194.89.169 with SMTP id bp9mr33009367wjb.57.1365440836284; Mon, 08 Apr 2013 10:07:16 -0700 (PDT) Received: from serenity (mar92-17-78-228-214-160.fbx.proxad.net. [78.228.214.160]) by mx.google.com with ESMTPS id t7sm20891283wij.2.2013.04.08.10.07.14 (version=SSLv3 cipher=RC4-SHA bits=128/128); Mon, 08 Apr 2013 10:07:15 -0700 (PDT) Date: Mon, 8 Apr 2013 19:06:45 +0200 From: Anisse Astier To: Michal Marek Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, maximilian attems Subject: Re: [PATCH 1/2] deb-pkg: split debug symbols in their own package Message-ID: <20130408190645.29570fe5@serenity> In-Reply-To: <51629BFF.1080204@suse.cz> References: <1363946761-7449-1-git-send-email-anisse@astier.eu> <51629BFF.1080204@suse.cz> X-Mailer: Claws Mail 3.8.1 (GTK+ 2.24.10; x86_64-pc-linux-gnu) Mime-Version: 1.0 X-Gm-Message-State: ALoCoQlheQ/K5KeOQdelYYYNG97qX/MlIQ88NbCVXDF+fi6d70GeZ/vNwU8qryMeUmfCC3UloAFx Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org On Mon, 08 Apr 2013 12:29:19 +0200, Michal Marek wrote : > 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? > Indeed. V2 below. From f1720076261a35ff82f2635979d15e5ec572356c Mon Sep 17 00:00:00 2001 From: Anisse Astier Date: Thu, 21 Mar 2013 14:01:25 +0100 Subject: [PATCH v2] deb-pkg: split debug symbols in their own package 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. v2: - only build when CONFIG_DEBUG_INFO=y - build debug package last. - more verbose package description - put package in section debug Signed-off-by: Anisse Astier --- scripts/package/builddeb | 46 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/scripts/package/builddeb b/scripts/package/builddeb index acb8650..3e11ad2 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' .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' .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,26 @@ fi create_package "$packagename" "$tmpdir" +if [ -n "$BUILD_DEBUG" ] ; then + # Build debug package + mkdir -p "$dbg_dir/usr/share/doc/$dbg_packagename" + mkdir -m 755 -p "$dbg_dir/DEBIAN" + + mkdir -p $dbg_dir/usr/lib/debug/lib/modules/$version/ + cp vmlinux $dbg_dir/usr/lib/debug/lib/modules/$version/ + + cat <> 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