From patchwork Tue May 7 15:46:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anisse Astier X-Patchwork-Id: 2535981 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 79163E00E6 for ; Tue, 7 May 2013 15:47:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757059Ab3EGPrq (ORCPT ); Tue, 7 May 2013 11:47:46 -0400 Received: from mail-wi0-f169.google.com ([209.85.212.169]:56967 "EHLO mail-wi0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757284Ab3EGPrp (ORCPT ); Tue, 7 May 2013 11:47:45 -0400 Received: by mail-wi0-f169.google.com with SMTP id h11so4148088wiv.0 for ; Tue, 07 May 2013 08:47:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=34WcXWeZ/rAYQQn8n5ACJMk2IalSdICLrzab++fcwkM=; b=dp3F94OQy9Fy19qUgMrf1MMYn3VJLUZSuA0yNYQGfjuI/sNKCoMVGebmhJyJEO0/Wr 5PLH8/nVGec3QsOCIE81/R4D3a/dW42O8HjtXhP5Ok5LHe7NkjjFbC5nc1qy7dDFSEwF L0D/EYlp1QahPYDJsirv5AuYe6SmeVgelQPRqk47W9HKZprypSbOLJSXFcAMivfHFORo 6fhRsMpEhzuW4PBLX5Lbm/0RKx7KAtAtGxrRwTNpuGU4SOK/9TXo8dB9CQsqkwkgpy63 yjCKgURAlhagI4ITsiMaXMh0suCmAgW+4yCH2h/nKxjaiWmOBvRIiM2L0XCTsj/K50RR BQIg== X-Received: by 10.180.37.243 with SMTP id b19mr4343677wik.12.1367941663008; Tue, 07 May 2013 08:47:43 -0700 (PDT) Received: from serenity.substantiel.local (mar92-17-78-228-214-160.fbx.proxad.net. [78.228.214.160]) by mx.google.com with ESMTPSA id q13sm3842742wie.8.2013.05.07.08.47.41 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 07 May 2013 08:47:42 -0700 (PDT) From: Anisse Astier To: linux-kbuild@vger.kernel.org Cc: Michal Marek , maximilian attems , Anisse Astier , Ben Hutchings , debian-kernel@lists.debian.org, kernel-team@lists.ubuntu.com Subject: [PATCH v4 2/4] deb-pkg: split debug symbols in their own package Date: Tue, 7 May 2013 17:46:49 +0200 Message-Id: <1367941611-12223-3-git-send-email-anisse@astier.eu> X-Mailer: git-send-email 1.8.3.rc1 In-Reply-To: <1367941611-12223-1-git-send-email-anisse@astier.eu> References: <1367941611-12223-1-git-send-email-anisse@astier.eu> X-Gm-Message-State: ALoCoQmyCatTJ90owRvO3Pz61TnRgchZv5WPvbfGVESa0HAdhOdPxKSWzbqOfr8dt0EK89FLymzQ Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org 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 --- 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)" + # 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 <> 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