[kernel] r19658 - in dists/trunk/linux/debian: . patches

[Ben Hutchings]

Author: benh
Date: Sat Dec 29 01:25:08 2012
New Revision: 19658

Log:
Do not use link-vmlinux.sh when cleaning external modules (Closes: #696775)

Added:
   dists/trunk/linux/debian/patches/clean-modules-without-link-vmlinux.sh.patch
Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/patches/series

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Sat Dec 29 01:12:07 2012	(r19657)
+++ dists/trunk/linux/debian/changelog	Sat Dec 29 01:25:08 2012	(r19658)
@@ -3,6 +3,7 @@
   [ Ben Hutchings ]
   * linux-headers-common: Include the include/uapi/asm-generic directory
     (Closes: #696664)
+  * Do not use link-vmlinux.sh when cleaning external modules (Closes: #696775)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 29 Dec 2012 02:05:46 +0100
 

Added: dists/trunk/linux/debian/patches/clean-modules-without-link-vmlinux.sh.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/clean-modules-without-link-vmlinux.sh.patch	Sat Dec 29 01:25:08 2012	(r19658)
@@ -0,0 +1,33 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: Clean modules without link-vmlinux.sh
+Date: Sat, 29 Dec 2012 01:51:05 +0100
+Bug-Debian: http://bugs.debian.org/696775
+
+Calling link-vmlinux.sh when cleaning external modules is stupid.
+
+--- a/Makefile
++++ b/Makefile
+@@ -1036,11 +1036,13 @@ clean: rm-dirs  := $(CLEAN_DIRS)
+ clean: rm-files := $(CLEAN_FILES)
+ clean-dirs      := $(addprefix _clean_, . $(vmlinux-alldirs) Documentation samples)
+ 
+-PHONY += $(clean-dirs) clean archclean
++PHONY += $(clean-dirs) clean-vmlinux clean archclean
+ $(clean-dirs):
+ 	$(Q)$(MAKE) $(clean)=$(patsubst _clean_%,%,$@)
++clean-vmlinux:
++	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/link-vmlinux.sh clean
+ 
+-clean: archclean
++clean: clean-vmlinux archclean
+ 
+ # mrproper - Delete all generated files, including .config
+ #
+@@ -1267,7 +1269,6 @@ scripts: ;
+ endif # KBUILD_EXTMOD
+ 
+ clean: $(clean-dirs)
+-	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/link-vmlinux.sh clean
+ 	$(call cmd,rmdirs)
+ 	$(call cmd,rmfiles)
+ 	@find $(if $(KBUILD_EXTMOD), $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \

Modified: dists/trunk/linux/debian/patches/series
==============================================================================
--- dists/trunk/linux/debian/patches/series	Sat Dec 29 01:12:07 2012	(r19657)
+++ dists/trunk/linux/debian/patches/series	Sat Dec 29 01:25:08 2012	(r19658)
@@ -68,3 +68,4 @@
 debian/udl-disable-autoload.patch
 debian/ast-disable-autoload.patch
 debian/mgag200-disable-autoload.patch
+clean-modules-without-link-vmlinux.sh.patch