From patchwork Fri Feb 5 01:34:30 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan Wu X-Patchwork-Id: 44585 X-Patchwork-Delegate: apw@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 59D3FB7CA6 for ; Fri, 5 Feb 2010 12:34:46 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1NdD5l-0001SS-Kb; Fri, 05 Feb 2010 01:34:41 +0000 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1NdD5j-0001OT-7Y for kernel-team@lists.ubuntu.com; Fri, 05 Feb 2010 01:34:39 +0000 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1NdD5j-0006Xx-5a for ; Fri, 05 Feb 2010 01:34:39 +0000 Received: from [199.223.125.189] (helo=canonical.com) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1NdD5i-0001h0-Oe for kernel-team@lists.ubuntu.com; Fri, 05 Feb 2010 01:34:39 +0000 From: Bryan Wu To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/2] UBUNTU: include modules.builtin in the binary debs Date: Thu, 4 Feb 2010 17:34:30 -0800 Message-Id: <1265333670-14388-3-git-send-email-bryan.wu@canonical.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1265333670-14388-1-git-send-email-bryan.wu@canonical.com> References: <1265333670-14388-1-git-send-email-bryan.wu@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com From: Andy Whitcroft Now that the kernel is generating the list of builtin modules include this listing in the binary debs. Signed-off-by: Andy Whitcroft (cherry picked from commit e241e53c36b76ca7aced79d4fde251329e19608f) Signed-off-by: Bryan Wu --- debian.master/rules.d/2-binary-arch.mk | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian.master/rules.d/2-binary-arch.mk b/debian.master/rules.d/2-binary-arch.mk index 4468d25..e6bba87 100644 --- a/debian.master/rules.d/2-binary-arch.mk +++ b/debian.master/rules.d/2-binary-arch.mk @@ -176,12 +176,16 @@ endif run-parts -v $(DEBIAN)/tests # - # Remove files which are generated at installation by postinst, except for - # modules.order. + # Remove files which are generated at installation by postinst, + # except for modules.order and modules.builtin # mv $(pkgdir)/lib/modules/$(abi_release)-$*/modules.order \ $(pkgdir)/lib/modules/$(abi_release)-$*/_modules.order + mv $(pkgdir)/lib/modules/$(abi_release)-$*/modules.builtin \ + $(pkgdir)/lib/modules/$(abi_release)-$*/_modules.builtin rm -f $(pkgdir)/lib/modules/$(abi_release)-$*/modules.* + mv $(pkgdir)/lib/modules/$(abi_release)-$*/_modules.builtin \ + $(pkgdir)/lib/modules/$(abi_release)-$*/modules.builtin mv $(pkgdir)/lib/modules/$(abi_release)-$*/_modules.order \ $(pkgdir)/lib/modules/$(abi_release)-$*/modules.order