linux-mips
[Top] [All Lists]

[PATCH] MIPS: Repair Kbuild make clean breakage.

To: linux-mips@linux-mips.org, ralf@linux-mips.org
Subject: [PATCH] MIPS: Repair Kbuild make clean breakage.
From: David Daney <ddaney@caviumnetworks.com>
Date: Mon, 18 Oct 2010 17:51:26 -0700
Cc: David Daney <ddaney@caviumnetworks.com>, Sam Ravnborg <sam@ravnborg.org>
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
When running make clean, Kbuild doesn't process the .config file, so
nothing generates a platform-y variable.  We can get it to descend into
the platform directories by setting $(obj-).

The dec Platform file was unconditionally setting platform-,
obliterating its previous contents and preventing some directories
from being cleaned.  This is change to an append operation '+=' to
allow cavium-octeon to be cleaned.

Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
---
 arch/mips/Kbuild       |    4 ++++
 arch/mips/dec/Platform |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/arch/mips/Kbuild b/arch/mips/Kbuild
index e322d65..7dd65cf 100644
--- a/arch/mips/Kbuild
+++ b/arch/mips/Kbuild
@@ -7,6 +7,10 @@ subdir-ccflags-y := -Werror
 include arch/mips/Kbuild.platforms
 obj-y := $(platform-y)
 
+# make clean traverses $(obj-) without having included .config, so
+# everything ends up here
+obj- := $(platform-)
+
 # mips object files
 # The object files are linked as core-y files would be linked
 
diff --git a/arch/mips/dec/Platform b/arch/mips/dec/Platform
index 3adbcbd..cf55a6f 100644
--- a/arch/mips/dec/Platform
+++ b/arch/mips/dec/Platform
@@ -1,7 +1,7 @@
 #
 # DECstation family
 #
-platform-$(CONFIG_MACH_DECSTATION)     = dec/
+platform-$(CONFIG_MACH_DECSTATION)     += dec/
 cflags-$(CONFIG_MACH_DECSTATION)       += \
                        -I$(srctree)/arch/mips/include/asm/mach-dec
 libs-$(CONFIG_MACH_DECSTATION)         += arch/mips/dec/prom/
-- 
1.7.2.3


<Prev in Thread] Current Thread [Next in Thread>
  • [PATCH] MIPS: Repair Kbuild make clean breakage., David Daney <=