[kernel] r16405 - dists/sid/linux-2.6/debian

[Ben Hutchings]

Author: benh
Date: Thu Oct  7 00:23:44 2010
New Revision: 16405

Log:
linux-image: Include modules.order in image packages (Closes: #598518)

When pruning the /lib/modules/ directory, remove everything except
kernel and modules.order (not debug packages) rather than removing
specific patterns.

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/rules.real

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Wed Oct  6 09:32:17 2010	(r16404)
+++ dists/sid/linux-2.6/debian/changelog	Thu Oct  7 00:23:44 2010	(r16405)
@@ -4,6 +4,7 @@
   * mmc: build fix: mmc_pm_notify is only available with CONFIG_PM=y
   * Add stable 2.6.32.24 (trivial fix, already applied)
   * ipg: Remove device claimed by dl2k from pci id table (Closes: #599021)
+  * linux-image: Include modules.order in image packages (Closes: #598518)
 
   [ Stephen R. Marenka ]
   * m68k: fix missing io macros.

Modified: dists/sid/linux-2.6/debian/rules.real
==============================================================================
--- dists/sid/linux-2.6/debian/rules.real	Wed Oct  6 09:32:17 2010	(r16404)
+++ dists/sid/linux-2.6/debian/rules.real	Thu Oct  7 00:23:44 2010	(r16405)
@@ -350,7 +350,7 @@
 endif
 	cp $(DIR)/.config $(PACKAGE_DIR)/boot/config-$(REAL_VERSION)
 	cp $(DIR)/System.map $(PACKAGE_DIR)/boot/System.map-$(REAL_VERSION)
-	rm $(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/{build,source,modules.*}
+	find $(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/ -mindepth 1 -maxdepth 1 \! -name kernel \! -name modules.order -exec rm {} \+
 	rm $(PACKAGE_DIR)/lib/firmware -rf
 endif
 	+$(MAKE_SELF) \
@@ -477,7 +477,7 @@
 	install -m644 $(DIR)/vmlinux $(DEBUG_DIR)/boot/vmlinux-$(REAL_VERSION)
 ifeq ($(MODULES),True)
 	+$(MAKE_CLEAN) -C $(DIR) modules_install INSTALL_MOD_PATH='$(CURDIR)'/$(DEBUG_DIR)
-	rm $(DEBUG_DIR)/lib/modules/*/{build,source,modules.*}
+	find $(DEBUG_DIR)/lib/modules/$(REAL_VERSION)/ -mindepth 1 -maxdepth 1 \! -name kernel -exec rm {} \+
 	rm $(DEBUG_DIR)/lib/firmware -rf
 endif
 	+$(MAKE_SELF) install-base BUILDDEB_ARGS="-Zbzip2"