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

[Ben Hutchings]

Author: benh
Date: Wed Aug 18 02:36:24 2010
New Revision: 16157

Log:
Merge some changes from trunk

Add .gnu_debuglink information into kernel modules (Closes: #555549)
Exit loops on failure, so that the failure is not ignored

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 Aug 18 02:29:07 2010	(r16156)
+++ dists/sid/linux-2.6/debian/changelog	Wed Aug 18 02:36:24 2010	(r16157)
@@ -15,6 +15,9 @@
     - Notify Xen on crash.
     - Several blktap fixes.
 
+  [ Ritesh Raj Sarraf ]
+  * Add .gnu_debuglink information into kernel modules (Closes: #555549)
+
  -- Ben Hutchings <ben at decadent.org.uk>  Thu, 12 Aug 2010 23:20:55 +0100
 
 linux-2.6 (2.6.32-20) unstable; urgency=low

Modified: dists/sid/linux-2.6/debian/rules.real
==============================================================================
--- dists/sid/linux-2.6/debian/rules.real	Wed Aug 18 02:29:07 2010	(r16156)
+++ dists/sid/linux-2.6/debian/rules.real	Wed Aug 18 02:36:24 2010	(r16157)
@@ -343,6 +343,11 @@
 	  DIR='$(DIR)' PACKAGE_DIR='$(PACKAGE_DIR)' INSTALL_DIR='$(INSTALL_DIR)' REAL_VERSION='$(REAL_VERSION)'
 ifeq ($(MODULES),True)
 	+$(MAKE_CLEAN) -C $(DIR) modules_install INSTALL_MOD_PATH='$(CURDIR)'/$(PACKAGE_DIR) INSTALL_MOD_STRIP=1
+ifeq ($(DEBUG),True)
+	find $(PACKAGE_DIR) -name '*.ko' | sed 's|$(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/kernel/||' | while read module ; do \
+	  objcopy --add-gnu-debuglink=$(DIR)/$$module $(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/kernel/$$module || exit; \
+	done
+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.*}
@@ -408,13 +413,13 @@
 	    -e 's/=K/$(ARG_KIMAGE)/g' \
 	    -e 's@=MK@$(INITRD_CMD)@g' \
 	    -e 's/=V/$(REAL_VERSION)/g' \
-	    $$i > debian/$(PACKAGE_NAME).$$(basename $$i); \
+	    $$i > debian/$(PACKAGE_NAME).$$(basename $$i) || exit; \
 	done
 	mkdir -p debian/$(PACKAGE_NAME).po
 	for i in $(wildcard debian/po/*.po); do \
 	  sed \
 	    -e 's/=V/$(REAL_VERSION)/g' \
-	    $$i > debian/$(PACKAGE_NAME).po/$$(basename $$i); \
+	    $$i > debian/$(PACKAGE_NAME).po/$$(basename $$i) || exit; \
 	done
 	mkdir -p debian/$(PACKAGE_NAME)/DEBIAN
 	po2debconf --podir debian/$(PACKAGE_NAME).po \