debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

rename config.common to config, ignore include_common_config (always use 

the common config.  overriding options is implicit, use it if you don't want
to use the common configs), and fixed a subarch bug ($(arch)/config.$(subarch)
vs $(arch)/$(subarch)/config)

svn path=/trunk/kernel/source/linux-2.6-2.6.12/; revision=3518
This commit is contained in:
Andres Salomon 2005-07-16 01:56:00 +00:00
parent 7a903eca9c
commit ba9fdc7115
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
debian/Makefile vendored
View File

@ -35,7 +35,7 @@ else
endif endif
configs := $(notdir $(wildcard $(basedir)/config.*)) configs := $(notdir $(wildcard $(basedir)/config.*))
configs := $(filter-out config.common config.default, $(configs)) configs := $(filter-out config config.default, $(configs))
tkdir := linux-source-$(version) tkdir := linux-source-$(version)
kdir := linux-source-$(version)-$(subarch) kdir := linux-source-$(version)-$(subarch)
ifndef flavours ifndef flavours
@ -83,10 +83,11 @@ kpkg_headers_cmd += kernel-headers
ifndef headers_dirs ifndef headers_dirs
headers_dirs = $(karch) headers_dirs = $(karch)
endif endif
ifneq (no,$(include_common_config)) # XXX: include_common_config disabled.
ccommon := arch/config.common #ifneq (no,$(include_common_config))
endif ccommon := arch/config
ccommon += arch/$(karch)/config.common arch/$(karch)/$(subarch)/config.common #endif
ccommon += arch/config arch/$(karch)/config arch/$(karch)/$(subarch)/config
# #
# Here we build lists of directories and stamps which we will depend on. # 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 # For each class of such targets there is a pattern rule which will catch
@ -162,9 +163,9 @@ post-install-$(subarch): templates/post-install.in
templates/post-install.in > post-install-$(subarch) templates/post-install.in > post-install-$(subarch)
# #
# Generates the kernel config file for a subarch by merging # Generates the kernel config file for a subarch by merging
# the arch-independent config file (arch/config.common), # the arch-independent config file (arch/config),
# arch-specific config file (arch/$(karch)/config.common), # arch-specific config file (arch/$(karch)/config),
# and subarch specific one (arch/$(karch)/config.subarch). # and subarch specific one (arch/$(karch)/$(subarch)/config).
# It is possible to avoid the inclusion of the arch-indep # It is possible to avoid the inclusion of the arch-indep
# config file by setting include_common_config = no in the # config file by setting include_common_config = no in the
# arch/$(karch)/Makefile.inc. # arch/$(karch)/Makefile.inc.