[SCM] Debian GNU Mach packaging branch, master, updated. debian/1.3.99.dfsg.git20100732-1-8-g396666d

[Samuel Thibault]

The following commit has been merged in the master branch:
commit 396666d5decea2c6cbd6f564a7d2dac9ec09322a
Author: Samuel Thibault <address@hidden>
Date:   Sun Nov 14 12:39:32 2010 +0100

    Move User/Kernel limit to 2GiB
    
      * debian/patches/60_bigmem.patch: Add patch to support almost up to 2GiB
        memory.
      * debian/control: Make gnumach packages break glibc versions before the 
one
        which can cope with > 1GiB memory support.

diff --git a/debian/changelog b/debian/changelog
index 892867c..752d86d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ gnumach (2:1.3.99.dfsg.git20100732-2) unreleased; urgency=low
   * debian/control: Build gnumach-udeb on hurd-i386 only.
   * debian/control: Use Package-Type instead of XC-Package-Type.
   * debian/source/options: Enable bz2 compression.
+  * debian/patches/60_bigmem.patch: Add patch to support almost up to 2GiB
+    memory.
+  * debian/control: Make gnumach packages break glibc versions before the one
+    which can cope with > 1GiB memory support.
 
  -- Samuel Thibault <address@hidden>  Sat, 31 Jul 2010 17:35:20 +0200
 
diff --git a/debian/control b/debian/control
index d5ad6c3..99c94fa 100644
--- a/debian/control
+++ b/debian/control
@@ -14,12 +14,14 @@ Standards-Version: 3.9.1
 Package: gnumach
 Architecture: any-i386
 Depends: ${misc:Depends}, gnumach-common
+Breaks: libc0.3 (<< 2.10.1-3)
 Description: The GNU version of the Mach microkernel
  This is the Utah Mach microkernel used by the Hurd.
 
 Package: gnumach-xen
 Architecture: any-i386
 Depends: ${misc:Depends}, gnumach-common
+Breaks: libc0.3 (<< 2.10.1-3)
 Description: The GNU version of the Mach microkernel for Xen
  This is the Utah Mach microkernel used by the Hurd.
  .
diff --git a/debian/patches/60_bigmem.patch b/debian/patches/60_bigmem.patch
new file mode 100644
index 0000000..b0dd482
--- /dev/null
+++ b/debian/patches/60_bigmem.patch
@@ -0,0 +1,15 @@
+Push kernel/user limit to 2GiB, so Mach can address up to close to 2GiB memory.
+This makes glibc's local-bigmem.diff patch mandatory.
+
+diff --git a/i386/include/mach/i386/vm_param.h 
b/i386/include/mach/i386/vm_param.h
+index 6d7c5f3..839ae68 100644
+--- a/i386/include/mach/i386/vm_param.h
++++ b/i386/include/mach/i386/vm_param.h
+@@ -73,6 +73,6 @@
+    with that.
+    */
+ #define VM_MIN_ADDRESS                (0)
+-#define VM_MAX_ADDRESS                (0xc0000000UL)
++#define VM_MAX_ADDRESS                (0x80000000UL)
+ 
+ #endif        /* _MACH_I386_VM_PARAM_H_ */

-- 
Debian GNU Mach packaging