diff --git a/debian/Makefile b/debian/Makefile index 694542aae..fe1c55ec1 100644 --- a/debian/Makefile +++ b/debian/Makefile @@ -35,7 +35,7 @@ else endif configs := $(notdir $(wildcard $(basedir)/config.*)) -configs := $(filter-out config config.default, $(configs)) +configs := $(filter-out config, $(configs)) tkdir := linux-source-$(version) kdir := linux-source-$(version)-$(subarch) ifndef flavours @@ -55,7 +55,7 @@ controls += $(basedir)/control.in # kpkg_headers_cmd := HEADER_CLEAN_HOOK='$(CURDIR)/header-install-$(subarch)' kpkg_headers_cmd += make-kpkg --append-to-version $(append)$(debnum) -kpkg_headers_cmd += --stem linux +kpkg_headers_cmd += --stem linux --config def kpkg_build_cmd := make-kpkg --append-to-version $(debnum)-@flavour@ kpkg_build_cmd += --stem linux ifdef build_subarch @@ -118,11 +118,9 @@ install-stamp-$(subarch)-%: build-$(subarch)-% build-stamp-$(subarch)-% touch install-stamp-$(subarch)-$* headers-stamp: $(kdir) - # In the long term, we can just use 'make-kpkg --config def' instead - # of calling this manually; however, we're going to have to - # wait for kernel-package to fix that first. #XXX - echo "I: generating header configuration file using 'make defconfig.'";\ - cd $(kdir); $(MAKE) defconfig; $(kpkg_headers_cmd) + # The headers config is now automatically generated via the kernel's + # defconfig target. Woo! + cd $(kdir); $(kpkg_headers_cmd) cat $(kdir)/debian/files >> files touch headers-stamp diff --git a/debian/README b/debian/README index aa30a1d6e..2ec64f49a 100644 --- a/debian/README +++ b/debian/README @@ -170,24 +170,6 @@ image_prefix image_prefix_flavours := sparc32 sparc32-smp image_prefix := sparc32 -default_config - - This variable controls which kernel config file will be used as a - "default" config file, used when building the kernel-headers package. - It does not really matter which file is used, see the message at - - http://lists.debian.org/debian-kernel/2004/08/msg01460.html - - The following algorithm will be used to determine the default kernel - config file: - - * If the default_config variable is defined, use config.$(default_config). - * Otherwise pick the first flavour from the flavour list and use its config. - - Typical usage: - - default_config := 386 - extra_postinstall_command This variable, if defined, is executed at the end of the post-install script, diff --git a/debian/README.PPC64 b/debian/README.PPC64 index b4106c3e4..1de6f0437 100644 --- a/debian/README.PPC64 +++ b/debian/README.PPC64 @@ -22,7 +22,6 @@ those arches yourselves : 5) edit Makefile.inc, and change the last three lines to : headers_subarch = powerpc build_subarch = powerpc64 - default_config = pseries 6) go into the toplevel, and launch : dpkg-buildpackage -rfakeroot -us -uc -B diff --git a/debian/arch/alpha/Makefile.inc b/debian/arch/alpha/Makefile.inc index 8b02aa724..c36d25303 100644 --- a/debian/arch/alpha/Makefile.inc +++ b/debian/arch/alpha/Makefile.inc @@ -1,6 +1,5 @@ # # Variables # -default_config := alpha-generic initrd_modules := kernel/security/capability.ko build_makeflags := 'CC=gcc-3.3' diff --git a/debian/arch/amd64/Makefile.inc b/debian/arch/amd64/Makefile.inc index 3236d8140..a022b9028 100644 --- a/debian/arch/amd64/Makefile.inc +++ b/debian/arch/amd64/Makefile.inc @@ -3,5 +3,4 @@ # initrd_modules := kernel/drivers/video/vesafb.ko kernel/security/capability.ko headers_dirs = x86_64 -default_config := amd64-generic diff --git a/debian/arch/i386/Makefile.inc b/debian/arch/i386/Makefile.inc index 2e18808d1..521c6c4c4 100644 --- a/debian/arch/i386/Makefile.inc +++ b/debian/arch/i386/Makefile.inc @@ -1,5 +1,4 @@ # # Variables # -default_config := 386 initrd_modules := kernel/drivers/video/vesafb.ko kernel/security/capability.ko diff --git a/debian/arch/powerpc/Makefile.inc b/debian/arch/powerpc/Makefile.inc index cba7da08c..6abefea2e 100644 --- a/debian/arch/powerpc/Makefile.inc +++ b/debian/arch/powerpc/Makefile.inc @@ -4,4 +4,3 @@ header_dirs = 'ppc | ppc64' headers_subarch = powerpc build_subarch = powerpc -default_config = powerpc diff --git a/debian/arch/s390/Makefile.inc b/debian/arch/s390/Makefile.inc index 3bd89ca46..46773432d 100644 --- a/debian/arch/s390/Makefile.inc +++ b/debian/arch/s390/Makefile.inc @@ -1,4 +1,3 @@ # # Variables # -default_config := s390 diff --git a/debian/arch/sparc/Makefile.inc b/debian/arch/sparc/Makefile.inc index 38a0d4289..9f56224ec 100644 --- a/debian/arch/sparc/Makefile.inc +++ b/debian/arch/sparc/Makefile.inc @@ -7,5 +7,4 @@ build_subarch := @flavour@ image_postproc = strip -R .comment -R .note -K sun4u_init -K _end -K _start arch/$(subst 32,,$(subst -smp,,$*))/boot/image # image_prefix_flavours := sparc32 sparc32-smp # image_prefix := sparc32 -default_config := sparc64 build_makeflags := 'CC=gcc-3.3' diff --git a/debian/changelog b/debian/changelog index 729067f12..424d69e5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -59,6 +59,8 @@ linux-2.6 (2.6.12-1) UNRELEASED; urgency=low - rename source and binary packages - create a common config for different architectures, and management tools to allow for easier modification of config options + - drop default configs, autogenerate them instead; requires + kernel-package >= 9.002. * Add 2.6.12.1 (Maximilian Attems) - Clean up subthread exec (CAN-2005-1913) diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in index 7c670c1d9..715b3150f 100644 --- a/debian/templates/control.source.in +++ b/debian/templates/control.source.in @@ -3,5 +3,5 @@ Section: devel Priority: optional Maintainer: Debian Kernel Team Standards-Version: 3.6.1.0 -Build-Depends: gcc (>= 4:4.0) [!sparc !alpha], gcc-3.3 [sparc alpha], debhelper (>= 4.1.0), module-init-tools, dpkg-dev (>= 1.10.23), debianutils (>= 1.6), bzip2, console-tools, sparc-utils [sparc], kernel-package (>= 9.000) [!powerpc], kernel-package (>= 9.002) [powerpc] +Build-Depends: gcc (>= 4:4.0) [!sparc !alpha], gcc-3.3 [sparc alpha], debhelper (>= 4.1.0), module-init-tools, dpkg-dev (>= 1.10.23), debianutils (>= 1.6), bzip2, console-tools, sparc-utils [sparc], kernel-package (>= 9.002) Build-Depends-Indep: docbook-utils, gs, transfig, xmlto, dh-kpatches (>= 0.99.3)