Hello community, here is the log from the commit of package lilo checked in at Thu Aug 24 18:00:56 CEST 2006. -------- --- arch/i386/lilo/lilo.changes 2006-03-21 17:37:53.000000000 +0100 +++ lilo/lilo.changes 2006-08-23 17:00:01.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Aug 23 16:59:47 CEST 2006 - snwint@suse.de + +- support latest gfxboot + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lilo.spec ++++++ --- /var/tmp/diff_new_pack.BLHcOH/_old 2006-08-24 18:00:41.000000000 +0200 +++ /var/tmp/diff_new_pack.BLHcOH/_new 2006-08-24 18:00:41.000000000 +0200 @@ -19,7 +19,7 @@ Group: System/Boot Autoreqprov: on Version: 22.7 -Release: 12 +Release: 20 Summary: The Linux Loader, a Boot Menu Source: ftp://brun.dyndns.org/pub/linux/lilo/lilo-%{version}.src.tar.gz Patch: lilo-22.7.diff @@ -123,6 +123,8 @@ %doc $RPM_SOURCE_DIR/README.graphics %changelog -n lilo +* Wed Aug 23 2006 - snwint@suse.de +- support latest gfxboot * Tue Mar 21 2006 - pth@suse.de - Make lilo grok mounting by persistent name. * Wed Jan 25 2006 - mls@suse.de ++++++ lilo-22.7-gfx.diff ++++++ --- /var/tmp/diff_new_pack.BLHcOH/_old 2006-08-24 18:00:42.000000000 +0200 +++ /var/tmp/diff_new_pack.BLHcOH/_new 2006-08-24 18:00:42.000000000 +0200 @@ -1,24 +1,3 @@ ---- Makefile -+++ Makefile -@@ -330,15 +330,15 @@ - first.s: first.S lilo.h version.h Makefile - $(CPP) $(PCONFIG) -DFIRST=0x199d1f05 -o first.s first.S - --second.s: second.S read.S volume.S mapper.S biosdata.S shs3.S bdata.h lilo.h version.h \ -+second.s: second.S gfxlogo.S read.S volume.S mapper.S biosdata.S shs3.S bdata.h lilo.h version.h \ - graph.S menu.S strlen.S bitmap.S crt.S display4.S Makefile - $(CPP) $(PCONFIG) -DTEXT=0x8bd7820b second.S -o second.s - --third.s: second.S read.S volume.S mapper.S biosdata.S shs3.S bdata.h lilo.h version.h \ -+third.s: second.S gfxlogo.S read.S volume.S mapper.S biosdata.S shs3.S bdata.h lilo.h version.h \ - graph.S menu.S strlen.S bitmap.S crt.S display4.S Makefile - $(CPP) $(PCONFIG) -DMENU=0x7920a7c2 second.S -o third.s - --bitmap.s: second.S read.S volume.S mapper.S biosdata.S shs3.S bdata.h lilo.h version.h \ -+bitmap.s: second.S gfxlogo.S read.S volume.S mapper.S biosdata.S shs3.S bdata.h lilo.h version.h \ - graph.S menu.S strlen.S bitmap.S crt.S display4.S Makefile - $(CPP) $(PCONFIG) -DBITMAP=0xf54f8b9d second.S -o bitmap.s - --- bsect.c +++ bsect.c @@ -774,6 +774,7 @@ @@ -31,7 +10,7 @@ map_add(&geo,0,((st.st_size)+SECTOR_SIZE-1)/SECTOR_SIZE); --- gfxlogo.S +++ gfxlogo.S -@@ -0,0 +1,732 @@ +@@ -0,0 +1,764 @@ +; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +; +; gfx stuff @@ -46,10 +25,6 @@ + +; the memory area we are working with +gfx_mem: .long 0 ; linear address -+gfx_mem_align: .long 0 ; aligned data start -+gfx_mem_file: .long 0 ; aligned gfx data start -+gfx_mem_max: .long 0 ; end address -+gfx_mem_free: .long 0 ; start of free area for malloc (after pcx image) + +; interface to loadable gfx extension (seg:ofs values) +gfx_bc_jt: .long 0 @@ -67,13 +42,30 @@ +gfx_bc_password_init: .long 0 +gfx_bc_password_done: .long 0 + -+; system config data (32 bytes) ++; system config data (52 bytes) +gfx_sysconfig: +gfx_bootloader: .byte 0 -+gfx_update: .byte 0 -+gfx_video_mode_list: .word 0 ; ofs to mode list -+gfx_video_modes: .byte 0 ; entries in mode list -+ .blkb 27 ; reserved ++gfx_sector_shift: .byte 0 ++gfx_media_type: .byte 0 ++gfx_failsafe: .byte 0 ++gfx_sysconfig_size: .byte gfx_sysconfig_end-gfx_sysconfig ++gfx_boot_drive: .byte 0 ++gfx_callback: .word 0 ++gfx_bootloader_seg: .word 0 ++gfx_reserved_1: .word 0 ++gfx_user_info_0: .long 0 ++gfx_user_info_1: .long 0 ++gfx_bios_mem_size: .long 0 ++gfx_xmem_0: .word 0x21 ; extended mem area 0 (start:size in MB; 12:4 bits) ++gfx_xmem_1: .word 0x41 ++gfx_xmem_2: .word 0 ++gfx_xmem_3: .word 0 ++gfx_file: .long 0 ++gfx_archive_start: .long 0 ++gfx_archive_end: .long 0 ++gfx_mem0_start: .long 0 ++gfx_mem0_end: .long 0 ++gfx_sysconfig_end: + +; menu entry descriptor +menu_entries equ 0 @@ -132,28 +124,30 @@ + mov byte gfx_ok,#0 + + ; no gfx if we use a serial line -+ seg fs -+ cmp byte par2_port+SSDIFF,#0 ++ cmp byte par2_port,#0 + jnz near gfx_init_90 + ++ mov gfx_bootloader_seg,cs ++ mov gfx_archive_end,edi ++ + ; define our memory area + ; gfx_mem _must_ be 16-byte aligned + mov dword gfx_mem,#0x10000 + add edi,gfx_mem + add edi,#15 ; add space for alignment -+ mov gfx_mem_free,edi -+ mov dword gfx_mem_max,#0x80000 ++ mov gfx_mem0_start,edi ++ mov dword gfx_mem0_end,#0x80000 + -+ sub edi,gfx_mem_max ++ sub edi,gfx_mem0_end + neg edi + cmp edi,#0x1000 ; we need some minimum space + jc near gfx_init_80 + + ; align 4 -+ mov eax,gfx_mem_free ++ mov eax,gfx_mem0_start + add eax,#3 + and eax,#~3 -+ mov gfx_mem_free,eax ++ mov gfx_mem0_start,eax + + call find_file + or eax,eax @@ -167,8 +161,10 @@ + pop edi + + sub edi,gfx_mem -+ add edi,gfx_mem_align -+ mov gfx_mem_file,edi ++ mov ecx,gfx_archive_start ++ add edi,ecx ++ mov gfx_file,edi ++ add gfx_archive_end,ecx + add eax,edi + shr eax,4 + mov gfx_bc_jt+2,ax @@ -236,18 +232,11 @@ + mov gfx_bc_password_done,ax + mov gfx_bc_password_done+2,es + -+ mov eax,gfx_mem_file -+ mov ebx,gfx_mem_free -+ mov ecx,gfx_mem_max -+ mov edi,gfx_mem_align -+ mov dx,cs -+ mov si,#gfx_sysconfig -+ -+ ; eax memory start -+ ; ebx free memory start -+ ; ecx memory end -+ ; dx boot loader code segment -+ ; si gfx_sysconfig offset ++ ; esi sysconfig data ++ .byte 0x66 ++ mov si,ds ; mov esi,ds ++ shl esi,4 ++ add esi,#gfx_sysconfig + + farcall(gfx_bc_init) + @@ -288,8 +277,7 @@ + call gfx_get_sysconfig + + mov ax,#0xffff -+ seg fs -+ xchg ax,par2_timeout+SSDIFF ++ xchg ax,par2_timeout + + ; map 0xffff -> 0 + add ax,#1 @@ -297,12 +285,16 @@ + sbb ax,#0 + +gfx_input_20: -+ mov di,#cmdline -+ mov cx,#CL_LENGTH ++ .byte 0x66 ++ mov di,ds ; mov edi,ds ++ shl edi,4 ++ add edi,#cmdline ++ mov ecx,#CL_LENGTH ++ movzx eax,ax + -+ ; di buffer ( 0 --> no buffer ) -+ ; cx buffer size -+ ; ax timeout value (0 --> no timeout) ++ ; edi buffer (0: no buffer) ++ ; ecx buffer size ++ ; eax timeout value (0: no timeout) + + farcall(gfx_bc_input) + @@ -318,8 +310,11 @@ + call find_boot_image + jnc gfx_input_90 + -+ mov si,#gfx_msg_wrong_image -+ mov di,#cmdline ++ .byte 0x66 ++ mov cx,ds ; mov ecx,ds ++ shl ecx,4 ++ lea esi,(ecx+gfx_msg_wrong_image) ++ lea edi,(ecx+cmdline) + + mov al,#0 + call gfx_infobox @@ -351,7 +346,7 @@ + add si,#id_size + loop gfx_setup_menu_20 +gfx_setup_menu_30: -+ mov si,#menu_desc ++ mov esi,#menu_desc + + xor ah,ah + mov (si+menu_entries),ax @@ -367,8 +362,10 @@ + mov (si+menu_arg_list+2),ds + mov word (si+menu_arg_size),#1 + -+ push ds -+ pop es ++ .byte 0x66 ++ mov ax,ds ; mov eax,ds ++ shl eax,4 ++ add esi,eax + + farcall(gfx_bc_menu_init) +gfx_setup_menu_90: @@ -382,8 +379,8 @@ + cmp byte gfx_ok,#0 + jz gfx_infobox_90 + farcall(gfx_bc_infobox_init) -+ xor di,di -+ xor ax,ax ++ xor edi,edi ++ xor eax,eax + farcall(gfx_bc_input) + farcall(gfx_bc_infobox_done) +gfx_infobox_90: @@ -453,23 +450,37 @@ + stc + jz gfx_password_90 + push di -+ mov si,#gfx_password_buf ; not used ++ .byte 0x66 ++ mov cx,ds ; mov ecx,ds ++ shl ecx,4 ++ lea esi,(ecx+gfx_password_buf) ; not used ++ movzx edi,di ++ add edi,ecx + farcall(gfx_bc_password_init) -+ mov di,#gfx_password_buf -+ mov cx,#32 -+ xor ax,ax ++ .byte 0x66 ++ mov di,ds ; mov edi,ds ++ shl edi,4 ++ add edi,#gfx_password_buf ++ mov ecx,#32 ++ xor eax,eax + farcall(gfx_bc_input) -+ mov si,#gfx_password_buf ++ .byte 0x66 ++ mov si,ds ; mov esi,ds ++ shl esi,4 ++ add esi,#gfx_password_buf + farcall(gfx_bc_password_done) + pop di + call check_password + jnc gfx_password_90 -+ mov si,#gfx_msg_wrong_password -+ xor di,di ++ .byte 0x66 ++ mov si,ds ; mov esi,ds ++ shl esi,4 ++ add esi,#gfx_msg_wrong_password ++ xor edi,edi + mov al,#0 + farcall(gfx_bc_infobox_init) -+ xor di,di -+ xor ax,ax ++ xor edi,edi ++ xor eax,eax + farcall(gfx_bc_input) + farcall(gfx_bc_infobox_done) + stc @@ -644,7 +655,7 @@ + ; note: edi must be properly aligned (2)! + +find_file_20: -+ mov ecx,gfx_mem_free ++ mov ecx,gfx_mem0_start + sub ecx,#26 + 12 ; min cpio header + gfx header + cmp edi,ecx + jae find_file_90 @@ -699,12 +710,12 @@ + seg es + cmp dword (bx),#0x0b2d97f00 ; header.magic_id + jnz magic_ok_90 -+ ; version 5 - 7 ++ ; version 8 + seg es -+ cmp byte (bx+4),#5 ; header.version ++ cmp byte (bx+4),#8 ; header.version + jb magic_ok_90 + seg es -+ cmp byte (bx+4),#7 ; header.version ++ cmp byte (bx+4),#8 ; header.version + ja magic_ok_90 + seg es + mov eax,(bx+8) @@ -718,13 +729,13 @@ +; +align_it: + push dword gfx_mem -+ pop dword gfx_mem_align ++ pop dword gfx_archive_start + neg al + and eax,#0x0f + jz align_it_90 -+ add gfx_mem_align,eax ++ add gfx_archive_start,eax + mov esi,gfx_mem -+ mov ebx,gfx_mem_free ++ mov ebx,gfx_mem0_start + sub ebx,esi + sub ebx,#0x0f + add esi,ebx @@ -775,6 +786,27 @@ #define MAX_MENU_TITLE 37 /* maximum MENU title length */ #define NEW_HDR_SIG "HdrS" /* setup header signature */ +--- Makefile ++++ Makefile +@@ -330,15 +330,15 @@ + first.s: first.S lilo.h version.h Makefile + $(CPP) $(PCONFIG) -DFIRST=0x199d1f05 -o first.s first.S + +-second.s: second.S read.S volume.S mapper.S biosdata.S shs3.S bdata.h lilo.h version.h \ ++second.s: second.S gfxlogo.S read.S volume.S mapper.S biosdata.S shs3.S bdata.h lilo.h version.h \ + graph.S menu.S strlen.S bitmap.S crt.S display4.S Makefile + $(CPP) $(PCONFIG) -DTEXT=0x8bd7820b second.S -o second.s + +-third.s: second.S read.S volume.S mapper.S biosdata.S shs3.S bdata.h lilo.h version.h \ ++third.s: second.S gfxlogo.S read.S volume.S mapper.S biosdata.S shs3.S bdata.h lilo.h version.h \ + graph.S menu.S strlen.S bitmap.S crt.S display4.S Makefile + $(CPP) $(PCONFIG) -DMENU=0x7920a7c2 second.S -o third.s + +-bitmap.s: second.S read.S volume.S mapper.S biosdata.S shs3.S bdata.h lilo.h version.h \ ++bitmap.s: second.S gfxlogo.S read.S volume.S mapper.S biosdata.S shs3.S bdata.h lilo.h version.h \ + graph.S menu.S strlen.S bitmap.S crt.S display4.S Makefile + $(CPP) $(PCONFIG) -DBITMAP=0xf54f8b9d second.S -o bitmap.s + --- second.S +++ second.S @@ -618,7 +618,8 @@ @@ -1021,7 +1053,7 @@ mov ah,cl test byte ptr (si),#0xff ! no value ? jz vgaerr ! yes -> error -@@ -3429,17 +3542,43 @@ +@@ -3429,17 +3542,47 @@ jz vgaput ! yes -> done cmp al,#32 je vgaput @@ -1060,8 +1092,12 @@ + mov bx,#msg_v ! display an error message + cmp byte gfx_ok,#0 + jz vgaerr_txt -+ lea si,(bx+1) ; skip initial NL -+ xor di,di ++ lea esi,(bx+1) ; skip initial NL ++ .byte 0x66 ++ mov di,ds ; mov edi,ds ++ shl edi,4 ++ add esi,edi ++ xor edi,edi + mov al,#0 + mov msg_v1,al ; drop final NL + call gfx_infobox @@ -1072,7 +1108,7 @@ call say /* ifdef HIGHMEM_MAX */ xor eax,eax -@@ -3583,8 +3722,10 @@ +@@ -3583,8 +3726,10 @@ xor dx,dx mov cx,#10 ! default radix is decimal cmp byte ptr (si),#0x39 @@ -1084,7 +1120,7 @@ jb s2lbad ! error if < '0' jne s2lnext inc si -@@ -3890,8 +4031,8 @@ +@@ -3890,8 +4035,8 @@ msg_v: .byte 10 .ascii "Valid vga values are ASK, NORMAL, EXTENDED or a " @@ -1095,25 +1131,3 @@ msg_pks:.byte 10 .ascii "Invalid hexadecimal number. - Ignoring remaining items." ---- gfxlogo.S -+++ gfxlogo.S -@@ -98,8 +98,7 @@ - mov byte gfx_ok,#0 - - ; no gfx if we use a serial line -- seg fs -- cmp byte par2_port+SSDIFF,#0 -+ cmp byte par2_port,#0 - jnz near gfx_init_90 - - ; define our memory area -@@ -254,8 +253,7 @@ - call gfx_get_sysconfig - - mov ax,#0xffff -- seg fs -- xchg ax,par2_timeout+SSDIFF -+ xchg ax,par2_timeout - - ; map 0xffff -> 0 - add ax,#1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@suse.de