r3578 - trunk/kernel/source/linux-2.6-2.6.12/debian

[Andres Salomon]

Author: dilinger
Date: 2005-07-18 21:46:09 +0000 (Mon, 18 Jul 2005)
New Revision: 3578

Modified:
   trunk/kernel/source/linux-2.6-2.6.12/debian/Makefile
Log:
minor fixups; add an explicit dep on config.$flavour, so that  it's built;
also add a comment about using 'make defconfig' instead of config.default
to build the config config.  It's going to have to wait for kernel-package
support, i suppose; wishlist bug has been filed, but I got tired of waiting
for the BTS to respond.


Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/Makefile
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/Makefile	2005-07-18 21:06:00 UTC (rev 3577)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/Makefile	2005-07-18 21:46:09 UTC (rev 3578)
@@ -83,7 +83,7 @@
 ifndef headers_dirs
   headers_dirs = $(karch)
 endif
-ccommon += arch/config arch/$(karch)/config arch/$(karch)/$(subarch)/config
+ccommon = arch/config arch/$(karch)/config arch/$(karch)/$(subarch)/config
 #
 # Here we build lists of directories and stamps which we will depend on.
 # For each class of such targets there is a pattern rule which will catch
@@ -129,8 +129,11 @@
 	rm -rf install-$*;
 	touch install-stamp-$(subarch)-$*
 
-headers-stamp: $(kdir)
-	default='$(firstword $(wildcard $(default_list)))';		\
+headers-stamp: $(kdir) config.$(firstword $(flavours))
+	# In the long term, we can just use 'make-kpkg --config def' instead
+	# of providing a default config; however, we're going to have to
+	# wait for kernel-package to fix that first.  #XXX
+	default='$(firstword $(wildcard $(default_list)))';             \
 	echo "I: Using $${default} as the header configuration file.";	\
 	cp "$${default}" $(kdir)/.config
 	cd $(kdir); $(kpkg_headers_cmd)