Patchwork [2/2] UBUNTU: include modules.builtin in the binary debs

login
register
mail settings
Submitter Bryan Wu
Date Feb. 5, 2010, 1:34 a.m.
Message ID <1265333670-14388-3-git-send-email-bryan.wu@canonical.com>
Download mbox | patch
Permalink /patch/44585/
State Accepted
Delegated to: Andy Whitcroft
Headers show

Comments

Bryan Wu - Feb. 5, 2010, 1:34 a.m.
From: Andy Whitcroft <apw@canonical.com>

Now that the kernel is generating the list of builtin modules include
this listing in the binary debs.

Signed-off-by: Andy Whitcroft <apw@canonical.com>

(cherry picked from commit e241e53c36b76ca7aced79d4fde251329e19608f)
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
---
 debian.master/rules.d/2-binary-arch.mk |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

Patch

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