r3736 - in people/waldi/kernel/source/linux-2.6/debian: . arch/m68k arch/powerpc templates

Bastian Blank waldi at costa.debian.org
Mon Aug 8 12:06:39 UTC 2005 

Author: waldi
Date: 2005-08-08 12:06:37 +0000 (Mon, 08 Aug 2005)
New Revision: 3736

Added:
   people/waldi/kernel/source/linux-2.6/debian/arch/m68k/Makefile.inc
Removed:
   people/waldi/kernel/source/linux-2.6/debian/arch/m68k/desc.amiga
   people/waldi/kernel/source/linux-2.6/debian/arch/m68k/desc.atari
   people/waldi/kernel/source/linux-2.6/debian/arch/m68k/desc.bvme6000
   people/waldi/kernel/source/linux-2.6/debian/arch/m68k/desc.hp
   people/waldi/kernel/source/linux-2.6/debian/arch/m68k/desc.mac
   people/waldi/kernel/source/linux-2.6/debian/arch/m68k/desc.mvme147
   people/waldi/kernel/source/linux-2.6/debian/arch/m68k/desc.mvme16x
   people/waldi/kernel/source/linux-2.6/debian/arch/m68k/desc.q40
   people/waldi/kernel/source/linux-2.6/debian/arch/m68k/desc.sun3
Modified:
   people/waldi/kernel/source/linux-2.6/debian/
   people/waldi/kernel/source/linux-2.6/debian/Makefile
   people/waldi/kernel/source/linux-2.6/debian/arch/m68k/defines
   people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/Makefile.inc
   people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/defines
   people/waldi/kernel/source/linux-2.6/debian/changelog
   people/waldi/kernel/source/linux-2.6/debian/rules
   people/waldi/kernel/source/linux-2.6/debian/templates/control.source.in
   people/waldi/kernel/source/linux-2.6/debian/templates/header-install.in
   people/waldi/kernel/source/linux-2.6/debian/templates/post-install.in
Log:
Merge /trunk/kernel/source/linux-2.6.



Property changes on: people/waldi/kernel/source/linux-2.6/debian
___________________________________________________________________
Name: svk:merge
   - 510b9475-24dd-0310-9b6c-e0eefe99d49f:/trunk/kernel/source/linux-2.6/debian:3714
   + 510b9475-24dd-0310-9b6c-e0eefe99d49f:/trunk/kernel/source/linux-2.6/debian:3734

Modified: people/waldi/kernel/source/linux-2.6/debian/Makefile
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/Makefile	2005-08-08 08:07:55 UTC (rev 3735)
+++ people/waldi/kernel/source/linux-2.6/debian/Makefile	2005-08-08 12:06:37 UTC (rev 3736)
@@ -143,6 +143,7 @@
 header-install-$(subarch): templates/header-install.in
 	sed -e 's, at kbpkg@,$(kbpkg),g'				\
 	    -e 's, at ksource_dir@,$(CURDIR)/$(kdir),g'		\
+	    -e 's, at flavours@,$(flavours),g'			\
 	    -e 's, at headers_dirs@,$(headers_dirs),g'		\
             templates/header-install.in > header-install-$(subarch)
 	chmod u+x header-install-$(subarch)

Added: people/waldi/kernel/source/linux-2.6/debian/arch/m68k/Makefile.inc
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/m68k/Makefile.inc	2005-08-08 08:07:55 UTC (rev 3735)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/m68k/Makefile.inc	2005-08-08 12:06:37 UTC (rev 3736)
@@ -0,0 +1,4 @@
+#
+# Variables 
+#
+build_makeflags := 'CC=m68k-linux-gcc-3.3'

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/m68k/defines
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/m68k/defines	2005-08-08 08:07:55 UTC (rev 3735)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/m68k/defines	2005-08-08 12:06:37 UTC (rev 3736)
@@ -1,2 +1,30 @@
 [DEFAULT]
 suggests: vmelilo, fdutils
+
+[amiga]
+class: Amiga
+
+[atari]
+class: Atari
+
+[bvme6000]
+class: BVM BVME4000 and BVME6000 SBCs
+
+[hp]
+class: HP
+
+[mac]
+class: Macintosh
+
+[mvme147]
+class: Motorola MVME147 SBCs
+
+[mvme16x]
+class: Motorola MVME162/6/7, MVME172/7 SBCs
+
+[q40]
+class: Q40 and Q60
+
+[sun3]
+class: sun3
+

Deleted: people/waldi/kernel/source/linux-2.6/debian/arch/m68k/desc.amiga
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/m68k/desc.amiga	2005-08-08 08:07:55 UTC (rev 3735)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/m68k/desc.amiga	2005-08-08 12:06:37 UTC (rev 3736)
@@ -1 +0,0 @@
-class="Amiga"

Deleted: people/waldi/kernel/source/linux-2.6/debian/arch/m68k/desc.atari
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/m68k/desc.atari	2005-08-08 08:07:55 UTC (rev 3735)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/m68k/desc.atari	2005-08-08 12:06:37 UTC (rev 3736)
@@ -1 +0,0 @@
-class="Atari"

Deleted: people/waldi/kernel/source/linux-2.6/debian/arch/m68k/desc.bvme6000
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/m68k/desc.bvme6000	2005-08-08 08:07:55 UTC (rev 3735)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/m68k/desc.bvme6000	2005-08-08 12:06:37 UTC (rev 3736)
@@ -1 +0,0 @@
-class="BVM BVME4000 and BVME6000 SBCs"

Deleted: people/waldi/kernel/source/linux-2.6/debian/arch/m68k/desc.hp
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/m68k/desc.hp	2005-08-08 08:07:55 UTC (rev 3735)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/m68k/desc.hp	2005-08-08 12:06:37 UTC (rev 3736)
@@ -1 +0,0 @@
-class="HP"

Deleted: people/waldi/kernel/source/linux-2.6/debian/arch/m68k/desc.mac
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/m68k/desc.mac	2005-08-08 08:07:55 UTC (rev 3735)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/m68k/desc.mac	2005-08-08 12:06:37 UTC (rev 3736)
@@ -1 +0,0 @@
-class="Macintosh"

Deleted: people/waldi/kernel/source/linux-2.6/debian/arch/m68k/desc.mvme147
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/m68k/desc.mvme147	2005-08-08 08:07:55 UTC (rev 3735)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/m68k/desc.mvme147	2005-08-08 12:06:37 UTC (rev 3736)
@@ -1 +0,0 @@
-class="Motorola MVME147 SBCs"

Deleted: people/waldi/kernel/source/linux-2.6/debian/arch/m68k/desc.mvme16x
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/m68k/desc.mvme16x	2005-08-08 08:07:55 UTC (rev 3735)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/m68k/desc.mvme16x	2005-08-08 12:06:37 UTC (rev 3736)
@@ -1 +0,0 @@
-class="Motorola MVME162/6/7, MVME172/7 SBCs"

Deleted: people/waldi/kernel/source/linux-2.6/debian/arch/m68k/desc.q40
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/m68k/desc.q40	2005-08-08 08:07:55 UTC (rev 3735)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/m68k/desc.q40	2005-08-08 12:06:37 UTC (rev 3736)
@@ -1 +0,0 @@
-class="Q40 and Q60"

Deleted: people/waldi/kernel/source/linux-2.6/debian/arch/m68k/desc.sun3
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/m68k/desc.sun3	2005-08-08 08:07:55 UTC (rev 3735)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/m68k/desc.sun3	2005-08-08 12:06:37 UTC (rev 3736)
@@ -1 +0,0 @@
-class="sun3"

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/Makefile.inc
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/Makefile.inc	2005-08-08 08:07:55 UTC (rev 3735)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/Makefile.inc	2005-08-08 12:06:37 UTC (rev 3736)
@@ -1,6 +1,6 @@
 #
 # Variables 
 #
-headers_dirs = 'ppc | ppc64'
+headers_dirs = ppc | ppc64
 headers_subarch = powerpc
 build_subarch = powerpc

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/defines
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/defines	2005-08-08 08:07:55 UTC (rev 3735)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/defines	2005-08-08 12:06:37 UTC (rev 3736)
@@ -1,3 +1,2 @@
 [DEFAULT]
 depends: mkvmlinuz (>= 13)
-suggests: fdutils

Modified: people/waldi/kernel/source/linux-2.6/debian/changelog
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/changelog	2005-08-08 08:07:55 UTC (rev 3735)
+++ people/waldi/kernel/source/linux-2.6/debian/changelog	2005-08-08 12:06:37 UTC (rev 3736)
@@ -1,15 +1,15 @@
 linux-2.6 (2.6.12-2) UNRELEASED; urgency=low
 
   The kernel team dedicates this release to Jens Schmalzig (jensen), who died
-  saturday, July 30, 2005 in a tragic accident in Munich. Jens was a member
+  Saturday, July 30, 2005 in a tragic accident in Munich. Jens was a member
   of the kernel team, and was instrumental in taking the powerpc kernel
   package to 2.6, as well as maintained MOL and its kernel modules. We offer
   condoleance to his surviving family and miss him dearly.
 
   * Add @longclass@ variable to control file autogeneration. (Andres Salomon)
 
-  * Bump build-depends on kernel-package to a fixed version (>= 9.004).
-    (Jurij Smakov) (closes: #319657, #320422)
+  * Bump build-depends on kernel-package to a fixed version (>= 9.005).
+    (Jurij Smakov, Sven Luther) (closes: #319657, #320422, #321625)
 
   * Change default ramdisk size for sparc to 16,384K to accomodate a fatter
     d-i initrd for netboot installs.
@@ -19,7 +19,7 @@
 
   * Add ARM support. (Vincent Sanders)
 
-  * Add desc.* files for ia64. (dann frazier)
+  * Add ia64 descriptions. (dann frazier)
 
   * Strip down the scripts dir in the headers packages. (Bastian Blank)
 
@@ -44,13 +44,18 @@
   * Enable CONFIG_6PACK=m for all archs (Andres Salomon)
     (closes: #319646)
 
-  * [powerpc] Fixed minor problems with the powerpc image :
-    - mkvmlinuz support was missing, should be fixed building with
-      kernel-package 9.005. (Closes: #321625)
-    - typo made the ams-ppc and asm-ppc64 headers not being included.
-    - re-added dependency on mkvmlinuz for powerpc.
+  * Overhaul the generation of the control file. Now it is handled
+    by debian/bin/gencontrol.py. The debian/control target in rules
+    also fails now, since we don't want the control file generated
+    during build. Arch-specific Depends and suggests are now generated
+    correctly. (Bastian Blank) (Closes: #319896)
 
- -- Sven Luther <luther at debian.org>  Sun,  7 Aug 2005 09:12:51 +0200
+  * [powerpc] Fixed typo which made asm-ppc and asm-ppc64 not being included
+    in the header package. (Sven Luther) (Closes: #320817)
+
+  * Added list of flavours built to common header package. (Sven Luther)
+
+ -- Sven Luther <luther at debian.org>  Mon,  8 Aug 2005 08:54:03 +0200
  
 linux-2.6 (2.6.12-1) unstable; urgency=low
 

Modified: people/waldi/kernel/source/linux-2.6/debian/rules
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/rules	2005-08-08 08:07:55 UTC (rev 3735)
+++ people/waldi/kernel/source/linux-2.6/debian/rules	2005-08-08 12:06:37 UTC (rev 3736)
@@ -227,6 +227,12 @@
 #
 debian/control: debian/changelog $(wildcard debian/templates/control.*.in)
 	debian/bin/gencontrol.py
+	@echo
+	@echo This target is made to fail intentionally, to make sure
+	@echo that it is NEVER run during the automated build. Please
+	@echo ignore the following error, the debian/control file has
+	@echo been generated SUCCESSFULLY.
+	@echo
 	exit 1
 
 .PHONY: clean build unpack binary-indep binary-arch binary patch unpatch source tree

Modified: people/waldi/kernel/source/linux-2.6/debian/templates/control.source.in
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/templates/control.source.in	2005-08-08 08:07:55 UTC (rev 3735)
+++ people/waldi/kernel/source/linux-2.6/debian/templates/control.source.in	2005-08-08 12:06:37 UTC (rev 3736)
@@ -4,5 +4,5 @@
 Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
 Uploaders: Andres Salomon <dilinger at 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 [!s390], sparc-utils [sparc], kernel-package (>= 9.004), kernel-package (>= 9.005) [powerpc]
+Build-Depends: gcc (>= 4:4.0) [!sparc !alpha !m68k], gcc-3.3 [sparc alpha m68k], debhelper (>= 4.1.0), module-init-tools, dpkg-dev (>= 1.10.23), debianutils (>= 1.6), bzip2, console-tools [!s390], sparc-utils [sparc], kernel-package (>= 9.005)
 Build-Depends-Indep: docbook-utils, gs, transfig, xmlto, dh-kpatches (>= 0.99.3)

Modified: people/waldi/kernel/source/linux-2.6/debian/templates/header-install.in
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/templates/header-install.in	2005-08-08 08:07:55 UTC (rev 3735)
+++ people/waldi/kernel/source/linux-2.6/debian/templates/header-install.in	2005-08-08 12:06:37 UTC (rev 3736)
@@ -11,6 +11,10 @@
 # archs do some *very* strange things...
 rm -rf scripts
 
+# Let's add the flavours that are built for a given arch.
+# XXX: will probably need rethinking once the common headers are Arch: all.
+echo @flavours@ >flavours
+
 # XXX: once we're using a linux-headers-$(version)-$(debnum) that's Arch: all,
 # we'll want to drop this bit of code.  The asm-* directories should remain.
 
@@ -26,3 +30,4 @@
 	esac
 done
 ${remove:+rm -r $remove}
+

Modified: people/waldi/kernel/source/linux-2.6/debian/templates/post-install.in
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/templates/post-install.in	2005-08-08 08:07:55 UTC (rev 3735)
+++ people/waldi/kernel/source/linux-2.6/debian/templates/post-install.in	2005-08-08 12:06:37 UTC (rev 3736)
@@ -94,13 +94,13 @@
 mkdir -p $dir/scripts/mod
 cp -a scripts/Makefile* $dir/scripts
 cp -a scripts/kallsyms $dir/scripts
-strip $dir/scripts/kallsyms
+strip --remove-section=.comment --remove-section=.note $dir/scripts/kallsyms
 cp -a scripts/basic/fixdep $dir/scripts/basic
-strip $dir/scripts/basic/fixdep
+strip --remove-section=.comment --remove-section=.note $dir/scripts/basic/fixdep
 cp -a scripts/kconfig/conf $dir/scripts/kconfig
-strip $dir/scripts/kconfig/conf
+strip --remove-section=.comment --remove-section=.note $dir/scripts/kconfig/conf
 cp -a scripts/mod/modpost $dir/scripts/mod
-strip $dir/scripts/mod/modpost
+strip --remove-section=.comment --remove-section=.note $dir/scripts/mod/modpost
 
 debhelper_post $pkg

More information about the Kernel-svn-changes mailing list