Changes - j0ke.net Open Build Service

Changes of Revision 10

[-] [+]	Changed	syslinux.spec
@@ -1,15 +1,15 @@ #!BuildIgnore: post-build-checks -%define RPMVERSION 3.75 -%define VERSION 3.75 +%define RPMVERSION 3.80 +%define VERSION 3.80 Summary: Kernel loader which uses a FAT, ext2/3 or iso9660 filesystem or a PXE network Name: syslinux Version: %{RPMVERSION} -Release: 2 +Release: 1 License: GPL Group: System/Boot Source0: ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{VERSION}.tar.bz2 Source1: %{name}-rpmlintrc -Patch0: syslinux-openbsd-bootparams-3.51.patch +Patch0: syslinux-openbsd-bootparams-%{version}.patch ExclusiveArch: i386 i486 i586 i686 athlon pentium4 x86_64 Buildroot: %{_tmppath}/%{name}-%{VERSION}-root BuildRequires: nasm >= 0.98.39 perl @@ -127,6 +127,10 @@ %postun %changelog +* Thu May 08 2009 Carsten Schoene <cs@linux-administrator.com> - 3.80-1 +- update to release 3.80 + - adapted openbsd bootparams patch + * Sun May 03 2009 Carsten Schoene <cs@linux-administrator.com> - 3.75-2 - added openbsd bootparams patch
[-] [+]	Added	syslinux-openbsd-bootparams-3.75.patch ^
@@ -0,0 +1,43 @@ +--- core/bootsect.inc.orig 2007-06-10 18:51:39.000000000 -0400 ++++ core/bootsect.inc 2007-09-04 22:25:54.444484669 -0400 +@@ -44,6 +44,29 @@ + mov bx,abort_check ; Don't print dots, but allow abort + call load_high + ++ ; Write the boot param signature after the image ++ xor ecx, ecx ++ mov cx, bparams_sig_len ++ mov esi, bparams_sig ++ cld ++ call bcopy ++ ++ ; Zero terminate the boot params ++ push es ++ push real_mode_seg ++ pop es ++ mov bx, [CmdLinePtr] ++ mov [es:bx], byte 0 ++ pop es ++ ++ ; Write the boot params ++ xor ecx, ecx ++ mov cx, [CmdLinePtr] ++ sub cx, cmd_line_here ++ inc ecx ++ mov esi, (real_mode_seg << 4) + cmd_line_here ++ call bcopy ++ + sub edi,100000h + mov [trackbuf+8],edi ; Save length + +@@ -181,3 +204,10 @@ + movzx esp,di + + jmp shuffle_and_boot ++ ++ ++ section .data ++bparams_sig db 'BootParams:' ++bparams_sig_len equ $-bparams_sig ++ ++ section .text
[-] [+]	Changed	syslinux-openbsd-bootparams-3.80.patch ^
@@ -1,43 +1,45 @@ ---- core/bootsect.inc.orig 2007-06-10 18:51:39.000000000 -0400 -+++ core/bootsect.inc 2007-09-04 22:25:54.444484669 -0400 -@@ -44,6 +44,29 @@ +--- core/bootsect.inc.orig 2009-05-08 00:10:40.000000000 +0200 ++++ core/bootsect.inc 2009-05-08 00:13:09.000000000 +0200 +@@ -41,6 +41,28 @@ + xor dx,dx ; No padding mov bx,abort_check ; Don't print dots, but allow abort call load_high ++ ; Write the boot param signature after the image ++ xor ecx, ecx ++ mov cx, bparams_sig_len ++ mov esi, bparams_sig ++ cld ++ call bcopy ++ ++ ; Zero terminate the boot params ++ push es ++ push real_mode_seg ++ pop es ++ mov bx, [CmdLinePtr] ++ mov [es:bx], byte 0 ++ pop es ++ ++ ; Write the boot params ++ xor ecx, ecx ++ mov cx, [CmdLinePtr] ++ sub cx, cmd_line_here ++ inc ecx ++ mov esi, (real_mode_seg << 4) + cmd_line_here ++ call bcopy -+ ; Write the boot param signature after the image -+ xor ecx, ecx -+ mov cx, bparams_sig_len -+ mov esi, bparams_sig -+ cld -+ call bcopy -+ -+ ; Zero terminate the boot params -+ push es -+ push real_mode_seg -+ pop es -+ mov bx, [CmdLinePtr] -+ mov [es:bx], byte 0 -+ pop es -+ -+ ; Write the boot params -+ xor ecx, ecx -+ mov cx, [CmdLinePtr] -+ sub cx, cmd_line_here -+ inc ecx -+ mov esi, (real_mode_seg << 4) + cmd_line_here -+ call bcopy -+ sub edi,100000h mov [trackbuf+8],edi ; Save length +@@ -189,6 +211,13 @@ -@@ -181,3 +204,10 @@ - movzx esp,di + jmp shuffle_and_boot_raw - jmp shuffle_and_boot -+ + + section .data -+bparams_sig db 'BootParams:' -+bparams_sig_len equ $-bparams_sig -+ -+ section .text ++bparams_sig db 'BootParams:' ++bparams_sig_len equ $-bparams_sig ++ ++ section .text ++ + ; This stub gets run after the shuffle. It is copied + ; below 0x7c00 in order to properly handle the case + ; of bootstrap replacement.
	Added	syslinux-3.80.tar.bz2 ^