diff options
| author | Ben Hutchings <benh@debian.org> | 2012-12-29 01:25:08 +0000 |
|---|---|---|
| committer | Ben Hutchings <benh@debian.org> | 2012-12-29 01:25:08 +0000 |
| commit | 7459df34cd1654a9528ce2854339025d7e209fe3 (patch) | |
| tree | e934c04b511439e818bb37b02c7d9bd23bbfbf39 | |
| parent | 42681a39c415ce42e84df552ab9012ef49151995 (diff) | |
| download | kernel_replicant_linux-7459df34cd1654a9528ce2854339025d7e209fe3.tar.gz kernel_replicant_linux-7459df34cd1654a9528ce2854339025d7e209fe3.tar.bz2 kernel_replicant_linux-7459df34cd1654a9528ce2854339025d7e209fe3.zip | |
Do not use link-vmlinux.sh when cleaning external modules (Closes: #696775)
svn path=/dists/trunk/linux/; revision=19658
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/clean-modules-without-link-vmlinux.sh.patch | 33 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 35 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 3da857b2f2cb..8ada7189b7d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ linux (3.7.1-1~experimental.2) UNRELEASED; urgency=low [ 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@decadent.org.uk> Sat, 29 Dec 2012 02:05:46 +0100 diff --git a/debian/patches/clean-modules-without-link-vmlinux.sh.patch b/debian/patches/clean-modules-without-link-vmlinux.sh.patch new file mode 100644 index 000000000000..f5bae91e2bd0 --- /dev/null +++ b/debian/patches/clean-modules-without-link-vmlinux.sh.patch @@ -0,0 +1,33 @@ +From: Ben Hutchings <ben@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) \ diff --git a/debian/patches/series b/debian/patches/series index b5f0a16b3ab1..f7798db67437 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -68,3 +68,4 @@ bugfix/all/pch_gbe-ptp_pch-Fix-the-dependency-direction-between.patch debian/udl-disable-autoload.patch debian/ast-disable-autoload.patch debian/mgag200-disable-autoload.patch +clean-modules-without-link-vmlinux.sh.patch |