rpm/syslinux
SHA256
1
0
Fork 0
forked from pool/syslinux
Code Pull Requests Activity

Accepting request 37404 from system:install:head

Browse Source 
Copy from system:install:head/syslinux based on submit request 37404 from user snwint

OBS-URL: https://build.opensuse.org/request/show/37404
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/syslinux?expand=0&rev=23
This commit is contained in:
OBS User autobuild 2010-04-13 20:05:36 +00:00 committed by Git OBS Bridge
parent ca255ac5c9
commit c9ed7a89e1
8 changed files with 136 additions and 1141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1080
syslinux-3.83-gfxboot_c32.diff
View File

File diff suppressed because it is too large Load Diff

3
syslinux-3.83.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9ec84d6dcc188f082a875b69796b196f98ea8c0102b55b03123616a285c2d9f9
size 3184349

0
syslinux-3.83-compat.diff → syslinux-3.86-compat.diff
View File

103
syslinux-3.83-gfxboot.diff → syslinux-3.86-gfxboot.diff
View File

@ -1,5 +1,5 @@
diff --git a/core/isolinux.asm b/core/isolinux.asm
index 2627c2d..a0910fb 100644
index 23429bd..54f2e19 100644
--- a/core/isolinux.asm
+++ b/core/isolinux.asm
@@ -1135,73 +1135,23 @@ all_read:
@ -211,10 +211,10 @@ index 8ff9da1..91061fc 100644
section .data
diff --git a/core/runkernel.inc b/core/runkernel.inc
index 8bfc8b8..f458fc7 100644
index e738706..5da5bc9 100644
--- a/core/runkernel.inc
+++ b/core/runkernel.inc
@@ -228,6 +228,8 @@ new_kernel:
@@ -233,6 +233,8 @@ new_kernel:
mov [LoadFlags],al
any_kernel:
@ -223,7 +223,7 @@ index 8bfc8b8..f458fc7 100644
mov si,loading_msg
call writestr_qchk
mov si,KernelCName ; Print kernel name part of
@@ -319,6 +321,9 @@ load_initrd:
@@ -324,6 +326,9 @@ load_initrd:
;
call abort_check ; Last chance!!
@ -233,7 +233,7 @@ index 8bfc8b8..f458fc7 100644
mov si,ready_msg
call writestr_qchk
@@ -489,6 +494,8 @@ old_kernel:
@@ -497,6 +502,8 @@ old_kernel:
xor ax,ax
cmp word [InitRDPtr],ax ; Old kernel can't have initrd
je .load
@ -242,7 +242,7 @@ index 8bfc8b8..f458fc7 100644
mov si,err_oldkernel
jmp abort_load
.load:
@@ -613,6 +620,8 @@ loadinitrd:
@@ -621,6 +628,8 @@ loadinitrd:
ret
.notthere:
@ -252,10 +252,10 @@ index 8bfc8b8..f458fc7 100644
call writestr
mov si,InitRDCName
diff --git a/core/ui.inc b/core/ui.inc
index 1b40717..9413f16 100644
index ed96ccd..0d896fc 100644
--- a/core/ui.inc
+++ b/core/ui.inc
@@ -402,8 +402,12 @@ vk_check:
@@ -417,8 +417,12 @@ vk_check:
%if HAS_LOCALBOOT
; Is this a "localboot" pseudo-kernel?
cmp al,VK_LOCALBOOT ; al == KernelType
@ -269,7 +269,7 @@ index 1b40717..9413f16 100644
%endif
jmp get_kernel
@@ -468,6 +472,8 @@ bad_kernel:
@@ -483,6 +487,8 @@ bad_kernel:
.really:
mov si,KernelName
mov di,KernelCName
@ -278,7 +278,7 @@ index 1b40717..9413f16 100644
push di
call unmangle_name ; Get human form
mov si,err_notfound ; Complain about missing kernel
@@ -510,7 +516,10 @@ on_error:
@@ -525,7 +531,10 @@ on_error:
;
; kernel_corrupt: Called if the kernel file does not seem healthy
;
@ -291,7 +291,7 @@ index 1b40717..9413f16 100644
;
diff --git a/core/comboot.inc b/core/comboot.inc
index cdba16d..1a1dbfe 100644
index f8a7853..f6abe1b 100644
--- a/core/comboot.inc
+++ b/core/comboot.inc
@@ -96,24 +96,23 @@ is_comboot_image:
@ -325,38 +325,49 @@ index cdba16d..1a1dbfe 100644
mov al,0Dh ; CR after last character
stosb
diff --git a/core/layout.inc b/core/layout.inc
index 8c2e248..ca95d2b 100644
index 19b5057..15dc8ff 100644
--- a/core/layout.inc
+++ b/core/layout.inc
@@ -123,4 +123,4 @@ real_mode_seg equ cache_seg + 1000h
@@ -141,4 +141,4 @@ real_mode_seg equ cache_seg + 1000h
pktbuf_seg equ cache_seg ; PXELINUX packet buffers
%endif
-comboot_seg equ real_mode_seg ; COMBOOT image loading zone
+comboot_seg equ real_mode_seg + 1000h ; COMBOOT image loading zone
diff --git a/core/runkernel.inc b/core/runkernel.inc
index f458fc7..f6ed644 100644
index 5da5bc9..033019c 100644
--- a/core/runkernel.inc
+++ b/core/runkernel.inc
@@ -165,7 +165,7 @@ opt_mem:
@@ -168,7 +168,7 @@ opt_mem:
ret
opt_quiet:
- mov byte [QuietBoot],1
+ or byte [QuietBoot],1
- mov byte [QuietBoot],QUIET_FLAG
+ or byte [QuietBoot],QUIET_FLAG
ret
%if IS_PXELINUX
@@ -634,7 +634,7 @@ loadinitrd:
@@ -228,7 +228,9 @@ new_kernel:
; we were provided.
;
mov al,[es:su_loadflags]
- or al,[QuietBoot] ; Set QUIET_FLAG if needed
+ mov ah,[QuietBoot] ; Set QUIET_FLAG if needed
+ and ah,QUIET_FLAG
+ or al,ah
mov [es:su_loadflags],al
mov [LoadFlags],al
@@ -642,7 +644,7 @@ loadinitrd:
; assumes CS == DS
;
writestr_qchk:
- test byte [QuietBoot],01h
+ test byte [QuietBoot],03h
- test byte [QuietBoot],QUIET_FLAG
+ test byte [QuietBoot],QUIET_FLAG | 2
jz writestr
ret
@@ -689,4 +689,6 @@ KernelVersion resw 1 ; Kernel protocol version
@@ -697,4 +699,6 @@ KernelVersion resw 1 ; Kernel protocol version
;
InitRDPtr resw 1 ; Pointer to initrd= option in command line
LoadFlags resb 1 ; Loadflags from kernel
@ -365,23 +376,23 @@ index f458fc7..f6ed644 100644
+ section .data
+QuietBoot db 0 ; Set if a quiet boot is requested
diff --git a/core/ui.inc b/core/ui.inc
index 9413f16..353d59a 100644
index 0d896fc..a256ed0 100644
--- a/core/ui.inc
+++ b/core/ui.inc
@@ -600,7 +600,7 @@ kernel_good:
@@ -616,7 +616,7 @@ kernel_good:
;
xor ax,ax
mov [InitRDPtr],ax
- mov [QuietBoot],al
+ and byte [QuietBoot],~1
+ and byte [QuietBoot],~QUIET_FLAG
%if IS_PXELINUX
mov [KeepPXE],al
%endif
diff --git a/core/runkernel.inc b/core/runkernel.inc
index f6ed644..286c9c8 100644
index 033019c..c9f37c3 100644
--- a/core/runkernel.inc
+++ b/core/runkernel.inc
@@ -259,7 +259,7 @@ read_kernel:
@@ -266,7 +266,7 @@ read_kernel:
mov ecx,8000h ; 32K
sub ecx,esi ; Number of bytes to copy
add esi,(real_mode_seg << 4) ; Pointer to source
@ -390,7 +401,7 @@ index f6ed644..286c9c8 100644
call bcopy ; Transfer to high memory
@@ -431,7 +431,7 @@ setup_move:
@@ -438,7 +438,7 @@ setup_move:
mov eax,10000h ; Target address of low kernel
stosd
@ -399,7 +410,7 @@ index f6ed644..286c9c8 100644
stosd
neg eax
add eax,[KernelEnd]
@@ -439,9 +439,13 @@ setup_move:
@@ -446,9 +446,13 @@ setup_move:
inc cx
mov bx,9000h ; Revised real mode segment
@ -413,17 +424,17 @@ index f6ed644..286c9c8 100644
cmp word [InitRDPtr],0 ; Did we have an initrd?
je .no_initrd
@@ -692,3 +696,5 @@ LoadFlags resb 1 ; Loadflags from kernel
@@ -702,3 +706,5 @@ LoadFlags resb 1 ; Loadflags from kernel
section .data
QuietBoot db 0 ; Set if a quiet boot is requested
+ alignz 4
+KernelStart dd 100000h
diff --git a/core/comboot.inc b/core/comboot.inc
index 1a1dbfe..1923308 100644
index f6abe1b..8b7ee5c 100644
--- a/core/comboot.inc
+++ b/core/comboot.inc
@@ -962,6 +962,45 @@ comapi_shufraw:
@@ -969,6 +969,45 @@ comapi_shufraw:
mov ecx,P_ECX
jmp shuffle_and_boot_raw
@ -469,7 +480,7 @@ index 1a1dbfe..1923308 100644
section .data
%macro int21 2
@@ -969,6 +1008,109 @@ comapi_shufraw:
@@ -976,6 +1015,109 @@ comapi_shufraw:
dw %2
%endmacro
@ -579,7 +590,7 @@ index 1a1dbfe..1923308 100644
int21_table:
int21 00h, comboot_return
int21 01h, comboot_getkey
@@ -1021,8 +1163,16 @@ int22_table:
@@ -1028,8 +1170,16 @@ int22_table:
dw comapi_closedir ; 0022 close directory
dw comapi_shufsize ; 0023 query shuffler size
dw comapi_shufraw ; 0024 cleanup, shuffle and boot raw
@ -596,7 +607,7 @@ index 1a1dbfe..1923308 100644
APIKeyWait db 0
APIKeyFlag db 0
@@ -1041,8 +1191,10 @@ feature_flags_len equ ($-feature_flags)
@@ -1048,8 +1198,10 @@ feature_flags_len equ ($-feature_flags)
err_notdos db ': attempted DOS system call INT ',0
err_comlarge db 'COMBOOT image too large.', CR, LF, 0
@ -609,10 +620,10 @@ index 1a1dbfe..1923308 100644
ConfigName resb FILENAME_MAX
CurrentDirName resb FILENAME_MAX
diff --git a/core/comboot.inc b/core/comboot.inc
index 1923308..f39bfb1 100644
index 8b7ee5c..5adbe74 100644
--- a/core/comboot.inc
+++ b/core/comboot.inc
@@ -1043,12 +1043,14 @@ comapi_run2:
@@ -1050,12 +1050,14 @@ comapi_run2:
mov [comboot_sp_save],sp ; save stack pointer
mov word [comboot_hook],comboot_hook_entry
or byte [QuietBoot],2
@ -627,7 +638,7 @@ index 1923308..f39bfb1 100644
clc
ret
@@ -1172,6 +1174,7 @@ int22_count equ ($-int22_table)/2
@@ -1179,6 +1181,7 @@ int22_count equ ($-int22_table)/2
comboot_sp_save dw 0
comboot_hook dw comboot_hook_nop
comboot_far dd 0
@ -636,10 +647,10 @@ index 1923308..f39bfb1 100644
APIKeyWait db 0
APIKeyFlag db 0
diff --git a/core/ui.inc b/core/ui.inc
index 353d59a..e37f2a7 100644
index a256ed0..40f7636 100644
--- a/core/ui.inc
+++ b/core/ui.inc
@@ -379,9 +379,13 @@ vk_check:
@@ -394,9 +394,13 @@ vk_check:
push word real_mode_seg
pop es
mov di,cmd_line_here
@ -654,10 +665,10 @@ index 353d59a..e37f2a7 100644
pop es
mov di,KernelName
diff --git a/core/comboot.inc b/core/comboot.inc
index f39bfb1..0874526 100644
index 5adbe74..c6bfab2 100644
--- a/core/comboot.inc
+++ b/core/comboot.inc
@@ -1088,6 +1088,7 @@ comboot_hook_entry:
@@ -1095,6 +1095,7 @@ comboot_hook_entry:
push fs
push es
push ds
@ -666,10 +677,10 @@ index f39bfb1..0874526 100644
pop ds
pop es
diff --git a/core/ui.inc b/core/ui.inc
index e37f2a7..6137dc9 100644
index 40f7636..ef69a4d 100644
--- a/core/ui.inc
+++ b/core/ui.inc
@@ -616,7 +616,11 @@ kernel_good:
@@ -632,7 +632,11 @@ kernel_good:
mov [KernelCNameLen],di
; Default memory limit, can be overridden by image loaders
@ -681,7 +692,7 @@ index e37f2a7..6137dc9 100644
mov [MyHighMemSize],eax
popad
@@ -637,6 +641,7 @@ kernel_good:
@@ -653,6 +657,7 @@ kernel_good:
; At this point, EAX contains the size of the kernel, SI contains
; the file handle/cluster pointer, and ECX contains the extension (if any.)
;
@ -690,10 +701,10 @@ index e37f2a7..6137dc9 100644
add di,di
jmp [kerneltype_table+di]
diff --git a/doc/comboot.txt b/doc/comboot.txt
index f5fefda..1450021 100644
index eb43708..2b1349d 100644
--- a/doc/comboot.txt
+++ b/doc/comboot.txt
@@ -955,3 +955,38 @@ AX=0024h [3.80] Cleanup, shuffle and boot, raw version
@@ -949,3 +949,38 @@ AX=0024h [3.80] Cleanup, shuffle and boot, raw version
with read/write data segments, matching the respective code
segment. For mode 0, B=0 and the limits will be 64K, for mode
1, B=1 and the limits will be 4 GB.

12
syslinux-3.83-suse.diff → syslinux-3.86-suse.diff
View File

@ -1,13 +1,13 @@
diff --git a/Makefile b/Makefile
index 76abff5..7d00782 100644
index 2393faa..c7daebb 100644
--- a/Makefile
+++ b/Makefile
@@ -66,7 +66,7 @@ INSTALL_SBIN = extlinux/extlinux
@@ -68,7 +68,7 @@ INSTALL_SBIN = extlinux/extlinux
# Things to install in /usr/lib/syslinux
INSTALL_AUX = core/pxelinux.0 gpxe/gpxelinux.0 core/isolinux.bin \
core/isolinux-debug.bin \
- dos/syslinux.com dos/copybs.com win32/syslinux.exe \
+ dos/syslinux.com dos/copybs.com \
- dos/syslinux.com win32/syslinux.exe \
+ dos/syslinux.com \
mbr/*.bin $(MODULES)
INSTALL_AUX_OPT = win32/syslinux.exe
@ -24,7 +24,7 @@ index 65418c4..fbb38b5 100644
# Standard rule for {ldlinux,pxelinux,extlinux}.bin
%.bin: %.elf
diff --git a/core/add_crc b/core/add_crc
new file mode 100755
new file mode 100644
index 0000000..0da2307
--- /dev/null
+++ b/core/add_crc
@ -87,7 +87,7 @@ index 0000000..0da2307
+syswrite F, $buf;
+
diff --git a/core/isolinux.asm b/core/isolinux.asm
index a0910fb..c947846 100644
index 54f2e19..72be12a 100644
--- a/core/isolinux.asm
+++ b/core/isolinux.asm
@@ -308,6 +308,22 @@ initial_csum: xor edi,edi

3
syslinux-3.86.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:82a8d2a242f869cb4c34b3a074871f472762343e1879a4dca23d7ce5c4dcd06d
size 3735823

66
syslinux.changes
View File

@ -1,3 +1,69 @@
-------------------------------------------------------------------
Thu Apr 8 16:54:00 CEST 2010 - snwint@suse.de
- update to version 3.86
* chain.c32: fix chainloading the MBR of a hard disk (broken
in 3.85).
* mboot.c32: report the boot loader name in the information
structure.
* com32: set argv[0] in a com32 module.
* core: add a workaround for a bug in Xen HVM older than
version 3.3: disable halt on those platforms.
* Fix problems where certain operations in com32 modules would
cause the core to believe the system was idle.
* MEMDISK: fix MBR detection when used with a DOSEMU header or
an offset.
* MEMDISK: generate the mBFT checksum correctly.
* gPXELINUX: updated to gPXE 1.0.0. gPXELINUX can now do NBP
chainloading, and does not require a second DHCP.
* vesamenu.c32: unbreak the default "grey hole" background.
* We no longer have a built-in default of "linux auto".
Instead, if no DEFAULT or UI statement is found, or the
configuration file is missing entirely, we drop to the boot:
prompt with an error message (if NOESCAPE is set, we stop
with a "boot failed" message; this is also the case for
PXELINUX if the configuration file is not found.)
* chain.c32: support chainloading Grub4DOS; patch by Gert
Hulselmans.
* New tool: sysdump.c32, can be used to produce system
information for debugging via tftp or ymodem (serial port).
* "vga=current" on the Linux command line is now supported.
* chain.c32: support for Windows Recovery Console, via the
"cmldr=" option.
* chain.c32: should now support loading NTLDR from different
type media than loaded from.
* chain.c32: support chainloading to a FAT/NTFS partition with
invalid "hidden sectors" via the "sethidden" option.
* memdisk: fix the mBFT ACPI table.
* vesamenu.c32: if the image is smaller than the screen, tile
it across the whole screen.
* mkdiskimage: -s option for producing a sparse image.
* vesamenu.c32: support arbitrary resolution setting (beyond
BIOS support) on some Intel-based video chipsets. This code
is a modified version of the "915resolution" tool by
Steve Tomljenovic; your mileage might vary.
* SYSLINUX: make the DOS installer work for MS-DOS 7.x/8.x
(Win9x/ME) again.
* HDT: updated to version 0.3.6 (numerous changes.)
* mboot.c32: now supports video mode setting if requested by
the image.
* MEMDISK: Fix floppy images of PC-DOS.
* MEMDISK: Add support for emulation of CD-ROM images; patch
by Shao Miller.
* MEMDISK: Comply with the Win9x "safe hook" standard,
allowing a protected-mode driver.
* MEMDISK: New "mBFT" ACPI table, by analogy with the iSCSI
iBFT table. This allows detection from a protected-mode
operating system without EDD support.
* 32-bit version of the gfxboot loader (gfxboot.c32), so far
experimental. This will replace gfxboot.com in the future.
* vesamenu.c32: new MENU RESOLUTION directive to set a screen
resolution other than 640x480.
* chain.c32: add support for loading isolinux.bin.
* chain.c32: make sure to always return to text mode.
* eltorito.sys: DOS driver for generic CD-ROMs; by Gary Tong
and Bart Lagerweij.
-------------------------------------------------------------------
Mon Nov 16 14:53:11 CET 2009 - snwint@suse.de

10
syslinux.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package syslinux (Version 3.83)
# spec file for package syslinux (Version 3.86)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -21,12 +21,12 @@ Name: syslinux
ExclusiveArch: %ix86 x86_64
BuildRequires: libpng-devel nasm netpbm python
Url: http://syslinux.zytor.com/
License: GPL v2 or later
License: GPLv2+
Group: System/Boot
Requires: mtools
AutoReqProv: on
Summary: Boot Loader for Linux
Version: 3.83
Version: 3.86
Release: 1
Source: %{name}-%{version}.tar.bz2
Source1: isolinux-config
@ -34,7 +34,6 @@ Source2: README.gfxboot
Patch0: %{name}-%{version}-gfxboot.diff
Patch1: %{name}-%{version}-suse.diff
Patch2: %{name}-%{version}-compat.diff
Patch3: %{name}-%{version}-gfxboot_c32.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -54,7 +53,6 @@ Authors:
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
cp %{SOURCE2} .