From patchwork Wed Aug 28 12:26:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauricio Faria de Oliveira X-Patchwork-Id: 1154387 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46JQ3R2Ws6z9sNm; Wed, 28 Aug 2019 22:26:59 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1i2x2N-0001Hg-3n; Wed, 28 Aug 2019 12:26:55 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1i2x2K-0001Gg-UB for kernel-team@lists.ubuntu.com; Wed, 28 Aug 2019 12:26:52 +0000 Received: from mail-qk1-f200.google.com ([209.85.222.200]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1i2x2K-0000hK-G8 for kernel-team@lists.ubuntu.com; Wed, 28 Aug 2019 12:26:52 +0000 Received: by mail-qk1-f200.google.com with SMTP id l64so2309380qkb.5 for ; Wed, 28 Aug 2019 05:26:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=7Srk7WmLk5WbVRGouYHVVJbsCR4FrJpLRnflFb7esbQ=; b=Op8zdK7rnm8Yq5dsSWP1hABrTQ/pSvg47/K1M/I4rrI97oqAwOS81Q0J6rvIDxcC3k UdaNjPHYzy84XY7lyLQcBG3O7kolE5oJDTNbENzL+/DszxvIOvjbpYcyosdxKD4BrYmz zod6SPM6FM/j9r7CGCYtDRKcjA9aPzRPZZchlEOOmwIuPsJd5Rx22s3i6ZcsHr0bUHPh U833SOEB8HuvdNhMYhhBPnda1ZJWKVJdukwJKjKmuCQhCHMvPsGeTYNMbzPFE9dmeMWC 5YXlGe4Ej8CNK6bQnhOv8DlCjlfE6VD0THxfBTf7mWpChMzkku8XbgmAkwg6O62/f9q7 1FiQ== X-Gm-Message-State: APjAAAUKMrzGLXIzgpjd1vRxGPQtWjAhb4sR4aVW02dSOplMaihTfjUq jB3tx5UNE7bnD7XyxN2DSoU23MQnIyaMnzJDptGNtWdduGih8nk4T7ZbNMKAbpVEJ8mpsHxmJ3p llJjXqoqKZy+CpDQFM9CbeM4AIxsjm7ZiM5EVBErIvg== X-Received: by 2002:ae9:e117:: with SMTP id g23mr3729477qkm.100.1566995211558; Wed, 28 Aug 2019 05:26:51 -0700 (PDT) X-Google-Smtp-Source: APXvYqyC9mFgjl1qjCEeFY2kZ5UTAXviyNz3+BG6EsrhHINBipjywOG+2LA15AG/FEexAmnSv2APxA== X-Received: by 2002:ae9:e117:: with SMTP id g23mr3729457qkm.100.1566995211274; Wed, 28 Aug 2019 05:26:51 -0700 (PDT) Received: from localhost.localdomain ([2804:14c:4e7:1017:a993:97d5:bc07:a234]) by smtp.gmail.com with ESMTPSA id u28sm1163909qtu.22.2019.08.28.05.26.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Aug 2019 05:26:50 -0700 (PDT) From: Mauricio Faria de Oliveira To: kernel-team@lists.ubuntu.com Subject: [Unstable][PATCH 2/6] UBUNTU: [Debian]: Handle debug symbols for modules in extras too Date: Wed, 28 Aug 2019 09:26:00 -0300 Message-Id: <20190828122604.6829-3-mfo@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190828122604.6829-1-mfo@canonical.com> References: <20190828122604.6829-1-mfo@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1840704 The debug symbols section only searches for modules in the '$(pkgdir)' path (in linux-modules package) but not in the '$(pkdir_ex)' path (in linux-modules-extra). Thus, modules in the extras package have no '.gnu_debuglink'. Fix it by searching in $(pkgdir_ex) too if extras is enabled. Signed-off-by: Mauricio Faria de Oliveira --- debian/rules.d/2-binary-arch.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 730373e93e53..ff6e35b697e2 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -282,7 +282,9 @@ ifneq ($(skipdbg),true) INSTALL_MOD_PATH=$(dbgpkgdir)/usr/lib/debug # Add .gnu_debuglink sections to each stripped .ko # pointing to unstripped verson - find $(pkgdir) -name '*.ko' | while read path_module ; do \ + find $(pkgdir) \ + $(if $(filter true,$(do_extras_package)),$(pkgdir_ex)) \ + -name '*.ko' | while read path_module ; do \ module="/lib/modules/$${path_module#*/lib/modules/}"; \ if [[ -f "$(dbgpkgdir)/usr/lib/debug/$$module" ]] ; then \ $(CROSS_COMPILE)objcopy \