r3583 - in trunk/kernel/source/linux-2.6-2.6.12/debian: . arch/alpha arch/amd64 arch/i386 arch/powerpc arch/s390 arch/sparc templates

Andres Salomon dilinger at costa.debian.org
Tue Jul 19 19:09:40 UTC 2005 

Author: dilinger
Date: 2005-07-19 19:09:39 +0000 (Tue, 19 Jul 2005)
New Revision: 3583

Modified:
   trunk/kernel/source/linux-2.6-2.6.12/debian/Makefile
   trunk/kernel/source/linux-2.6-2.6.12/debian/README
   trunk/kernel/source/linux-2.6-2.6.12/debian/README.PPC64
   trunk/kernel/source/linux-2.6-2.6.12/debian/arch/alpha/Makefile.inc
   trunk/kernel/source/linux-2.6-2.6.12/debian/arch/amd64/Makefile.inc
   trunk/kernel/source/linux-2.6-2.6.12/debian/arch/i386/Makefile.inc
   trunk/kernel/source/linux-2.6-2.6.12/debian/arch/powerpc/Makefile.inc
   trunk/kernel/source/linux-2.6-2.6.12/debian/arch/s390/Makefile.inc
   trunk/kernel/source/linux-2.6-2.6.12/debian/arch/sparc/Makefile.inc
   trunk/kernel/source/linux-2.6-2.6.12/debian/changelog
   trunk/kernel/source/linux-2.6-2.6.12/debian/templates/control.source.in
Log:
default configs are autogenerated now; instead of doing a manual make defconfig,
have kernel-package do it (--config def).  This requires kernel-package 9.002,
so add a versioned dep for all archs.  Also, drop any and all mentions of
default_config.


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-19 19:06:08 UTC (rev 3582)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/Makefile	2005-07-19 19:09:39 UTC (rev 3583)
@@ -35,7 +35,7 @@
 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 @@
 #
 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)- at flavour@
 kpkg_build_cmd += --stem linux
 ifdef build_subarch
@@ -118,11 +118,9 @@
 	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
 

Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/README
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/README	2005-07-19 19:06:08 UTC (rev 3582)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/README	2005-07-19 19:09:39 UTC (rev 3583)
@@ -170,24 +170,6 @@
   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,

Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/README.PPC64
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/README.PPC64	2005-07-19 19:06:08 UTC (rev 3582)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/README.PPC64	2005-07-19 19:09:39 UTC (rev 3583)
@@ -22,7 +22,6 @@
   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
 

Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/arch/alpha/Makefile.inc
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/arch/alpha/Makefile.inc	2005-07-19 19:06:08 UTC (rev 3582)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/arch/alpha/Makefile.inc	2005-07-19 19:09:39 UTC (rev 3583)
@@ -1,6 +1,5 @@
 #
 # Variables 
 #
-default_config := alpha-generic
 initrd_modules := kernel/security/capability.ko
 build_makeflags := 'CC=gcc-3.3'

Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/arch/amd64/Makefile.inc
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/arch/amd64/Makefile.inc	2005-07-19 19:06:08 UTC (rev 3582)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/arch/amd64/Makefile.inc	2005-07-19 19:09:39 UTC (rev 3583)
@@ -3,5 +3,4 @@
 #
 initrd_modules := kernel/drivers/video/vesafb.ko kernel/security/capability.ko
 headers_dirs = x86_64
-default_config := amd64-generic
 

Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/arch/i386/Makefile.inc
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/arch/i386/Makefile.inc	2005-07-19 19:06:08 UTC (rev 3582)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/arch/i386/Makefile.inc	2005-07-19 19:09:39 UTC (rev 3583)
@@ -1,5 +1,4 @@
 #
 # Variables 
 #
-default_config := 386
 initrd_modules := kernel/drivers/video/vesafb.ko kernel/security/capability.ko

Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/arch/powerpc/Makefile.inc
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/arch/powerpc/Makefile.inc	2005-07-19 19:06:08 UTC (rev 3582)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/arch/powerpc/Makefile.inc	2005-07-19 19:09:39 UTC (rev 3583)
@@ -4,4 +4,3 @@
 header_dirs = 'ppc | ppc64'
 headers_subarch = powerpc
 build_subarch = powerpc
-default_config = powerpc

Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/arch/s390/Makefile.inc
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/arch/s390/Makefile.inc	2005-07-19 19:06:08 UTC (rev 3582)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/arch/s390/Makefile.inc	2005-07-19 19:09:39 UTC (rev 3583)
@@ -1,4 +1,3 @@
 #
 # Variables 
 #
-default_config := s390

Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/arch/sparc/Makefile.inc
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/arch/sparc/Makefile.inc	2005-07-19 19:06:08 UTC (rev 3582)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/arch/sparc/Makefile.inc	2005-07-19 19:09:39 UTC (rev 3583)
@@ -7,5 +7,4 @@
 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'

Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/changelog
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/changelog	2005-07-19 19:06:08 UTC (rev 3582)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/changelog	2005-07-19 19:09:39 UTC (rev 3583)
@@ -59,6 +59,8 @@
     - 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)

Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/templates/control.source.in
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/templates/control.source.in	2005-07-19 19:06:08 UTC (rev 3582)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/templates/control.source.in	2005-07-19 19:09:39 UTC (rev 3583)
@@ -3,5 +3,5 @@
 Priority: optional
 Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
 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)

More information about the Kernel-svn-changes mailing list