[PATCH 1/1] UBUNTU: add a i386 generic64g flavour supporting large memory systems

Andy Whitcroft apw at canonical.com
Tue Jan 27 13:51:33 UTC 2009


Bug: #74179

Add a new i386 flavour which supports large memory systems.  generic64g is
identicle to the generic flavour, targetted to the desktop but supporting
more than 4GB of physical address space.  This is needed for many machines
with more than 3GB or actual ram, due to the way in which IO space is
layed out.

Signed-off-by: Andy Whitcroft <apw at canonical.com>
---
 debian/config/i386/config.generic64g |   24 +++++++++++++++
 debian/control                       |   54 ++++++++++++++++++++++++++++++++++
 debian/control.d/vars.generic64g     |    6 ++++
 debian/control.stub                  |   54 ++++++++++++++++++++++++++++++++++
 debian/rules.d/i386.mk               |    2 +-
 5 files changed, 139 insertions(+), 1 deletions(-)
 create mode 100644 debian/config/i386/config.generic64g
 create mode 100644 debian/control.d/vars.generic64g

diff --git a/debian/config/i386/config.generic64g b/debian/config/i386/config.generic64g
new file mode 100644
index 0000000..ed73270
--- /dev/null
+++ b/debian/config/i386/config.generic64g
@@ -0,0 +1,24 @@
+#
+# Config options for config.generic64g automatically generated by splitconfig.pl
+#
+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+# CONFIG_HIGHMEM4G is not set
+CONFIG_HIGHMEM64G=y
+CONFIG_HZ=250
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+CONFIG_I2O_EXT_ADAPTEC_DMA64=y
+CONFIG_M586=y
+# CONFIG_M686 is not set
+CONFIG_PHYS_ADDR_T_64BIT=y
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_X86_ALIGNMENT_16=y
+CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_E_POWERSAVER=m
+CONFIG_X86_F00F_BUG=y
+CONFIG_X86_PAE=y
diff --git a/debian/control b/debian/control
index 91b8668..76767ae 100644
--- a/debian/control
+++ b/debian/control
@@ -123,6 +123,60 @@ Description: Linux kernel debug image for version 2.6.28 on x86/x86_64
  is uncompressed, and unstripped. This package also includes the
  unstripped modules.
 
+Package: linux-image-2.6.28-6-generic64g
+Architecture: i386
+Section: base
+Priority: optional
+Pre-Depends: dpkg (>= 1.10.24)
+Provides: linux-image, linux-image-2.6, fuse-module, kvm-api-4, redhat-cluster-modules, ivtv-modules, ndiswrapper-modules-1.9
+Depends: initramfs-tools (>= 0.36ubuntu6), coreutils | fileutils (>= 4.0), module-init-tools (>= 3.3-pre11-4ubuntu3)
+Conflicts: hotplug (<< 0.0.20040105-1)
+Recommends: grub | lilo (>= 19.1)
+Suggests: fdutils, linux-doc-2.6.28 | linux-source-2.6.28
+Description: Linux kernel image for version 2.6.28 on x86
+ This package contains the Linux kernel image for version 2.6.28 on
+ x86.
+ .
+ Also includes the corresponding System.map file, the modules built by the
+ packager, and scripts that try to ensure that the system is not left in an
+ unbootable state after an update.
+ .
+ Supports Generic64g processors.
+ .
+ Geared toward desktop systems with large memory.
+ .
+ You likely do not want to install this package directly. Instead, install
+ the linux-generic64g meta-package, which will ensure that upgrades work
+ correctly, and that supporting packages are also installed.
+
+Package: linux-headers-2.6.28-6-generic64g
+Architecture: i386
+Section: devel
+Priority: optional
+Depends: coreutils | fileutils (>= 4.0), linux-headers-2.6.28-6, ${shlibs:Depends}
+Provides: linux-headers, linux-headers-2.6
+Description: Linux kernel headers for version 2.6.28 on x86
+ This package provides kernel header files for version 2.6.28 on
+ x86.
+ .
+ This is for sites that want the latest kernel headers.  Please read
+ /usr/share/doc/linux-headers-2.6.28-6/debian.README.gz for details.
+
+Package: linux-image-debug-2.6.28-6-generic64g
+Architecture: i386
+Section: devel
+Priority: optional
+Provides: linux-debug
+Description: Linux kernel debug image for version 2.6.28 on x86
+ This package provides a kernel debug image for version 2.6.28 on
+ x86.
+ .
+ This is for sites that wish to debug the kernel.
+ .
+ The kernel image contained in this package is NOT meant to boot from. It
+ is uncompressed, and unstripped. This package also includes the
+ unstripped modules.
+
 Package: linux-image-2.6.28-6-iop32x
 Architecture: armel
 Section: base
diff --git a/debian/control.d/vars.generic64g b/debian/control.d/vars.generic64g
new file mode 100644
index 0000000..ea25e67
--- /dev/null
+++ b/debian/control.d/vars.generic64g
@@ -0,0 +1,6 @@
+arch="i386"
+supported="Generic64g"
+target="Geared toward desktop systems with large memory."
+desc="x86"
+bootloader="grub | lilo (>= 19.1)"
+provides="kvm-api-4, redhat-cluster-modules, ivtv-modules, ndiswrapper-modules-1.9"
diff --git a/debian/control.stub b/debian/control.stub
index 91b8668..76767ae 100644
--- a/debian/control.stub
+++ b/debian/control.stub
@@ -123,6 +123,60 @@ Description: Linux kernel debug image for version 2.6.28 on x86/x86_64
  is uncompressed, and unstripped. This package also includes the
  unstripped modules.
 
+Package: linux-image-2.6.28-6-generic64g
+Architecture: i386
+Section: base
+Priority: optional
+Pre-Depends: dpkg (>= 1.10.24)
+Provides: linux-image, linux-image-2.6, fuse-module, kvm-api-4, redhat-cluster-modules, ivtv-modules, ndiswrapper-modules-1.9
+Depends: initramfs-tools (>= 0.36ubuntu6), coreutils | fileutils (>= 4.0), module-init-tools (>= 3.3-pre11-4ubuntu3)
+Conflicts: hotplug (<< 0.0.20040105-1)
+Recommends: grub | lilo (>= 19.1)
+Suggests: fdutils, linux-doc-2.6.28 | linux-source-2.6.28
+Description: Linux kernel image for version 2.6.28 on x86
+ This package contains the Linux kernel image for version 2.6.28 on
+ x86.
+ .
+ Also includes the corresponding System.map file, the modules built by the
+ packager, and scripts that try to ensure that the system is not left in an
+ unbootable state after an update.
+ .
+ Supports Generic64g processors.
+ .
+ Geared toward desktop systems with large memory.
+ .
+ You likely do not want to install this package directly. Instead, install
+ the linux-generic64g meta-package, which will ensure that upgrades work
+ correctly, and that supporting packages are also installed.
+
+Package: linux-headers-2.6.28-6-generic64g
+Architecture: i386
+Section: devel
+Priority: optional
+Depends: coreutils | fileutils (>= 4.0), linux-headers-2.6.28-6, ${shlibs:Depends}
+Provides: linux-headers, linux-headers-2.6
+Description: Linux kernel headers for version 2.6.28 on x86
+ This package provides kernel header files for version 2.6.28 on
+ x86.
+ .
+ This is for sites that want the latest kernel headers.  Please read
+ /usr/share/doc/linux-headers-2.6.28-6/debian.README.gz for details.
+
+Package: linux-image-debug-2.6.28-6-generic64g
+Architecture: i386
+Section: devel
+Priority: optional
+Provides: linux-debug
+Description: Linux kernel debug image for version 2.6.28 on x86
+ This package provides a kernel debug image for version 2.6.28 on
+ x86.
+ .
+ This is for sites that wish to debug the kernel.
+ .
+ The kernel image contained in this package is NOT meant to boot from. It
+ is uncompressed, and unstripped. This package also includes the
+ unstripped modules.
+
 Package: linux-image-2.6.28-6-iop32x
 Architecture: armel
 Section: base
diff --git a/debian/rules.d/i386.mk b/debian/rules.d/i386.mk
index d8def02..7ca71d9 100644
--- a/debian/rules.d/i386.mk
+++ b/debian/rules.d/i386.mk
@@ -2,7 +2,7 @@ build_arch	= i386
 header_arch	= x86_64
 asm_link	= x86
 defconfig	= defconfig
-flavours        = generic server
+flavours        = generic generic64g server
 build_image	= bzImage
 kernel_file	= arch/$(build_arch)/boot/bzImage
 install_file	= vmlinuz
-- 
1.6.1.258.g7ff14.dirty





More information about the kernel-team mailing list