[kernel] r5047 - in dists/trunk/linux-2.6/debian: . arch/powerpc bin
Sven Luther
luther at costa.debian.org
Mon Dec 19 22:26:36 UTC 2005
Author: luther
Date: Mon Dec 19 22:26:34 2005
New Revision: 5047
Modified:
dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64
dists/trunk/linux-2.6/debian/arch/powerpc/defines
dists/trunk/linux-2.6/debian/bin/gencontrol.py
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/rules.real
Log:
Added support for make-kpkg --arch into gencontrol.py defines handling.
Added correct --arch entries for powerpc defines.
Untested though, may need a new kernel-package, but i think not.
Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64 (original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64 Mon Dec 19 22:26:34 2005
@@ -86,9 +86,7 @@
CONFIG_RTAS_ERROR_LOGGING=y
CONFIG_GENERIC_TBSYNC=y
# CONFIG_EMBEDDED6xx is not set
-CONFIG_WINDFARM_PM91=y
CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_WINDFARM_PM81=y
CONFIG_HAVE_MEMORY_PRESENT=y
# CONFIG_PPC_64K_PAGES is not set
CONFIG_SPARSEMEM_EXTREME=y
@@ -100,3 +98,10 @@
CONFIG_POWER3=y
CONFIG_POWER4=y
# CONFIG_FLATMEM_MANUAL is not set
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_WINDFARM_PM91=m
+CONFIG_SPLIT_PTLOCK_CPUS=4096
+CONFIG_WINDFARM_PM81=m
+CONFIG_KERNEL_START=0xc000000000000000
+CONFIG_MAC_FLOPPY is not set
+
Modified: dists/trunk/linux-2.6/debian/arch/powerpc/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/defines (original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/defines Mon Dec 19 22:26:34 2005
@@ -4,13 +4,15 @@
powerpc-smp
powerpc-miboot
powerpc64
-kernel-header-dirs: powerpc ppc ppc64 m68k
+kernel-header-dirs: powerpc ppc m68k
kernel-arch: powerpc
kpkg-subarch: powerpc
+kpkg-arch: powerpc
[apus]
kernel-arch: ppc
-kpkg-subarch: powerpc32
+kpkg-subarch: powerpc
+kpkg-arch: ppc
depends: mkvmlinuz (>= 15)
[powerpc]
@@ -18,3 +20,6 @@
[powerpc-smp]
depends: mkvmlinuz (>= 15)
+
+[powerpc64]
+kpkg-subarch: powerpc64
Modified: dists/trunk/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/gencontrol.py (original)
+++ dists/trunk/linux-2.6/debian/bin/gencontrol.py Mon Dec 19 22:26:34 2005
@@ -341,7 +341,7 @@
makefile.append(("%s-%s-%s-%s:: %s-%s-%s-%s-real" % (i, arch, subarch, flavour, i, arch, subarch, flavour), None))
makeflags['FLAVOUR'] = flavour
- for i in (('compiler', 'COMPILER'), ('kernel-header-dirs', 'KERNEL_HEADER_DIRS'), ('kpkg-subarch', 'KPKG_SUBARCH')):
+ for i in (('compiler', 'COMPILER'), ('kernel-header-dirs', 'KERNEL_HEADER_DIRS'), ('kpkg-subarch', 'KPKG_SUBARCH'), ('kpkg-arch', 'KPKG_ARCH')):
if config_entry.has_key(i[0]):
makeflags[i[1]] = config_entry[i[0]]
makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog (original)
+++ dists/trunk/linux-2.6/debian/changelog Mon Dec 19 22:26:34 2005
@@ -16,12 +16,16 @@
486 to mention 2.6 (not 2.6.12).
[ Frederik Schüler ]
- * Add updated version of drivers-scsi-megaraid_splitup.patch.
+ * Add updated version of drivers-scsi-megaraid_splitup.patch.
(Closes: #317258)
* Deactivate CONFIG_IDE_TASK_IOCTL on alpha and ia64 and make it a global
option.
- -- Frederik Schüler <fs at debian.org> Mon, 19 Dec 2005 01:10:37 +0100
+ [ Sven Luther ]
+ * Added make-kpkg --arch option support to gencontrol.py.
+ * [powerpc] now set --arch kernel-package option correctly.
+
+ -- Sven Luther <luther at debian.org> Mon, 19 Dec 2005 22:21:46 +0000
linux-2.6 (2.6.14+2.6.15-rc5-0experimental.1) experimental; urgency=low
Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real (original)
+++ dists/trunk/linux-2.6/debian/rules.real Mon Dec 19 22:26:34 2005
@@ -45,6 +45,10 @@
kpkg_image += --arch '$(ARCH)'
kpkg_image += --stem linux
kpkg_image += --initrd
+ifdef KPKG_ARCH
+ kpkg_image += --arch '$(KPKG_ARCH)'
+ kpkg_header += --arch '$(KPKG_ARCH)'
+endif
ifdef KPKG_SUBARCH
kpkg_image += --subarch '$(KPKG_SUBARCH)'
kpkg_header += --subarch '$(KPKG_SUBARCH)'
More information about the Kernel-svn-changes
mailing list