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. svn path=/dists/trunk/linux-2.6/; revision=5047
This commit is contained in:
parent
efab14375b
commit
9c23a8c61c
|
@ -86,9 +86,7 @@ CONFIG_PPC_CELL=y
|
||||||
CONFIG_RTAS_ERROR_LOGGING=y
|
CONFIG_RTAS_ERROR_LOGGING=y
|
||||||
CONFIG_GENERIC_TBSYNC=y
|
CONFIG_GENERIC_TBSYNC=y
|
||||||
# CONFIG_EMBEDDED6xx is not set
|
# CONFIG_EMBEDDED6xx is not set
|
||||||
CONFIG_WINDFARM_PM91=y
|
|
||||||
CONFIG_ARCH_SPARSEMEM_DEFAULT=y
|
CONFIG_ARCH_SPARSEMEM_DEFAULT=y
|
||||||
CONFIG_WINDFARM_PM81=y
|
|
||||||
CONFIG_HAVE_MEMORY_PRESENT=y
|
CONFIG_HAVE_MEMORY_PRESENT=y
|
||||||
# CONFIG_PPC_64K_PAGES is not set
|
# CONFIG_PPC_64K_PAGES is not set
|
||||||
CONFIG_SPARSEMEM_EXTREME=y
|
CONFIG_SPARSEMEM_EXTREME=y
|
||||||
|
@ -100,3 +98,10 @@ CONFIG_I2C_PMAC_SMU=y
|
||||||
CONFIG_POWER3=y
|
CONFIG_POWER3=y
|
||||||
CONFIG_POWER4=y
|
CONFIG_POWER4=y
|
||||||
# CONFIG_FLATMEM_MANUAL is not set
|
# 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
|
||||||
|
|
||||||
|
|
|
@ -4,13 +4,15 @@ flavours:
|
||||||
powerpc-smp
|
powerpc-smp
|
||||||
powerpc-miboot
|
powerpc-miboot
|
||||||
powerpc64
|
powerpc64
|
||||||
kernel-header-dirs: powerpc ppc ppc64 m68k
|
kernel-header-dirs: powerpc ppc m68k
|
||||||
kernel-arch: powerpc
|
kernel-arch: powerpc
|
||||||
kpkg-subarch: powerpc
|
kpkg-subarch: powerpc
|
||||||
|
kpkg-arch: powerpc
|
||||||
|
|
||||||
[apus]
|
[apus]
|
||||||
kernel-arch: ppc
|
kernel-arch: ppc
|
||||||
kpkg-subarch: powerpc32
|
kpkg-subarch: powerpc
|
||||||
|
kpkg-arch: ppc
|
||||||
depends: mkvmlinuz (>= 15)
|
depends: mkvmlinuz (>= 15)
|
||||||
|
|
||||||
[powerpc]
|
[powerpc]
|
||||||
|
@ -18,3 +20,6 @@ depends: mkvmlinuz (>= 15)
|
||||||
|
|
||||||
[powerpc-smp]
|
[powerpc-smp]
|
||||||
depends: mkvmlinuz (>= 15)
|
depends: mkvmlinuz (>= 15)
|
||||||
|
|
||||||
|
[powerpc64]
|
||||||
|
kpkg-subarch: powerpc64
|
||||||
|
|
|
@ -341,7 +341,7 @@ def process_real_flavour(packages, makefile, config, arch, subarch, flavour, var
|
||||||
makefile.append(("%s-%s-%s-%s:: %s-%s-%s-%s-real" % (i, arch, subarch, flavour, i, arch, subarch, flavour), None))
|
makefile.append(("%s-%s-%s-%s:: %s-%s-%s-%s-real" % (i, arch, subarch, flavour, i, arch, subarch, flavour), None))
|
||||||
|
|
||||||
makeflags['FLAVOUR'] = flavour
|
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]):
|
if config_entry.has_key(i[0]):
|
||||||
makeflags[i[1]] = config_entry[i[0]]
|
makeflags[i[1]] = config_entry[i[0]]
|
||||||
makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
|
makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
|
||||||
|
|
|
@ -21,7 +21,11 @@ linux-2.6 (2.6.14+2.6.15-rc5-0experimental.2) UNRELEASED; urgency=low
|
||||||
* Deactivate CONFIG_IDE_TASK_IOCTL on alpha and ia64 and make it a global
|
* Deactivate CONFIG_IDE_TASK_IOCTL on alpha and ia64 and make it a global
|
||||||
option.
|
option.
|
||||||
|
|
||||||
-- Frederik Schüler <fs@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@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
|
linux-2.6 (2.6.14+2.6.15-rc5-0experimental.1) experimental; urgency=low
|
||||||
|
|
||||||
|
|
|
@ -45,6 +45,10 @@ kpkg_image := make-kpkg --append-to-version '$(KPKG_ABINAME)-$(FLAVOUR)'
|
||||||
kpkg_image += --arch '$(ARCH)'
|
kpkg_image += --arch '$(ARCH)'
|
||||||
kpkg_image += --stem linux
|
kpkg_image += --stem linux
|
||||||
kpkg_image += --initrd
|
kpkg_image += --initrd
|
||||||
|
ifdef KPKG_ARCH
|
||||||
|
kpkg_image += --arch '$(KPKG_ARCH)'
|
||||||
|
kpkg_header += --arch '$(KPKG_ARCH)'
|
||||||
|
endif
|
||||||
ifdef KPKG_SUBARCH
|
ifdef KPKG_SUBARCH
|
||||||
kpkg_image += --subarch '$(KPKG_SUBARCH)'
|
kpkg_image += --subarch '$(KPKG_SUBARCH)'
|
||||||
kpkg_header += --subarch '$(KPKG_SUBARCH)'
|
kpkg_header += --subarch '$(KPKG_SUBARCH)'
|
||||||
|
|
Loading…
Reference in New Issue