--- memtest86+-4.10.orig/init.c +++ memtest86+-4.10/init.c @@ -15,6 +15,7 @@ #include "pci.h" #include "io.h" #include "spd.h" +#include "multiboot.h" #define rdmsr(msr,val1,val2) \ __asm__ __volatile__("rdmsr" \ @@ -98,7 +99,10 @@ /* Determine the memory map */ if ((firmware == FIRMWARE_UNKNOWN) && (memsz_mode != SZ_MODE_PROBE)) { - if (query_linuxbios()) { + if (query_multiboot()) { + firmware = FIRMWARE_MULTIBOOT; + } + else if (query_linuxbios()) { firmware = FIRMWARE_LINUXBIOS; } else if (query_pcbios()) { --- memtest86+-4.10.orig/multiboot.h +++ memtest86+-4.10/multiboot.h @@ -0,0 +1,259 @@ +/* multiboot.h - Multiboot header file. */ +/* Copyright (C) 1999,2003,2007,2008,2009,2010 Free Software Foundation, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ANY + * DEVELOPER OR DISTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR + * IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#ifndef MULTIBOOT_HEADER +#define MULTIBOOT_HEADER 1 + +/* How many bytes from the start of the file we search for the header. */ +#define MULTIBOOT_SEARCH 8192 + +/* The magic field should contain this. */ +#define MULTIBOOT_HEADER_MAGIC 0x1BADB002 + +/* This should be in %eax. */ +#define MULTIBOOT_BOOTLOADER_MAGIC 0x2BADB002 + +/* Alignment of multiboot modules. */ +#define MULTIBOOT_MOD_ALIGN 0x00001000 + +/* Alignment of the multiboot info structure. */ +#define MULTIBOOT_INFO_ALIGN 0x00000004 + +/* Flags set in the 'flags' member of the multiboot header. */ + +/* Align all boot modules on i386 page (4KB) boundaries. */ +#define MULTIBOOT_PAGE_ALIGN 0x00000001 + +/* Must pass memory information to OS. */ +#define MULTIBOOT_MEMORY_INFO 0x00000002 + +/* Must pass video information to OS. */ +#define MULTIBOOT_VIDEO_MODE 0x00000004 + +/* This flag indicates the use of the address fields in the header. */ +#define MULTIBOOT_AOUT_KLUDGE 0x00010000 + +/* Flags to be set in the 'flags' member of the multiboot info structure. */ + +/* is there basic lower/upper memory information? */ +#define MULTIBOOT_INFO_MEMORY 0x00000001 +/* is there a boot device set? */ +#define MULTIBOOT_INFO_BOOTDEV 0x00000002 +/* is the command-line defined? */ +#define MULTIBOOT_INFO_CMDLINE 0x00000004 +/* are there modules to do something with? */ +#define MULTIBOOT_INFO_MODS 0x00000008 + +/* These next two are mutually exclusive */ + +/* is there a symbol table loaded? */ +#define MULTIBOOT_INFO_AOUT_SYMS 0x00000010 +/* is there an ELF section header table? */ +#define MULTIBOOT_INFO_ELF_SHDR 0X00000020 + +/* is there a full memory map? */ +#define MULTIBOOT_INFO_MEM_MAP 0x00000040 + +/* Is there drive info? */ +#define MULTIBOOT_INFO_DRIVE_INFO 0x00000080 + +/* Is there a config table? */ +#define MULTIBOOT_INFO_CONFIG_TABLE 0x00000100 + +/* Is there a boot loader name? */ +#define MULTIBOOT_INFO_BOOT_LOADER_NAME 0x00000200 + +/* Is there a APM table? */ +#define MULTIBOOT_INFO_APM_TABLE 0x00000400 + +/* Is there video information? */ +#define MULTIBOOT_INFO_VBE_INFO 0x00000800 +#define MULTIBOOT_INFO_FRAMEBUFFER_INFO 0x00001000 + +#ifndef ASM_FILE + +typedef unsigned char multiboot_uint8_t; +typedef unsigned short multiboot_uint16_t; +typedef unsigned int multiboot_uint32_t; +typedef unsigned long long multiboot_uint64_t; + +struct multiboot_header +{ + /* Must be MULTIBOOT_MAGIC - see above. */ + multiboot_uint32_t magic; + + /* Feature flags. */ + multiboot_uint32_t flags; + + /* The above fields plus this one must equal 0 mod 2^32. */ + multiboot_uint32_t checksum; + + /* These are only valid if MULTIBOOT_AOUT_KLUDGE is set. */ + multiboot_uint32_t header_addr; + multiboot_uint32_t load_addr; + multiboot_uint32_t load_end_addr; + multiboot_uint32_t bss_end_addr; + multiboot_uint32_t entry_addr; + + /* These are only valid if MULTIBOOT_VIDEO_MODE is set. */ + multiboot_uint32_t mode_type; + multiboot_uint32_t width; + multiboot_uint32_t height; + multiboot_uint32_t depth; +}; + +/* The symbol table for a.out. */ +struct multiboot_aout_symbol_table +{ + multiboot_uint32_t tabsize; + multiboot_uint32_t strsize; + multiboot_uint32_t addr; + multiboot_uint32_t reserved; +}; +typedef struct multiboot_aout_symbol_table multiboot_aout_symbol_table_t; + +/* The section header table for ELF. */ +struct multiboot_elf_section_header_table +{ + multiboot_uint32_t num; + multiboot_uint32_t size; + multiboot_uint32_t addr; + multiboot_uint32_t shndx; +}; +typedef struct multiboot_elf_section_header_table multiboot_elf_section_header_table_t; + +struct multiboot_color +{ + multiboot_uint8_t red; + multiboot_uint8_t green; + multiboot_uint8_t blue; +}; + +struct multiboot_info +{ + /* Multiboot info version number */ + multiboot_uint32_t flags; + + /* Available memory from BIOS */ + multiboot_uint32_t mem_lower; + multiboot_uint32_t mem_upper; + + /* "root" partition */ + multiboot_uint32_t boot_device; + + /* Kernel command line */ + multiboot_uint32_t cmdline; + + /* Boot-Module list */ + multiboot_uint32_t mods_count; + multiboot_uint32_t mods_addr; + + union + { + multiboot_aout_symbol_table_t aout_sym; + multiboot_elf_section_header_table_t elf_sec; + } u; + + /* Memory Mapping buffer */ + multiboot_uint32_t mmap_length; + multiboot_uint32_t mmap_addr; + + /* Drive Info buffer */ + multiboot_uint32_t drives_length; + multiboot_uint32_t drives_addr; + + /* ROM configuration table */ + multiboot_uint32_t config_table; + + /* Boot Loader Name */ + multiboot_uint32_t boot_loader_name; + + /* APM table */ + multiboot_uint32_t apm_table; + + /* Video */ + multiboot_uint32_t vbe_control_info; + multiboot_uint32_t vbe_mode_info; + multiboot_uint16_t vbe_mode; + multiboot_uint16_t vbe_interface_seg; + multiboot_uint16_t vbe_interface_off; + multiboot_uint16_t vbe_interface_len; + + multiboot_uint64_t framebuffer_addr; + multiboot_uint32_t framebuffer_pitch; + multiboot_uint32_t framebuffer_width; + multiboot_uint32_t framebuffer_height; + multiboot_uint8_t framebuffer_bpp; +#define MULTIBOOT_FRAMEBUFFER_TYPE_INDEXED 0 +#define MULTIBOOT_FRAMEBUFFER_TYPE_RGB 1 +#define MULTIBOOT_FRAMEBUFFER_TYPE_EGA_TEXT 2 + multiboot_uint8_t framebuffer_type; + union + { + /* Indexed color. */ + struct + { + struct multiboot_color *framebuffer_palette_addr; + multiboot_uint16_t framebuffer_palette_num_colors; + }; + + /* Direct RGB color. */ + struct + { + multiboot_uint8_t framebuffer_red_field_position; + multiboot_uint8_t framebuffer_red_mask_size; + multiboot_uint8_t framebuffer_green_field_position; + multiboot_uint8_t framebuffer_green_mask_size; + multiboot_uint8_t framebuffer_blue_field_position; + multiboot_uint8_t framebuffer_blue_mask_size; + }; + }; +}; +typedef struct multiboot_info multiboot_info_t; + +struct multiboot_mmap_entry +{ + multiboot_uint32_t size; + multiboot_uint64_t addr; + multiboot_uint64_t len; +#define MULTIBOOT_MEMORY_AVAILABLE 1 +#define MULTIBOOT_MEMORY_RESERVED 2 + multiboot_uint32_t type; +} __attribute__((packed)); +typedef struct multiboot_mmap_entry multiboot_memory_map_t; + +struct multiboot_mod_list +{ + /* the memory used goes from bytes 'mod_start' to 'mod_end-1' inclusive */ + multiboot_uint32_t mod_start; + multiboot_uint32_t mod_end; + + /* Module command line */ + multiboot_uint32_t cmdline; + + /* padding to take it to 16 bytes (must be zero) */ + multiboot_uint32_t pad; +}; +typedef struct multiboot_mod_list multiboot_module_t; + +#endif /* ! ASM_FILE */ + +#endif /* ! MULTIBOOT_HEADER */ --- memtest86+-4.10.orig/test.h +++ memtest86+-4.10/test.h @@ -106,6 +106,7 @@ void *memmove(void *dest, const void *src, ulong n); int query_linuxbios(void); int query_pcbios(void); +int query_multiboot(void); int insertaddress(ulong); void printpatn(void); void printpatn(void); @@ -351,6 +352,7 @@ #define FIRMWARE_UNKNOWN 0 #define FIRMWARE_PCBIOS 1 #define FIRMWARE_LINUXBIOS 2 +#define FIRMWARE_MULTIBOOT 3 extern struct vars * const v; extern unsigned char _start[], _end[], startup_32[]; --- memtest86+-4.10.orig/head.S +++ memtest86+-4.10/head.S @@ -13,9 +13,11 @@ .text #define __ASSEMBLY__ +#define ASM_FILE #include "defs.h" #include "config.h" #include "test.h" +#include "multiboot.h" /* * References to members of the boot_cpu_data structure. @@ -54,6 +56,13 @@ cld cli + /* Store MBI pointer */ + xorl %ecx, %ecx + cmpl $MULTIBOOT_BOOTLOADER_MAGIC, %eax + jne 0f + movl %ebx, %ecx +0: + /* Ensure I have a stack pointer */ testl %esp, %esp jnz 0f @@ -66,6 +75,20 @@ 0: popl %ebx addl $_GLOBAL_OFFSET_TABLE_+[.-0b], %ebx + /* Move MBI pointer to a safe place */ + testl %ecx, %ecx + je 0f + movl %ecx, mbiptr@GOTOFF(%ebx) +0: + + jmp 0f + /* Multiboot header */ +.align 4 + .long MULTIBOOT_HEADER_MAGIC + .long 0 + .long -MULTIBOOT_HEADER_MAGIC +0: + /* Pick the appropriate stack address */ leal stack_top@GOTOFF(%ebx), %esp @@ -1003,6 +1026,9 @@ movl $1, %eax ret +.globl mbiptr +mbiptr: + .long 0 realptr: .word real - RSTART .word 0x0000 --- memtest86+-4.10.orig/main.c +++ memtest86+-4.10/main.c @@ -11,9 +11,12 @@ #include "test.h" #include "defs.h" #include "config.h" +#include "multiboot.h" #undef TEST_TIMES #define DEFTESTS 9 +extern struct multiboot_info *mbiptr; + extern void bzero(); const struct tseq tseq[] = { @@ -151,11 +154,15 @@ if (cmdline_parsed) return; - if (*OLD_CL_MAGIC_ADDR != OLD_CL_MAGIC) - return; + if (mbiptr && (mbiptr->flags & MULTIBOOT_INFO_CMDLINE)) { + cmdline = (void *) mbiptr->cmdline; + } else { + if (*OLD_CL_MAGIC_ADDR != OLD_CL_MAGIC) + return; - unsigned short offset = *OLD_CL_OFFSET_ADDR; - cmdline = MK_PTR(INITSEG, offset); + unsigned short offset = *OLD_CL_OFFSET_ADDR; + cmdline = MK_PTR(INITSEG, offset); + } /* skip leading spaces */ while (*cmdline == ' ') --- memtest86+-4.10.orig/Makefile +++ memtest86+-4.10/Makefile @@ -13,9 +13,14 @@ CFLAGS= -Wall -march=i486 -m32 -O2 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector +# This reverts a change introduced with recent binutils (post +# http://sourceware.org/bugzilla/show_bug.cgi?id=10569). Needed to +# ensure Multiboot header is within the limit offset. +LD += -z max-page-size=0x1000 + OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \ config.o linuxbios.o memsize.o pci.o controller.o random.o spd.o \ - error.o dmi.o cpuid.o + error.o dmi.o cpuid.o multiboot.o all: memtest.bin memtest --- memtest86+-4.10.orig/README +++ memtest86+-4.10/README @@ -78,14 +78,13 @@ 4) Serial Console ================= + Memtest86+ can be used on PC's equipped with a serial port for the console. By default serial port console support is not enabled since it slows -down testing. To enable change the SERIAL_CONSOLE_DEFAULT define in -config.h from a zero to a one. The serial console baud rate may also -be set in config.h with the SERIAL_BAUD_RATE define. The other serial -port settings are no parity, 8 data bits, 1 stop bit. All of the features -used by Memtest86+ are accessible via the serial console. However, the -screen sometimes is garbled when the online commands are used. +down testing. + +To activate it, add a console parameter on the memtest86+ +command-line, like: "/boot/memtest86+.bin console=ttyS0,115200n8". 5) Online Commands --- memtest86+-4.10.orig/multiboot.c +++ memtest86+-4.10/multiboot.c @@ -0,0 +1,49 @@ +/* multiboot.c + * + * Copyright (C) 2008,2009 Robert Millan + * + * Loosely based on linuxbios.c, which is: + * + * Released under version 2 of the Gnu Public License. + * By Eric Biederman + */ + +#include "multiboot.h" +#include "test.h" + +extern struct multiboot_info *mbiptr; + +int query_multiboot(void) +{ + struct multiboot_mmap_entry *mem; + int i; + + if (!mbiptr) { + return 0; + } + if (!mbiptr->mmap_addr) { + return 1; + } + if ((mbiptr->flags & MULTIBOOT_INFO_MEM_MAP) == 0) { + return 1; + } + + mem = (struct multiboot_mmap_entry *) mbiptr->mmap_addr; + mem_info.e820_nr = 0; + + for (i = 0; i < E820MAX; i++) { + if ((multiboot_uint32_t) mem >= (mbiptr->mmap_addr + mbiptr->mmap_length)) { + break; + } + + mem_info.e820[mem_info.e820_nr].addr = mem->addr; + mem_info.e820[mem_info.e820_nr].size = mem->len; + /* Multiboot spec defines available / reserved types to match with E820. */ + mem_info.e820[mem_info.e820_nr].type = mem->type; + mem_info.e820_nr++; + + mem = (struct multiboot_mmap_entry *) ((multiboot_uint32_t) mem + mem->size + sizeof (mem->size)); + } + + return 1; +} --- memtest86+-4.10.orig/memsize.c +++ memtest86+-4.10/memsize.c @@ -75,7 +75,7 @@ static void memsize_bios() { - if (firmware == FIRMWARE_PCBIOS) { + if (firmware == FIRMWARE_PCBIOS || firmware == FIRMWARE_MULTIBOOT) { memsize_820(); } else if (firmware == FIRMWARE_LINUXBIOS) { --- memtest86+-4.10.orig/debian/changelog +++ memtest86+-4.10/debian/changelog @@ -0,0 +1,518 @@ +memtest86+ (4.10-1ubuntu2) maverick; urgency=low + + * Drop the multiboot image from the GRUB menu for now, since it's + experimental and has known problems detecting all memory on some systems + at the moment (LP: #640686). + + -- Colin Watson Fri, 24 Sep 2010 16:45:47 +0100 + +memtest86+ (4.10-1ubuntu1) maverick; urgency=low + + * Merge from Debian unstable. (LP: #599070) Remaining changes: + - Only run update-grub in the postrm on remove/purge. + (forwarded to debian as #587340) + - Update maintainer field. + + -- Luke Faraone Sun, 27 Jun 2010 12:54:15 -0400 + +memtest86+ (4.10-1) unstable; urgency=low + + * The "not yet source format 3.0" release. + * New upstream release (Closes: #586727). + * supports 64 e820 lines (Closes: #567165). + * Acknowledge NMUs (Closes: #565642). + * Don't emit grub2 menu items if /boot is on a loop-mounted device + (Ubuntu, Closes: 574788). + * Cache results of prepare_grub_to_access_device to speed up update-grub + runs (Ubuntu, Closes: #570987). + * Fix typo in package description (Robert Tomsick, Closes: #580147). + * Suggest "grub-pc | grub-legacy" instead of old "grub2 | grub" (Closes: + #568624). + * Include es.po for po-debconf (Francisco Javier Cuadrado, Closes: + #580953). + * Provide boot entries for non-multiboot image, and tag the multiboot + ones as experimental (mitigates #570499). + * Install elf image again (was silently dropped in -2.2). + * Bumped Standards-Version to 3.8.4, no change. + + -- Yann Dirson Sun, 27 Jun 2010 15:16:43 +0200 + +memtest86+ (4.00-2.3) unstable; urgency=low + + * Non-maintainer upload. + * Check for grub.cfg in postinst. Closes: #550337 + + -- Michal Suchanek Fri, 04 Jun 2010 13:50:53 +0200 + +memtest86+ (4.00-2.2) unstable; urgency=low + + * Non-maintainer upload. + * Build an image with Multiboot support. (Closes: #250864) + * Update de.po, fr.po, ja.po, pt.po, ru.po and sv.po. + (Closes: #563019, #563288, #564291, #564430, #564470, #565169) + * Fix in copyright line in debian/copyright to make lintian happy. + + -- Robert Millan Sun, 17 Jan 2010 17:06:16 +0100 + +memtest86+ (4.00-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Replace manual propt with debconf (Closes: #553292). + * Fix ".: 4: Can't open /usr/lib/grub/grub-mkconfig_lib" by checking + both grub files and also changing the linux/linux16 grub command based + on which version we find (Closes: #550096) + * Update suggests to a recent version of grub2 + * Add a lintian override for statically-linked-binary (which is expected) + + -- Iustin Pop Sun, 06 Dec 2009 12:20:39 +0100 + +memtest86+ (4.00-2ubuntu3) lucid; urgency=low + + * Only run update-grub in the postrm on remove/purge. + + -- Colin Watson Tue, 23 Mar 2010 09:26:27 +0000 + +memtest86+ (4.00-2ubuntu2) lucid; urgency=low + + * Reapply dropped patch from karmic: + - Don't emit grub2 menu items if /boot is on a loop-mounted device (e.g. + Wubi; LP: #435153). + * Cache results of prepare_grub_to_access_device to speed up update-grub + runs a little. + + -- Colin Watson Mon, 22 Feb 2010 16:06:40 +0000 + +memtest86+ (4.00-2ubuntu1) lucid; urgency=low + + * Merge from debian testing, remaining changes: + - Makefile: Add -fno-stack-protector to CFLAGS, since this package does + not link against libc. + - debian/grub: check for existance of /usr/lib/grub/grub-mkconfig_lib + - debian/postinst: Only run update-grub2 in postinst if + /boot/grub/grub.cfg exists + + -- Michael Vogt Mon, 09 Nov 2009 17:09:57 +0100 + +memtest86+ (4.00-2) unstable; urgency=low + + * Fix wrong integration of grub2 patch (Closes: #549125). + + -- Yann Dirson Thu, 01 Oct 2009 21:05:36 +0200 + +memtest86+ (4.00-1) unstable; urgency=low + + * New upstream release (Closes: #548033). + * Dropped obsolete patches for old gcc-4.3 bugs (works fine now), and + for opteron (support for builtin memory controller was redone). + * Update grub2 support file to use "linux16" command and use + grub-mkconfig_lib instead of old update-grub_lib (Avi Rozen, + Closes: #539907, #522345). + * Update grub2 support file for systems where /boot is on a separate + partition (Vasilis Vasaitis, Closes: #540572). + + -- Yann Dirson Tue, 29 Sep 2009 23:40:15 +0200 + +memtest86+ (2.11-3ubuntu5) karmic; urgency=low + + * debian/grub: + - check for existance of /usr/lib/grub/grub-mkconfig_lib before + sourcing it (LP: #459080). This fixes a upgrade failure when + the memtest86+ postinst is run but the new grub-common is not + yet installed + + -- Michael Vogt Fri, 23 Oct 2009 16:14:27 +0200 + +memtest86+ (2.11-3ubuntu4) karmic; urgency=low + + * Don't emit grub2 menu items if /boot is on a loop-mounted device (e.g. + Wubi; LP: #435153). + + -- Colin Watson Mon, 28 Sep 2009 10:01:25 +0100 + +memtest86+ (2.11-3ubuntu3) karmic; urgency=low + + * Use grub2's 16-bit Linux loader, not the 32-bit one (LP: #424506). + + -- Colin Watson Fri, 04 Sep 2009 22:19:32 +0100 + +memtest86+ (2.11-3ubuntu2) karmic; urgency=low + + * Fix grub2 menu hook to use grub-mkconfig_lib rather than the deprecated + update-grub_lib (thanks, Alex Valavanis; LP: #384627). + * Only run update-grub2 in postinst if /boot/grub/grub.cfg exists. This + makes installation in chroots work rather better. + + -- Colin Watson Wed, 24 Jun 2009 16:55:39 +0100 + +memtest86+ (2.11-3ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (Closes LP: #299161), remaining changes: + - Makefile: Add -fno-stack-protector to CFLAGS, since this package does + not link against libc. + + -- Chris Cheney Thu, 26 Mar 2009 11:45:00 -0500 + +memtest86+ (2.11-3) unstable; urgency=low + + * Upload to squeeze. + * Adjust test condition on which to run update-grub2 in postinst (Robert + Millan, Closes: #448771). + * Parametrize debian/rules for easier sync with package memtest. + * Added a note in extended description that memtest86 is still + being worked on. + * Otherwise sync minor changes with memtest86 3.5-1 packaging. + * Provide link to GPL-2 instead of just GPL in copyright file (lintian). + * Run lilo from postinst without explicit path (lintian). + * Add a whatis entry to make-memtest86+-boot-floppy manpage (lintian). + + -- Yann Dirson Sun, 01 Mar 2009 16:50:40 +0100 + +memtest86+ (2.11-2) experimental; urgency=low + + * Remove "source" bashism from grub script (Closes: #513867). + * Document use of serial console in README, add example configs for grub + (Daniel Kahn Gillmor) and lilo, and make the grub script generate an + entry with serial console enabled (Closes: #503867). + * Add Homepage field in control file. + * Bumped Standards-Version to 3.8.0. + + -- Yann Dirson Sun, 08 Feb 2009 16:27:58 +0100 + +memtest86+ (2.11-1) experimental; urgency=low + + * New upstream release, into experimental to avoid disrupting lenny. + * Acknowledge NMU. + * Build with gcc-multilib on kfreebsd-amd64 + (Petr Salinger, Closes: #493464). + * Update grub script for current version of grub + (Justin B Rye, Closes: #492242). + * Support for x86_64 in make-memtest86+-boot-floppy (Håkon Stordahl, + Closes: #451050). + * Use variables in make-memtest86+-boot-floppy (Gokdeniz Karadag, + Closes: #510128). + * Allow building for hurd-i386 architecture (Samuel Thibault, + Closes: #482899). + * Include changes from Ubuntu packages: + * Allow building for lpia architecture (Closes: #505526, #482065). + * Check for existence of /boot/grub in postrm. + * Install ELF image of memtest86+ in the binary package + (Closes: #505525). + + -- Yann Dirson Sat, 31 Jan 2009 00:26:54 +0100 + +memtest86+ (2.01-1.1ubuntu1) jaunty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - debian/control: Add lpia as supported architecture. + - Makefile: Add -fno-stack-protector to CFLAGS, since this package does + not link against libc. + - Check for existence of /boot/grub in postrm. + - Install ELF image of memtest86+ in the binary package. + * Sync up postrm should-we-run-update-grub2 check with postinst. + + -- Colin Watson Thu, 13 Nov 2008 10:37:16 +0000 + +memtest86+ (2.01-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Makefile: Use -O1 not -Os for gcc4.3. (Closes: #500818). + * Make clean not ignore errors. + + -- Barry deFreese Thu, 02 Oct 2008 21:13:33 -0400 + +memtest86+ (2.01-1ubuntu2) intrepid; urgency=low + + * Build with -O1 rather than -Os (from + https://qa.mandriva.com/show_bug.cgi?id=42679; LP: #246412). + + -- Colin Watson Thu, 11 Sep 2008 21:03:51 +0100 + +memtest86+ (2.01-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/control: Add lpia as supported architecture. + - Makefile: Add -fno-stack-protector to CFLAGS, since this package does + not link against libc. + - Merge basically the same as the one from Saïvann Carignan, thanks for + your work! LP: #192517 + * Simplify the patch from LP #129614, the preinst is fine in debian, the + postinst needs to check for presence of /boot/grub. + * Do not call update-grub, but update-grub2. See + http://bugs.debian.org/460080 for details. + * install ELF image of memtest86+ in the binary package Thanks to Forest + Bond for the patch. (LP: #175720). + + -- Reinhard Tartler Tue, 20 May 2008 17:04:27 +0200 + +memtest86+ (2.01-1) unstable; urgency=low + + * New upstream release (Closes: #468780). + * Serial console now supported as boot parameter (Closes: 308355). + * Added in README.Debian a pointer to the GRUB Legacy sample config + (Closes: #445517), mentionned that GRUB2 is automatically handled, and + that the make-memtest86+-boot-floppy script uses GRUB Legacy. + * Call update-grub2 instead of update-grub (Closes: #460080). + + -- Yann Dirson Wed, 23 Apr 2008 21:21:47 +0200 + +memtest86+ (1.70-3ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/control: Add lpia as supported architecture. + - Makefile: Add -fno-stack-protector to CFLAGS, since this package does + not link against libc. + * Check for /boot/grub/menu.lst rather than /boot/grub/menu.lst in + post{inst,rm}, LP: #129614 + + -- Reinhard Tartler Wed, 26 Sep 2007 22:43:24 +0200 + +memtest86+ (1.70-3) unstable; urgency=low + + * Build-depend on gcc-multilib on amd64 (Closes: #426239). + * Check for existence of /boot/grub/grub.cfg before running update-grub + (Closes: #425221). + * Take into account in make-memtest86+-boot-floppy path changes in + grub-legacy (Justin B Rye, Closes: #412255). Does not support grub2, + however. + + -- Yann Dirson Sun, 29 Jul 2007 16:17:18 +0200 + +memtest86+ (1.70-2ubuntu2) gutsy; urgency=low + + * debian/control: Add lpia as supported architecture. + + -- Matthias Klose Tue, 31 Jul 2007 00:04:33 +0200 + +memtest86+ (1.70-2ubuntu1) gutsy; urgency=low + + * Merge to Debian unstable; remaining Ubuntu changes: + - debian/control: Add libc6-dev-i386 build dependency on amd64 to fix + FTBFS. + - Makefile: Add -fno-stack-protector to CFLAGS, since this package does + not link against libc. + * debian/control: Set Ubuntu maintainer. + + -- Martin Pitt Mon, 21 May 2007 09:39:41 +0200 + +memtest86+ (1.70-2) unstable; urgency=low + + * Upload to unstable now that etch is released. + * Applied patch from Robert Millan to run update-grub when present + (Closes: #313000). + * Applied patch from Cyril Brulebois for GNU/kFreeBSD support (Closes: #338603): + * Adjust debian/rules to patch conditionally memtest{,_shared}.lds to + handle the right OUTPUT_FORMAT. + * Add "kfreebsd-i386 kfreebsd-amd64" to the Architecture field. + * Applied patch from Holger Mense to avoid user interaction in postinst + during non-interactive upgrades (Closes: #383634). + * Included an entry for /etc/grub.d from Robert Millan, added a Suggests + entry on grub2 accordingly (Closes: #422357). + * Switch to debhelper compat v5, added ${misc:Depends}. + * Updated FSF address in debian/copyright (lintian). + * Bumped Standards-Version to 3.7.2. + + -- Yann Dirson Sat, 19 May 2007 22:09:43 +0200 + +memtest86+ (1.70-1) experimental; urgency=low + + * New upstream release (Closes: #409863, #411444). + * Updated package description and suggests line for memtester (Closes: + #396552). + * Fixed typo in extended description (Closes: #377730). + + -- Yann Dirson Tue, 20 Feb 2007 19:39:29 +0100 + +memtest86+ (1.65-1) unstable; urgency=low + + * New upstream release (Closes: #331394). + * Get rid of "read -p" bashism in postinst (Closes: 327454). + * Get rid of the -a and -o bashisms in test calls in postinst, use && + and || instead (lintian). + * Fixed style error in extended description (Tarzeau). + + -- Yann Dirson Wed, 5 Oct 2005 21:56:07 +0200 + +memtest86+ (1.60-2) unstable; urgency=low + + * Install (partial) upstream changelog (Closes: #325129). + * Added a clarifying note to the sample grub.conf for /boot partitions + (Closes: #311144). + * Applied patch from Mattias Wadenstein to test for ECC on more chipsets + (Closes: #303049). + + -- Yann Dirson Fri, 2 Sep 2005 09:47:12 +0200 + +memtest86+ (1.60-1) unstable; urgency=low + + * New upstream release. + * Re-applied Opteron patch. + + -- Yann Dirson Mon, 27 Jun 2005 23:28:25 +0200 + +memtest86+ (1.55.1-1) unstable; urgency=low + + * New upstream release. + * Applied Opteron patch from Mattias Wadenstein (Closes: #302371). + * Added amd64 to the Architecture list in debian/control (Closes: + #280508). + + -- Yann Dirson Mon, 4 Apr 2005 15:19:44 +0200 + +memtest86+ (1.51-1) unstable; urgency=low + + * New upstream release. + + -- Yann Dirson Thu, 17 Feb 2005 21:13:29 +0100 + +memtest86+ (1.50-1) unstable; urgency=low + + * New upstream release. + + -- Yann Dirson Fri, 28 Jan 2005 21:44:07 +0100 + +memtest86+ (1.40-1) unstable; urgency=low + + * New upstream release, based on memtest86 3.2 (Closes: #290027). + * No need to patch README any more. + * Removed capitalized article at start of short description (thanks + lintian). + + -- Yann Dirson Sat, 15 Jan 2005 23:14:30 +0100 + +memtest86+ (1.30-1) unstable; urgency=low + + * New upstream release. + + -- Yann Dirson Fri, 12 Nov 2004 18:36:29 +0100 + +memtest86+ (1.27-2) unstable; urgency=low + + * Removed the note in extended description that it was once part of + hwtools, since that only applies to memtest86. + + -- Yann Dirson Sat, 16 Oct 2004 16:35:46 +0200 + +memtest86+ (1.27-1) unstable; urgency=low + + * New upstream release. + + -- Yann Dirson Fri, 15 Oct 2004 23:16:30 +0200 + +memtest86+ (1.26-2) unstable; urgency=low + + * regarding make-memtest86+-boot-floppy: + - posixified call to "read" (Closes: #275233). + - added mtools to suggested packages, and notice early when the + package is missing (Closes: #264619). + - changed message about grub package, and versionned the suggests + field, so people know they need a recent version of it (Closes: + #269148). + * Bumped Standards-Version to 3.6.1, no change. + + -- Yann Dirson Wed, 13 Oct 2004 23:58:12 +0200 + +memtest86+ (1.26-1) unstable; urgency=low + + * New upstream release. + + -- Yann Dirson Mon, 13 Sep 2004 23:07:44 +0200 + +memtest86+ (1.20-2) unstable; urgency=low + + * Fixed make-memtest86+-boot-floppy to use /lib/grub instead of old + /usr/lib/grub (Closes: #261883). + * Added grub to the list of suggested packages. Mentionned the script + in the description. + * Include manpage by Thomas Schmidt for make-memtest86+-boot-floppy + (see #263708). + * Added debian/watch file. + + -- Yann Dirson Sat, 7 Aug 2004 01:39:21 +0200 + +memtest86+ (1.20-1) unstable; urgency=low + + * New upstream release. + + -- Yann Dirson Mon, 19 Jul 2004 14:38:19 +0200 + +memtest86+ (1.15-2) unstable; urgency=low + + * Install make-memtest86+-boot-floppy in /usr/bin/. + * Mention it in README.Debian. + + -- Yann Dirson Tue, 25 May 2004 15:49:16 +0200 + +memtest86+ (1.15-1) unstable; urgency=low + + * New upstream release: + - KTxxx-specific code was disabled (Closes: #241698). + - allows building with gcc 3.3, so go for it. + + -- Yann Dirson Sun, 23 May 2004 00:52:15 +0200 + +memtest86+ (1.11-3) unstable; urgency=low + + * Step back to using gcc-2.95 to allow gcc-3.2 to be dropped (Closes: + #236455). + + -- Yann Dirson Thu, 1 Apr 2004 22:16:53 +0200 + +memtest86+ (1.11-2) unstable; urgency=low + + * Fixed --memtest option in make-memtest86+-boot-floppy. + * Integrated changes from Martin Koeppe in + make-memtest86+-boot-floppy: + * use mtools to write into floppy image without being root + * cannot select filesystem type anymore, msdos only (who cares ?) + * put full GRUB on floppy to be able to install on harddisk + * Removed internal parameter for fd0, since that booting floopy is + always fd0 (if not, tell me). That settles the potential problem with + linux/grub device names mapping: there's no problem. + * When writing to a real device, use a temporary image file and dd it as + a last step, so that mtools synchronous writes do not slow down things. + + -- Yann Dirson Mon, 15 Mar 2004 18:21:35 +0100 + +memtest86+ (1.11-1) unstable; urgency=low + + * New upstream release. + + -- Yann Dirson Tue, 17 Feb 2004 14:00:55 +0100 + +memtest86+ (1.10-1) unstable; urgency=low + + * New upstream release. + + -- Yann Dirson Mon, 16 Feb 2004 15:12:15 +0100 + +memtest86+ (1.00-4) unstable; urgency=low + + * Fixed postinst snippet to check for memtest86+ instead of memtest86 + (thanks hmh). + + -- Yann Dirson Thu, 5 Feb 2004 10:18:50 +0100 + +memtest86+ (1.00-3) unstable; urgency=low + + * Fixed make-memtest86+-boot-floppy to correctly select the devault + image as /dev/fd0. + * Fixed make-memtest86+-boot-floppy usage summary to advertise expected + syntax. + + -- Yann Dirson Wed, 4 Feb 2004 18:02:26 +0100 + +memtest86+ (1.00-2) unstable; urgency=low + + * Improved the make-memtest86+-boot-floppy script to support writing to + a floppy image. + + -- Yann Dirson Wed, 4 Feb 2004 14:59:39 +0100 + +memtest86+ (1.00-1) unstable; urgency=low + + * Initial packaging, based on memtest86 3.0-5 (Closes: #230963). + * Force the use of gcc-3.2, since neither 3.3 nor 2.95 work. + * Use dh-buildinfo. + + -- Yann Dirson Wed, 4 Feb 2004 00:14:06 +0100 + --- memtest86+-4.10.orig/debian/rules +++ memtest86+-4.10/debian/rules @@ -0,0 +1,72 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +PACKAGE=memtest86+ + +build: build-stamp +build-stamp: + dh_testdir + +# Different kernels, ABIs, ld defaults, see #338603 +ifeq ($(DEB_HOST_ARCH_OS),kfreebsd) + sed -i -e 's/"elf32-i386"/"elf32-i386-freebsd"/' memtest.lds memtest_shared.lds +endif + + $(MAKE) # CC=gcc-2.95 + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + + [ ! -f Makefile ] || $(MAKE) clean + + # make sure PO files are always up-to-date + debconf-updatepo + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + install -d debian/$(PACKAGE)/usr/bin + install -m755 debian/make-$(PACKAGE)-boot-floppy debian/$(PACKAGE)/usr/bin/ + install -D -m644 memtest.bin debian/$(PACKAGE)/boot/$(PACKAGE).bin + install -D -m644 memtest debian/$(PACKAGE)/usr/lib/$(PACKAGE)/$(PACKAGE).elf + install -D -m644 -s memtest_shared debian/$(PACKAGE)/boot/$(PACKAGE)_multiboot.bin + install -D -m755 debian/grub debian/$(PACKAGE)/etc/grub.d/20_$(PACKAGE) + dh_installman debian/make-$(PACKAGE)-boot-floppy.1 + #install the lintian override + install -d debian/$(PACKAGE)/usr/share/lintian/overrides + install -m644 debian/lintian-overrides \ + debian/$(PACKAGE)/usr/share/lintian/overrides/$(PACKAGE) + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installdebconf + dh_installdocs README + dh_buildinfo + dh_installexamples debian/lilo.conf debian/grub-menu.lst + dh_installchangelogs changelog +# dh_strip + dh_compress + dh_fixperms + dh_installdeb +# dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- memtest86+-4.10.orig/debian/make-memtest86+-boot-floppy +++ memtest86+-4.10/debian/make-memtest86+-boot-floppy @@ -0,0 +1,110 @@ +#!/bin/sh +# +# Script for making a memtest86 boot floppy using GRUB as bootloader +# + +# (c) 2003 Peter Loje Hansen +# - original version +# (c) 2004 Yann Dirson +# - added parameters +# - ability to work on a floppy image instead of a real floppy +# - adapted patches from Martin Koeppe , to use +# mtools and install full grub + +# TODO: +# - add a flag to generate a default boot entry for (hd0) + +set -e + +MEMTEST=/boot/memtest86+.bin +FLOPPYIMAGE=/dev/fd0 +GRUBBIN=/usr/sbin/grub +GRUBLIB=/usr/lib/grub +MFORMAT=/usr/bin/mformat + +arch=$(dpkg --print-architecture) +case "$arch" in + i386|?*-i386) GRUBARCH=i386;; + amd64|?*-amd64) GRUBARCH=x86_64;; + *) error "Unsupported architecture: $arch";; +esac + +error() +{ + echo >&2 "$0: $*" + exit 1 +} + +needsarg() +{ + [ $1 -ge 2 ] || error "syntax error" +} + +[ -d $GRUBLIB ] || error "Can't find $GRUBLIB - did you install a recent grub package (0.95+cvs20040624 or later) ?" +[ -x $MFORMAT ] || error "Can't find mformat - did you install the mtools package ?" + +while [ $# -gt 0 ] +do + case "$1" in + --help) echo "$0 [--memtest $MEMTEST] [--floppyimage $FLOPPYIMAGE]"; exit 0 ;; + --memtest) needsarg $#; MEMTEST="$2"; shift ;; + --floppyimage) needsarg $#; FLOPPYIMAGE="$2"; shift ;; + *) error "syntax error" ;; + esac + shift +done + +MOUNTPOINT=$(mktemp -d) + +if [ -b "$FLOPPYIMAGE" ] +then + FINALDEV="$FLOPPYIMAGE" + FLOPPYIMAGE="$(mktemp)" +else + FINALDEV="" +fi + +echo "* Creating msdos file system" +echo +if [ ! -s "$FLOPPYIMAGE" ]; then + # unless a non-empty image exists, create a blank one first + dd bs=1024 count=1440 if=/dev/zero of="$FLOPPYIMAGE" +fi +# FIXME: "-f 1440" should probably be dropped +mformat -i $FLOPPYIMAGE -f 1440 :: + +mmd -i $FLOPPYIMAGE ::/boot +mmd -i $FLOPPYIMAGE ::/boot/grub + +echo +echo "* Installing GRUB files" +mcopy -v -i "$FLOPPYIMAGE" - ::/boot/grub/menu.lst < +.B ] [ \-\-floppyimage +.I +.B ] + +.SH DESCRIPTION +.B make-memtest86+-boot-floppy +can create a memtest86+ boot floppy using GRUB as the bootloader. + +.SH OPTIONS + +.IP "\-\-memtest " +Path to the memtest86+-image, default is /boot/memtest86+.bin. + +.IP "\-\-floppyimage " +File or device where the boot-image should be written to, default is /dev/fd0. + +.IP "\-\-help" +Display a short message about the options of the tool. + +.SH AUTHOR +This man-page has been written by Thomas Schmidt +.PP +Permission is granted to copy, distribute and/or modify this document under +the terms of the GNU General Public License, Version 2 any +later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public +License can be found in /usr/share/common\-licenses/GPL. --- memtest86+-4.10.orig/debian/compat +++ memtest86+-4.10/debian/compat @@ -0,0 +1 @@ +5 --- memtest86+-4.10.orig/debian/README.Debian +++ memtest86+-4.10/debian/README.Debian @@ -0,0 +1,20 @@ +memtest86+ for Debian +--------------------- + +Two binary images are provided: + + - A legacy /boot/memtest86+.bin that uses Linux zImage boot + protocol. + + - A Multiboot /boot/memtest86+_multiboot.bin image that follows the + Multiboot specification. + +memtest86+_multiboot.bin is automatically registered against grub2. For +other bootloaders you'll need to do some manual setup (see +examples/grub-menu.lst for GRUB Legacy or examples/lilo.conf for LILO), +or to make a boot-floppy, and reboot on this image. + +The make-memtest86+-boot-floppy utility will help you to create a +boot floppy or floppy image using GRUB Legacy. + + -- Yann Dirson , Wed, 23 Apr 2008 21:05:51 z --- memtest86+-4.10.orig/debian/lintian-overrides +++ memtest86+-4.10/debian/lintian-overrides @@ -0,0 +1,3 @@ +# This file is intended to be statically-linked +memtest86+: statically-linked-binary ./usr/lib/memtest86+/memtest86+.elf +memtest86+: shared-lib-without-dependency-information ./boot/memtest86+_multiboot.bin --- memtest86+-4.10.orig/debian/control +++ memtest86+-4.10/debian/control @@ -0,0 +1,33 @@ +Source: memtest86+ +Section: misc +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Yann Dirson +Build-Depends: debhelper (>> 5.0.0), dh-buildinfo, gcc-multilib [amd64 kfreebsd-amd64], + po-debconf +Homepage: http://www.memtest.org/ +Standards-Version: 3.8.4 + +Package: memtest86+ +Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 lpia hurd-i386 +Depends: ${misc:Depends} +Suggests: hwtools, memtester, kernel-patch-badram, memtest86, grub-pc | grub-legacy, mtools +Description: thorough real-mode memory tester + Memtest86+ scans your RAM for errors. + . + This tester runs independently of any OS - it is run at computer + boot-up, so that it can test *all* of your memory. You may want to + look at `memtester', which allows to test your memory within Linux, + but this one won't be able to test your whole RAM. + . + It can output a list of bad RAM regions usable by the BadRAM kernel + patch, so that you can still use your old RAM with one or two bad bits. + . + Memtest86+ is based on memtest86 3.0, and adds support for recent + hardware, as well as a number of general-purpose improvements, + including many patches to memtest86 available from various sources. + . + Both memtest86 and memtest86+ are being worked on in parallel. + . + A convenience script is also provided to make a grub-based floppy or + image. --- memtest86+-4.10.orig/debian/copyright +++ memtest86+-4.10/debian/copyright @@ -0,0 +1,26 @@ +This package was debianized by Yann Dirson + +It was downloaded from http://www.memtest.org/ + +Copyright (C) 2004,2005,2007,2009 by Samuel Demeulemeester +, based on memtest86 by Chris Brady +, and various contributors. + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 dated June, 1991. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301, USA. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-2'. --- memtest86+-4.10.orig/debian/postinst +++ memtest86+-4.10/debian/postinst @@ -0,0 +1,20 @@ +#!/bin/sh +set -e + +. /usr/share/debconf/confmodule + +if [ "$1" = configure ]; then + db_get shared/memtest86-run-lilo + if [ "$RET" = true ] && + [ -x /sbin/lilo ] && [ -r /etc/lilo.conf ] && + grep "image.*=.*/boot/memtest86+.bin" /etc/lilo.conf >/dev/null + then + lilo + fi + + if [ -e /boot/grub/grub.cfg ] && [ -x "`which update-grub2 2>/dev/null`" ] ; then + update-grub2 + fi +fi + +#DEBHELPER# --- memtest86+-4.10.orig/debian/grub +++ memtest86+-4.10/debian/grub @@ -0,0 +1,59 @@ +#!/bin/sh +set -e + +if [ -f /usr/lib/grub/grub-mkconfig_lib ]; then + . /usr/lib/grub/grub-mkconfig_lib + LX=linux16 +elif [ -f /usr/lib/grub/update-grub_lib ]; then + . /usr/lib/grub/update-grub_lib + LX=linux +else + # no grub file, so we notify and exit gracefully + echo "Cannot find grub config file, exiting." >&2 + exit 0 +fi + +# We can't cope with loop-mounted devices here. +case ${GRUB_DEVICE_BOOT} in + /dev/loop/*|/dev/loop[0-9]) exit 0 ;; +esac + +prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")" + +if test -e /boot/memtest86+.bin ; then + MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest86+.bin" ) + echo "Found memtest86+ image: $MEMTESTPATH" >&2 + cat << EOF +menuentry "Memory test (memtest86+)" { +EOF + printf '%s\n' "${prepare_boot_cache}" + cat << EOF + $LX $MEMTESTPATH +} +menuentry "Memory test (memtest86+, serial console 115200)" { +EOF + printf '%s\n' "${prepare_boot_cache}" + cat << EOF + $LX $MEMTESTPATH console=ttyS0,115200n8 +} +EOF +fi + +#if test -e /boot/memtest86+_multiboot.bin ; then +# MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest86+_multiboot.bin" ) +# echo "Found memtest86+ multiboot image: $MEMTESTPATH" >&2 +# cat << EOF +#menuentry "Memory test (memtest86+, experimental multiboot)" { +#EOF +# printf '%s\n' "${prepare_boot_cache}" +# cat << EOF +# multiboot $MEMTESTPATH +#} +#menuentry "Memory test (memtest86+, serial console 115200, experimental multiboot)" { +#EOF +# printf '%s\n' "${prepare_boot_cache}" +# cat << EOF +# multiboot $MEMTESTPATH console=ttyS0,115200n8 +#} +#EOF +#fi --- memtest86+-4.10.orig/debian/config +++ memtest86+-4.10/debian/config @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +. /usr/share/debconf/confmodule +db_input medium shared/memtest86-run-lilo || true +db_go || true + +#DEBHELPER# --- memtest86+-4.10.orig/debian/postrm +++ memtest86+-4.10/debian/postrm @@ -0,0 +1,9 @@ +#!/bin/sh +set -e + +if ([ "$1" = remove ] || [ "$1" = purge ]) && \ + test -e /boot/grub/grub.cfg && which update-grub2 > /dev/null ; then + update-grub2 +fi + +#DEBHELPER# --- memtest86+-4.10.orig/debian/grub-menu.lst +++ memtest86+-4.10/debian/grub-menu.lst @@ -0,0 +1,12 @@ +# sample /boot/grub/menu.lst entry for memtest86 +# +# This example assumes the contents of /boot is on the root partition. +# If your /boot is on its own partition, remove /boot from the 'kernel' line. + +title memtest86+ +root (hd0,0) +kernel /boot/memtest86+.bin + +title memtest86+ (serial console 115200) +root (hd0,0) +kernel /boot/memtest86+.bin console=ttyS0,115200n8 --- memtest86+-4.10.orig/debian/po/pt.po +++ memtest86+-4.10/debian/po/pt.po @@ -0,0 +1,37 @@ +# Translation of memtest86+ debconf messages to Portuguese +# Copyright (C) 2009 the memtest86+ copyright holder +# This file is distributed under the same license as the memtest86+ package. +# +# Américo Monteiro , 2009. +msgid "" +msgstr "" +"Project-Id-Version: memtest86+ 4.00-2.1\n" +"Report-Msgid-Bugs-To: memtest86+@packages.debian.org\n" +"POT-Creation-Date: 2009-12-02 22:23+0100\n" +"PO-Revision-Date: 2009-12-28 20:18+0000\n" +"Last-Translator: Américo Monteiro \n" +"Language-Team: Portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pt\n" +"X-Generator: Lokalize 1.0\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Run lilo automatically after upgrade (if found)?" +msgstr "Correr o lilo automaticamente (se encontrado) após a actualização?" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"If lilo is installed and its configuration file contains the memtest86/" +"memtest86+ image, then it should be re-run in order to allow booting the new " +"image." +msgstr "" +"Se o lilo estiver instalado e o seu ficheiro de configuração conter a imagem " +"memtest86/memtest86+, então deve ser re-executado de modo a permitir o " +"arranque pela nova imagem." --- memtest86+-4.10.orig/debian/po/fr.po +++ memtest86+-4.10/debian/po/fr.po @@ -0,0 +1,38 @@ +# Translation of memtest86 debconf templates to French +# Copyright (C) 2010 Debian French l10n team +# This file is distributed under the same license as the memtest86 package. +# +# Translators: +# Christian Perrier , 2010. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: memtest86+@packages.debian.org\n" +"POT-Creation-Date: 2009-12-02 22:23+0100\n" +"PO-Revision-Date: 2010-01-02 18:44+0100\n" +"Last-Translator: Christian Perrier \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: fr\n" +"X-Generator: Lokalize 1.0\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Run lilo automatically after upgrade (if found)?" +msgstr "Faut-il exécuter lilo automatiquement après la mise à jour ?" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"If lilo is installed and its configuration file contains the memtest86/" +"memtest86+ image, then it should be re-run in order to allow booting the new " +"image." +msgstr "" +"Si LILO est installé et que son fichier de configuration fait référence à " +"une image de lancement de memtest86 ou memtest86+, il doit être ré-exécuté " +"afin de pouvoir utiliser la nouvelle image." --- memtest86+-4.10.orig/debian/po/de.po +++ memtest86+-4.10/debian/po/de.po @@ -0,0 +1,37 @@ +# Translation of po-debconf template to German +# This file is distributed under the same license as the memtest86+ package. +# +# Thomas Mueller , 2010. +msgid "" +msgstr "" +"Project-Id-Version: memtest86+ 4.00\n" +"Report-Msgid-Bugs-To: memtest86+@packages.debian.org\n" +"POT-Creation-Date: 2009-12-02 22:23+0100\n" +"PO-Revision-Date: 2010-01-01 19:47+0100\n" +"Last-Translator: Thomas Mueller \n" +"Language-Team: German \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: de\n" +"X-Generator: Lokalize 1.0\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Run lilo automatically after upgrade (if found)?" +msgstr "" +"Soll lilo nach dem Upgrade automatisch ausgeführt werden (falls vorhanden)?" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"If lilo is installed and its configuration file contains the memtest86/" +"memtest86+ image, then it should be re-run in order to allow booting the new " +"image." +msgstr "" +"Falls lilo installiert ist und dessen Konfigurationsdatei das memtest86/" +"memtest86+-Image enthält, dann sollte es erneut ausgeführt werden, damit das " +"Booten des neuen Images möglich ist." --- memtest86+-4.10.orig/debian/po/ru.po +++ memtest86+-4.10/debian/po/ru.po @@ -0,0 +1,37 @@ +# translation of memtest86+_4.00-2.1_ru.po to Russian +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Yuri Kozlov , 2010. +msgid "" +msgstr "" +"Project-Id-Version: memtest86+ 4.00-2.1\n" +"Report-Msgid-Bugs-To: memtest86+@packages.debian.org\n" +"POT-Creation-Date: 2009-12-02 22:23+0100\n" +"PO-Revision-Date: 2010-01-13 19:22+0300\n" +"Last-Translator: Yuri Kozlov \n" +"Language-Team: Russian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ru\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Run lilo automatically after upgrade (if found)?" +msgstr "Запускать lilo автоматически после обновления (если установлен)?" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"If lilo is installed and its configuration file contains the memtest86/" +"memtest86+ image, then it should be re-run in order to allow booting the new " +"image." +msgstr "" +"Если пакет lilo установлен и его файл настройки содержит образ memtest86/" +"memtest86+, то его нужно перезапустить, чтобы стал загружаться новый образ." --- memtest86+-4.10.orig/debian/po/ja.po +++ memtest86+-4.10/debian/po/ja.po @@ -0,0 +1,35 @@ +# memtest86+ po-debconf translation (Japanese) +# Copyright (C) 2009 Yann Dirson +# This file is distributed under the same license as the memtest86+ package. +# Hideki Yamane (Debian-JP) , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: memtest86+ 4.00-2.1\n" +"Report-Msgid-Bugs-To: memtest86+@packages.debian.org\n" +"POT-Creation-Date: 2009-12-02 22:23+0100\n" +"PO-Revision-Date: 2009-12-27 13:52+0900\n" +"Last-Translator: Hideki Yamane (Debian-JP) \n" +"Language-Team: Japanese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ja\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Run lilo automatically after upgrade (if found)?" +msgstr "(もしあれば) lilo をアップグレード後に自動的に実行しますか?" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"If lilo is installed and its configuration file contains the memtest86/" +"memtest86+ image, then it should be re-run in order to allow booting the new " +"image." +msgstr "" +"lilo がインストールされていて、その設定ファイルが memtest86/memtest86+ のイ" +"メージを指定している場合は、新しいイメージを起動できるようにするために lilo " +"の再実行が必要です。" --- memtest86+-4.10.orig/debian/po/POTFILES.in +++ memtest86+-4.10/debian/po/POTFILES.in @@ -0,0 +1 @@ +[type: gettext/rfc822deb] templates --- memtest86+-4.10.orig/debian/po/es.po +++ memtest86+-4.10/debian/po/es.po @@ -0,0 +1,58 @@ +# memtest86+ po-debconf translation to Spanish +# Copyright (C) 2010 Software in the Public Interest +# This file is distributed under the same license as the memtest86+ package. +# +# Changes: +# - Initial translation +# Francisco Javier Cuadrado , 2010 +# +# Traductores, si no conocen el formato PO, merece la pena leer la +# documentación de gettext, especialmente las secciones dedicadas a este +# formato, por ejemplo ejecutando: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Equipo de traducción al español, por favor lean antes de traducir +# los siguientes documentos: +# +# - El proyecto de traducción de Debian al español +# http://www.debian.org/intl/spanish/ +# especialmente las notas y normas de traducción en +# http://www.debian.org/intl/spanish/notas +# +# - La guía de traducción de po's de debconf: +# /usr/share/doc/po-debconf/README-trans +# o http://www.debian.org/intl/l10n/po-debconf/README-trans +# +msgid "" +msgstr "" +"Project-Id-Version: memtest86+ 4.00-2.2\n" +"Report-Msgid-Bugs-To: memtest86+@packages.debian.org\n" +"POT-Creation-Date: 2009-12-02 22:23+0100\n" +"PO-Revision-Date: 2010-04-28 10:10+0200\n" +"Last-Translator: Francisco Javier Cuadrado \n" +"Language-Team: Debian l10n Spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: \n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Run lilo automatically after upgrade (if found)?" +msgstr "" +"¿Desea ejecutar automáticamente lilo después de la actualización (si se " +"encuentra)?" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"If lilo is installed and its configuration file contains the memtest86/" +"memtest86+ image, then it should be re-run in order to allow booting the new " +"image." +msgstr "" +"Si lilo está instalado y su archivo de configuración contiene la imagen de " +"«memtest86»/«memtest86+» vuelva a ejecutar lilo para que pueda arrancar la " +"nueva imagen." --- memtest86+-4.10.orig/debian/po/templates.pot +++ memtest86+-4.10/debian/po/templates.pot @@ -0,0 +1,32 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: memtest86+@packages.debian.org\n" +"POT-Creation-Date: 2009-12-02 22:23+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Run lilo automatically after upgrade (if found)?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"If lilo is installed and its configuration file contains the memtest86/" +"memtest86+ image, then it should be re-run in order to allow booting the new " +"image." +msgstr "" --- memtest86+-4.10.orig/debian/po/sv.po +++ memtest86+-4.10/debian/po/sv.po @@ -0,0 +1,37 @@ +# Translation of memtest86+ debconf template to Swedish +# Copyright (C) 2010 Martin Bagge +# This file is distributed under the same license as the memtest86+ package. +# +# Martin Bagge , 2010 +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: memtest86+@packages.debian.org\n" +"POT-Creation-Date: 2009-12-02 22:23+0100\n" +"PO-Revision-Date: 2010-01-09 19:01+0100\n" +"Last-Translator: Martin Bagge \n" +"Language-Team: Swedish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sv\n" +"X-Poedit-Language: Swedish\n" +"X-Poedit-Country: Sweden\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Run lilo automatically after upgrade (if found)?" +msgstr "Ska lilo (om det finns) köras automatiskt efter uppgradering?" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"If lilo is installed and its configuration file contains the memtest86/" +"memtest86+ image, then it should be re-run in order to allow booting the new " +"image." +msgstr "" +"Om lilo är installerat och dess inställningar innehållet avbildningen av " +"memtest86/memtest86+ ska den köras för att systemet ska kunna startas på den " +"nya avbildningen."