diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/20_slow-boot.patch | 82 | ||||
| -rw-r--r-- | debian/patches/60_bigmem.patch | 15 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
4 files changed, 9 insertions, 96 deletions
diff --git a/debian/changelog b/debian/changelog index fd016a9..11714d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,13 @@ -gnumach (2:1.3.99.dfsg.git20121227-3) UNRELEASED; urgency=low +gnumach (2:1.3.99.dfsg.git20130311-1) unstable; urgency=low + * New upstream snapshot. + - patches/20_slow-boot.patch: Remove, merged upstream. + - patches/60_bigmem.patch: Refresh. * control: Make gnumach-dev multi-arch:same. * rules: Pass -fno-optimize-sibling-calls to gcc for building the dbg version, to get better backtraces in the debugger. - -- Samuel Thibault <sthibault@debian.org> Sun, 06 Jan 2013 14:38:47 +0100 + -- Samuel Thibault <sthibault@debian.org> Sun, 10 Mar 2013 23:52:47 +0000 gnumach (2:1.3.99.dfsg.git20121227-2) unstable; urgency=low diff --git a/debian/patches/20_slow-boot.patch b/debian/patches/20_slow-boot.patch deleted file mode 100644 index ff00299..0000000 --- a/debian/patches/20_slow-boot.patch +++ /dev/null @@ -1,82 +0,0 @@ -commit 14a29498dfee39e72443ff0e6f463be7f3bfd4ec -Author: Samuel Thibault <samuel.thibault@ens-lyon.org> -Date: Thu Dec 27 21:48:42 2012 +0100 - - Fix slow boot in virtualbox - - By disabling some of the most slow drivers by default, and giving progress - feedback to the user. - - * linux/configfrag.ac (CONFIG_SCSI_NCR53C7xx, CONFIG_SCSI_AIC7XXX, - CONFIG_SCSI_GDTH): Disable by default - * linux/src/drivers/scsi/eata.c (__initfunc): Don't feed line in probe - message. - * linux/src/drivers/scsi/hosts.c (scsi_init): Print SCSI probe progress. - -diff --git a/linux/configfrag.ac b/linux/configfrag.ac -index f5af666..882af6b 100644 ---- a/linux/configfrag.ac -+++ b/linux/configfrag.ac -@@ -157,7 +157,8 @@ AC_ARG_ENABLE([ide-forcedma], - dnl SCSI controllers. - AC_OPTION_Linux_group([scsi], [SCSI drivers]) - --AC_Linux_DRIVER([53c78xx], -+# Disabled by default. -+AC_Linux_DRIVER_nodef([53c78xx], - [SCSI controller NCR 53C7,8xx], - [CONFIG_SCSI_NCR53C7xx], - [scsi]) -@@ -196,7 +197,8 @@ AC_Linux_DRIVER([aha1740], - [SCSI controller Adaptec AHA-1740], - [CONFIG_SCSI_AHA1740], - [scsi]) --AC_Linux_DRIVER([aic7xxx], -+# Disabled by default. -+AC_Linux_DRIVER_nodef([aic7xxx], - [SCSI controller Adaptec AIC7xxx], - [CONFIG_SCSI_AIC7XXX], - [scsi]) -@@ -227,7 +229,8 @@ AC_Linux_DRIVER_nodef([g_NCR5380], - [SCSI controller Generic NCR5380/53c400 (ncr5380, ncr53c400)], - [CONFIG_SCSI_GENERIC_NCR5380], - [scsi]) --AC_Linux_DRIVER([gdth], -+# Disabled by default. -+AC_Linux_DRIVER_nodef([gdth], - [GDT SCSI Disk Array Controller], - [CONFIG_SCSI_GDTH], - [scsi]) -diff --git a/linux/src/drivers/scsi/eata.c b/linux/src/drivers/scsi/eata.c -index ce859ce..49f0827 100644 ---- a/linux/src/drivers/scsi/eata.c -+++ b/linux/src/drivers/scsi/eata.c -@@ -881,7 +881,7 @@ __initfunc (static inline int port_detect \ - - sprintf(name, "%s%d", driver_name, j); - -- printk("probing eata on %lx\n", port_base); -+ printk("\rprobing eata on %lx", port_base); - - if(check_region(port_base, REGION_SIZE)) { - printk("%s: address 0x%03lx in use, skipping probe.\n", name, port_base); -diff --git a/linux/src/drivers/scsi/hosts.c b/linux/src/drivers/scsi/hosts.c -index 010e1ce..0f1bedd 100644 ---- a/linux/src/drivers/scsi/hosts.c -+++ b/linux/src/drivers/scsi/hosts.c -@@ -472,6 +472,7 @@ unsigned int scsi_init() - * Initialize our semaphores. -1 is interpreted to mean - * "inactive" - where as 0 will indicate a time out condition. - */ -+ printk("\rprobing scsi %d/%d: %s \e[K", tpnt-builtin_scsi_hosts, MAX_SCSI_HOSTS, tpnt->name); - - pcount = next_scsi_host; - if ((tpnt->detect) && -@@ -496,6 +497,7 @@ unsigned int scsi_init() - #endif - } - } -+ printk("\ndone\n"); - - for(shpnt=scsi_hostlist; shpnt; shpnt = shpnt->next) - { diff --git a/debian/patches/60_bigmem.patch b/debian/patches/60_bigmem.patch index cdf6468..737a178 100644 --- a/debian/patches/60_bigmem.patch +++ b/debian/patches/60_bigmem.patch @@ -30,22 +30,15 @@ Index: gnumach/i386/i386/vm_param.h =================================================================== --- gnumach.orig/i386/i386/vm_param.h 2012-06-10 23:45:02.000000000 +0200 +++ gnumach/i386/i386/vm_param.h 2012-07-14 15:57:44.559495669 +0200 -@@ -31,13 +31,13 @@ - - /* The kernel address space is usually 1GB, usually starting at virtual address 0. */ - #ifdef MACH_XEN --#define VM_MIN_KERNEL_ADDRESS 0xC0000000UL -+#define VM_MIN_KERNEL_ADDRESS 0x80000000UL - #define INIT_VM_MIN_KERNEL_ADDRESS VM_MIN_KERNEL_ADDRESS - #else /* MACH_XEN */ +@@ -31,7 +31,7 @@ /* This can be changed freely to separate kernel addresses from user addresses * for better trace support in kdb; the _START symbol has to be offset by the * same amount. */ -#define VM_MIN_KERNEL_ADDRESS 0xC0000000UL +#define VM_MIN_KERNEL_ADDRESS 0x80000000UL - /* This must remain 0 */ - #define INIT_VM_MIN_KERNEL_ADDRESS 0x00000000UL - #endif /* MACH_XEN */ + + #ifdef MACH_XEN + /* PV kernels can be loaded directly to the target virtual address */ Index: gnumach/i386/xen/Makefrag.am =================================================================== --- gnumach.orig/i386/xen/Makefrag.am 2012-07-14 15:58:19.998781083 +0200 diff --git a/debian/patches/series b/debian/patches/series index a06ca83..8433870 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +1,6 @@ 00_clean_gfdl.patch 11_ignore_CSIn.patch 12_version_suffix.patch -20_slow-boot.patch 50_initrd.patch 60_bigmem.patch 70_dde.patch |