From 094c293fbd6207438001ef18338614c381bded16 Mon Sep 17 00:00:00 2001 From: Andres Salomon Date: Mon, 18 Jul 2005 21:46:09 +0000 Subject: [PATCH] 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. svn path=/trunk/kernel/source/linux-2.6-2.6.12/; revision=3578 --- debian/Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/Makefile b/debian/Makefile index 44a3139f7..2efaa6c04 100644 --- a/debian/Makefile +++ b/debian/Makefile @@ -83,7 +83,7 @@ kpkg_headers_cmd += kernel-headers 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 @@ install-stamp-$(subarch)-%: build-$(subarch)-% build-stamp-$(subarch)-% 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)