diff -u memtest86+-4.20/debian/changelog memtest86+-4.20/debian/changelog --- memtest86+-4.20/debian/changelog +++ memtest86+-4.20/debian/changelog @@ -1,3 +1,11 @@ +memtest86+ (4.20-1.1ubuntu3+lp560839) raring; urgency=low + + [ Rajeev V. Pillai ] + * Use ELF memtest86+ binary and load into high memory. This solves the error + "error: too small lower memory" with certain bioses. (LP: #560839) + + -- Dave Chiluk Wed, 23 Oct 2013 12:09:50 -0500 + memtest86+ (4.20-1.1ubuntu3) raring; urgency=low * Fix test#7 false positives due to compiler issues. (LP: #1071209) diff -u memtest86+-4.20/debian/rules memtest86+-4.20/debian/rules --- memtest86+-4.20/debian/rules +++ memtest86+-4.20/debian/rules @@ -37,6 +37,7 @@ install -d debian/$(PACKAGE)/usr/bin install -D -m644 memtest.bin debian/$(PACKAGE)/boot/$(PACKAGE).bin + install -D -m644 memtest debian/$(PACKAGE)/boot/$(PACKAGE).elf install -D -m644 memtest debian/$(PACKAGE)/usr/lib/$(PACKAGE)/$(PACKAGE).elf install -D -m644 mt*.iso debian/$(PACKAGE)/usr/lib/$(PACKAGE)/$(PACKAGE).iso install -D -m644 -s memtest_shared debian/$(PACKAGE)/boot/$(PACKAGE)_multiboot.bin diff -u memtest86+-4.20/debian/grub memtest86+-4.20/debian/grub --- memtest86+-4.20/debian/grub +++ memtest86+-4.20/debian/grub @@ -25,25 +25,26 @@ 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" ) +if test -e /boot/memtest86+.elf ; then + MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest86+.elf" ) echo "Found memtest86+ image: $MEMTESTPATH" >&2 cat << EOF -menuentry "Memory test (memtest86+)" { +menuentry "Memory test (memtest86+) ELF" { EOF printf '%s\n' "${prepare_boot_cache}" cat << EOF - $LX $MEMTESTPATH + knetbsd $MEMTESTPATH } -menuentry "Memory test (memtest86+, serial console 115200)" { +menuentry "Memory test (memtest86+, serial console 115200) ELF" { EOF printf '%s\n' "${prepare_boot_cache}" cat << EOF - $LX $MEMTESTPATH console=ttyS0,115200n8 + knetbsd $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 diff -u memtest86+-4.20/debian/grub-menu.lst memtest86+-4.20/debian/grub-menu.lst --- memtest86+-4.20/debian/grub-menu.lst +++ memtest86+-4.20/debian/grub-menu.lst @@ -6,7 +6,7 @@ -title memtest86+ +title memtest86+-elf root (hd0,0) -kernel /boot/memtest86+.bin +kernel /boot/memtest86+.elf -title memtest86+ (serial console 115200) +title memtest86+-elf (serial console 115200) root (hd0,0) -kernel /boot/memtest86+.bin console=ttyS0,115200n8 +kernel /boot/memtest86+.elf console=ttyS0,115200n8 only in patch2: unchanged: --- memtest86+-4.20.orig/memtest.lds +++ memtest86+-4.20/memtest.lds @@ -3,7 +3,7 @@ ENTRY(_start); SECTIONS { - . = 0x5000; + . = 0x100000; _start = . ; .data : { *(.data)