wok-6.x rev 19905
Up backup-manager (0.7.13)
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Mon Apr 10 09:25:19 2017 +0200 (2017-04-10) |
parents | 7caa211f4e55 |
children | 2bd6324d64bf |
files | backup-manager/receipt linld/stuff/src/COMMON.H linld/stuff/src/JUMP.ASM |
line diff
1.1 --- a/backup-manager/receipt Sun Apr 09 19:18:42 2017 +0000 1.2 +++ b/backup-manager/receipt Mon Apr 10 09:25:19 2017 +0200 1.3 @@ -1,15 +1,14 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="backup-manager" 1.7 -GITHASH="72a6561c454ed17aefa7869d2e82235a95d058c6" 1.8 -VERSION=${GITHASH:0:7} 1.9 +VERSION=0.7.13 1.10 CATEGORY="network" 1.11 SHORT_DESC="A really simple to use backup tool." 1.12 MAINTAINER="pascal.bellard@slitaz.org" 1.13 LICENSE="GPL2" 1.14 -TARBALL="$PACKAGE-$VERSION.zip" 1.15 +TARBALL="$PACKAGE-$VERSION.tar.gz" 1.16 WEB_SITE="https://github.com/sukria/Backup-Manager" 1.17 -WGET_URL="$WEB_SITE/archive/$GITHASH.zip" 1.18 +WGET_URL="$WEB_SITE/archive/$GITHASH.tar.gz" 1.19 CONFIG_FILES="/etc/backup-manager.conf" 1.20 TAGS="backup" 1.21
2.1 --- a/linld/stuff/src/COMMON.H Sun Apr 09 19:18:42 2017 +0000 2.2 +++ b/linld/stuff/src/COMMON.H Mon Apr 10 09:25:19 2017 +0200 2.3 @@ -78,7 +78,6 @@ 2.4 // External asm helpers 2.5 extern "C" void memcpy32(u32, u16,u32, u32); 2.6 extern "C" void rmcpy(); 2.7 -extern "C" void set_sregs_jump_seg_ofs(); 2.8 extern "C" void xmm_alloc(struct image_himem *m); 2.9 extern u32 topmem; 2.10 extern "C" u32 memtopz();
3.1 --- a/linld/stuff/src/JUMP.ASM Sun Apr 09 19:18:42 2017 +0000 3.2 +++ b/linld/stuff/src/JUMP.ASM Mon Apr 10 09:25:19 2017 +0200 3.3 @@ -29,16 +29,21 @@ 3.4 3.5 segment _TEXT byte public use16 'CODE' 3.6 3.7 +;*************************************************************** 3.8 +;void boot_kernel(); 3.9 +;****** Never returns 3.10 +;*************************************************************** 3.11 global _boot_kernel:near 3.12 -_boot_kernel: 3.13 + proc _boot_kernel near 3.14 + 3.15 ; Shrink stack: we won't need much of it now and have no malloc() plans 3.16 extrn _heap_top:word 3.17 mov ax,[_heap_top] 3.18 inc ah 3.19 cmp ax,sp 3.20 - ja samesp 3.21 + ja @@samesp 3.22 xchg ax,sp 3.23 -samesp: 3.24 +@@samesp: 3.25 ifdef NO386 3.26 extrn _topseg:near 3.27 call near _topseg 3.28 @@ -56,21 +61,12 @@ 3.29 mov dx,cs 3.30 add ax,dx 3.31 cmp ax,bx 3.32 - jb nooverflow 3.33 + jb @@nooverflow 3.34 ; Oops! We can stomp on our toes... better stop now 3.35 mov bx,offset overflow 3.36 extrn die:near 3.37 jmp near die 3.38 -nooverflow: 3.39 -;*************************************************************** 3.40 -;void set_sregs_jump_seg_ofs(u32 csip); 3.41 -;****** Never returns 3.42 -;*************************************************************** 3.43 - global _set_sregs_jump_seg_ofs:near 3.44 - proc _set_sregs_jump_seg_ofs near 3.45 - 3.46 - extrn dos_shutdown:near 3.47 - 3.48 +@@nooverflow: 3.49 cli ; we start doing destructive things to DOS 3.50 push es 3.51 pop ss 3.52 @@ -94,13 +90,12 @@ 3.53 rep 3.54 movsb 3.55 cmp al,cl ; load high ? 3.56 - jne isbzimage 3.57 + jne @@isbzimage 3.58 ifdef NO386 3.59 add bh,9 3.60 push bx ; topseg()+0x0900 3.61 else 3.62 - push 9900h ; 4096 bytes for cmdline 3.63 - ;push 9820h ; 512 bytes for cmdline 3.64 + push 9800h+(4096/16) ; 4096 bytes for cmdline 3.65 endif 3.66 ; finish loading 3.67 extrn @last_ditch$qv:near 3.68 @@ -113,17 +108,16 @@ 3.69 xor si,si ; A000 -9000 -0800(>movedend) 3.70 xor di,di ; set ZF 3.71 mov cx,offset movedend 3.72 - global _bss_end:byte 3.73 - ;mov cx,offset _bss_end 3.74 rep 3.75 movsb 3.76 push es 3.77 - call near doretf ; mov cs,es 3.78 + call near @@doretf ; mov cs,es 3.79 push ss 3.80 pop es 3.81 push cs 3.82 pop ds 3.83 push ax 3.84 + extrn dos_shutdown:near 3.85 call near dos_shutdown 3.86 ;in al,70h 3.87 ;or al,80h ; disable NMI 3.88 @@ -133,10 +127,10 @@ 3.89 mov ax,8 3.90 cwd ; clear dx 3.91 cmp bx,ax 3.92 - ja bufhigh 3.93 + ja @@bufhigh 3.94 sub ax,bx 3.95 inc ax 3.96 -bufhigh: 3.97 +@@bufhigh: 3.98 push ax 3.99 push dx ; size=up to 512k 3.100 push bx ; src ofs= pm.fallback 3.101 @@ -161,10 +155,10 @@ 3.102 cmp [dword 1E6h],'SKLE' 3.103 else 3.104 cmp [word 1E6h],'LE' 3.105 - jne notelks 3.106 + jne @@notelks 3.107 cmp [word 1E8h],'SK' 3.108 endif 3.109 - jne notelks 3.110 + jne @@notelks 3.111 ifdef NO386 3.112 mov cx,120h 3.113 push cx 3.114 @@ -183,10 +177,9 @@ 3.115 push es 3.116 pop ss 3.117 push cx 3.118 -notelks: 3.119 +@@notelks: 3.120 endif 3.121 - 3.122 -isbzimage: 3.123 +@@isbzimage: 3.124 push ss 3.125 pop ds 3.126 ;push ss 3.127 @@ -199,12 +192,11 @@ 3.128 endif 3.129 assume nothing 3.130 assume cs:DGROUP 3.131 - 3.132 -doretf: 3.133 +@@doretf: 3.134 retf 3.135 3.136 movedend: 3.137 - endp _set_sregs_jump_seg_ofs 3.138 + endp _boot_kernel 3.139 3.140 ends _TEXT 3.141