# HG changeset patch # User Pascal Bellard # Date 1538227620 -7200 # Node ID bcdfc23ee041c1182feca9d9546134e6a1261c2d # Parent 9c21088bf85466a1c0bb8450cb9e3f74dee88dbf Add python-click python-itsdangerous & python-flask diff -r 9c21088bf854 -r bcdfc23ee041 linld/stuff/src/CRTL.ASM --- a/linld/stuff/src/CRTL.ASM Fri Sep 21 13:01:08 2018 +0200 +++ b/linld/stuff/src/CRTL.ASM Sat Sep 29 15:27:00 2018 +0200 @@ -16,13 +16,13 @@ segment _DATA byte public use16 'DATA' - global _heap_top:word - extrn _bss_end + global _heap_top + extrn _bss_end _heap_top dw _bss_end msg_hang db "High mem corrupted - not exiting to DOS" msg_crlf db 13,10,0 -vcpi_alloc_err db "vcpi " -msg_malloc db "malloc failure",0 +vcpi_alloc_err db "VCPI " +msg_malloc db "malloc error",0 ifdef EXTRA tazboot_cmd db "tazboot.cmd",0 endif @@ -159,7 +159,7 @@ lodsb sub al,[bx] jnz @@out - sub al,[bx] + sub al,al jnz @@lp @@out: cbw @@ -183,8 +183,8 @@ global malloc:near ; malloc(cx) malloc: ; keep CX, use AX,BX mov ax,[_heap_top] - mov bx,-1400h ; MIN_STACK=_1k+PAGE_SIZE - add bx,sp + mov bx,sp + add bh,-14h ; MIN_STACK=_1k+PAGE_SIZE sub bx,ax ; can't overflow cmp bx,cx mov bx,offset msg_malloc diff -r 9c21088bf854 -r bcdfc23ee041 linld/stuff/src/LINLD.CPP --- a/linld/stuff/src/LINLD.CPP Fri Sep 21 13:01:08 2018 +0200 +++ b/linld/stuff/src/LINLD.CPP Sat Sep 29 15:27:00 2018 +0200 @@ -29,8 +29,8 @@ "Use cl=@filename to get it from a file" #if 1 NL NL "Examples:" NL - "\tlinld -f -b 64m initrd=rootfs4.gz,rootfs3.gz,rootfs2.gz,rootfs1.gz \"cl=rw root=/dev/null video=-32\"" - NL NL "\tlinld image=memtest" + "\tLINLD -f -b 64m initrd=rootfs4.gz,rootfs3.gz,rootfs2.gz,rootfs1.gz \"cl=rw root=/dev/null video=-32\"" + NL NL "\tLINLD image=memtest" #endif ); } diff -r 9c21088bf854 -r bcdfc23ee041 linld/stuff/src/MEMTOP.ASM --- a/linld/stuff/src/MEMTOP.ASM Fri Sep 21 13:01:08 2018 +0200 +++ b/linld/stuff/src/MEMTOP.ASM Sat Sep 29 15:27:00 2018 +0200 @@ -11,18 +11,10 @@ p386 endif - group DGROUP _TEXT,_DATA,_BSS + group DGROUP _TEXT,_BSS assume cs:DGROUP,ds:DGROUP - segment _DATA byte public use16 'DATA' - - global _topmem:dword - -_topmem dd 10000000h ; max 256m - - ends _DATA - segment _BSS byte public use16 'BSS' saved15 dd ? @@ -161,6 +153,7 @@ ; we had trouble detecting memory size cmp dx,cx jb @@set + extrn _topmem:dword mov cx,[word _topmem+2] ; max 256m ? ; Kernel can have trouble with initrd at very high addr: ; limit mem top to 256m diff -r 9c21088bf854 -r bcdfc23ee041 linld/stuff/src/TAZBOOT.CPP --- a/linld/stuff/src/TAZBOOT.CPP Fri Sep 21 13:01:08 2018 +0200 +++ b/linld/stuff/src/TAZBOOT.CPP Sat Sep 29 15:27:00 2018 +0200 @@ -167,7 +167,7 @@ if (argc < 2) { try_default_args(); dousage: - die("Usage: tazboot [[@commands]|[-f][-b base_himem][kernel=] \ + die("Usage: tazboot [[@commands]|[-f][-b base_himem][kernel=] \ [initrd=[,...]] [bootfrom=] ...]\r\n\n\ Defaults: tazboot kernel=bzImage auto\r\n\n\ Examples for tazboot.cmd:\r\n\n\ diff -r 9c21088bf854 -r bcdfc23ee041 linld/stuff/src/_BEG.ASM --- a/linld/stuff/src/_BEG.ASM Fri Sep 21 13:01:08 2018 +0200 +++ b/linld/stuff/src/_BEG.ASM Sat Sep 29 15:27:00 2018 +0200 @@ -11,6 +11,32 @@ assume cs:DGROUP,ds:DGROUP segment _TEXT byte public use16 'CODE' + ends _TEXT + + segment _DATA byte public use16 'DATA' + global _data_start:byte + label _data_start byte + ifndef NO386 +msg_badcpu db "I need 386+ CPU in real mode or under VCPI manager" + endif + global _vcpi:byte +_vcpi db 0 +msg_badmapping db "VCPI: low 640k: need 1:1 mapping" + global _topmem:dword +_topmem dd 10000000h ; max 256m + + ends _DATA + + segment _BSS byte public use16 'BSS' + global _bss_start:byte + label _bss_start byte + ifdef EXTRA + global _cpu_features:dword +_cpu_features dd ? + endif + ends _BSS + + segment _TEXT byte public use16 'CODE' macro cpuid db 0fh,0A2h @@ -24,42 +50,27 @@ ; clear bss ;*************************************************************** mov si,offset _bss_start + mov bx, 0F000h ; cld ; cli clearbss: - mov [byte si],0 ; clear bss + heap + sp + mov [si],bl ; clear bss + heap + sp inc si jne clearbss - cld ;*************************************************************** ; check CPU ;*************************************************************** ; Check for oldies - ifndef EXTRA - push sp - pop ax - sub ax,sp - ifndef NO386 - mov bx,offset msg_badcpu - jnz no_vcpi ;it is a 86/186 not a 286+ - else - jnz endcpu ;it is a 86/186 not a 286+ - endif - else - pushf - mov bh, 0F0h push bx ; < 286 : flags[12..15] are forced 1 popf ; = 286 : flags[12..15] are forced 0 pushf ; > 286 : only flags[15] is forced 0 pop dx - popf - add dh,bh ; NS=386+, NC=286 - ifndef NO386 + add dh,bh ; NS=386+, S+NC=286, S+C=86/186 + ifndef NO386 mov bx,offset msg_badcpu js no_vcpi ;it is not a 386+ - else + else js endcpu ;it is not a 386+ - endif endif p386 ifdef EXTRA @@ -131,7 +142,6 @@ test ah,ah jnz no_vcpi is386vcpi: - inc [_vcpi] extrn prepare_vcpi:near call prepare_vcpi ; get_vcpi_interface() || die("VCPI: low 640k: need 1:1 mapping"); @@ -139,6 +149,7 @@ ;call _get_vcpi_interface mov bx,offset msg_badmapping jz endcpu + inc [byte bx+_vcpi-msg_badmapping] no_vcpi: p8086 ;;pop dx ;$ handle @@ -184,7 +195,7 @@ endif mov bx,2 ; argc * 2 argeos: - mov dl,1 ; look for a start of string + mov cx,1 ; look for a start of string mov [byte si-1],bh ; mark eos mov ah,20h ; space will be eos arglp: @@ -199,18 +210,17 @@ je isargstr cmp al,22h je isargstr - or dl,dl - je arglp ; not start of string + jcxz arglp ; not start of string dec si ;jmp newarg - db 0B9h ; mov cx,im opcode + db 0BAh ; mov dx,im opcode isargstr: mov ah,al ; expected eos newarg: mov [word bx+di],si ; argv[argc++] = si inc bx inc bx - dec dx + dec cx jmp arglp argdone: ;mov [word bx+di],0 ; argv[argc] = 0 @@ -255,26 +265,6 @@ int 21h ends _TEXT - segment _DATA byte public use16 'DATA' - global _data_start:byte - label _data_start byte - ifndef NO386 -msg_badcpu db "I need 386+ CPU in real mode or under VCPI manager" - endif - global _vcpi:byte -_vcpi db 0 -msg_badmapping db "VCPI: low 640k: need 1:1 mapping",0 - - ends _DATA - - segment _BSS byte public use16 'BSS' - global _bss_start:byte - label _bss_start byte - ifdef EXTRA - global _cpu_features:dword -_cpu_features dd ? - endif - ends _BSS end _text_start diff -r 9c21088bf854 -r bcdfc23ee041 python-click/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/python-click/receipt Sat Sep 29 15:27:00 2018 +0200 @@ -0,0 +1,27 @@ +# SliTaz package receipt. + +PACKAGE="python-click" +SOURCE="Click" +VERSION="7.0" +CATEGORY="development" +SHORT_DESC="Composable command line interface toolkit" +MAINTAINER="pascal.bellard@slitaz.org" +LICENSE="BSD" +WEB_SITE="https://pypi.org/project/click/" +TARBALL="$SOURCE-$VERSION.tar.gz" +WGET_URL="https://files.pythonhosted.org/packages/f8/5c/f60e9d8a1e77005f664b76ff8aeaee5bc05d0a91798afd7f53fc998dbc47/$TARBALL" + +DEPENDS="python" +BUILD_DEPENDS="python" + +# Rules to configure and make the package. +compile_rules() +{ + python setup.py install --prefix=/usr --root=$DESTDIR +} + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + cp -a $install/usr $fs/ +} diff -r 9c21088bf854 -r bcdfc23ee041 python-flask/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/python-flask/receipt Sat Sep 29 15:27:00 2018 +0200 @@ -0,0 +1,27 @@ +# SliTaz package receipt. + +PACKAGE="python-flask" +SOURCE="Flask" +VERSION="1.0.2" +CATEGORY="development" +SHORT_DESC="A simple framework for building complex web applications" +MAINTAINER="pascal.bellard@slitaz.org" +LICENSE="BSD" +WEB_SITE="http://flask.pocoo.org/" +TARBALL="$SOURCE-$VERSION.tar.gz" +WGET_URL="https://files.pythonhosted.org/packages/4b/12/c1fbf4971fda0e4de05565694c9f0c92646223cff53f15b6eb248a310a62/$TARBALL" + +DEPENDS="python-click python-itsdangerous" +BUILD_DEPENDS="python" + +# Rules to configure and make the package. +compile_rules() +{ + python setup.py install --prefix=/usr --root=$DESTDIR +} + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + cp -a $install/usr $fs/ +} diff -r 9c21088bf854 -r bcdfc23ee041 python-itsdangerous/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/python-itsdangerous/receipt Sat Sep 29 15:27:00 2018 +0200 @@ -0,0 +1,27 @@ +# SliTaz package receipt. + +PACKAGE="python-itsdangerous" +SOURCE="itsdangerous" +VERSION="0.24" +CATEGORY="development" +SHORT_DESC="Various helpers to pass trusted data to untrusted environments and back" +MAINTAINER="pascal.bellard@slitaz.org" +LICENSE="BSD" +WEB_SITE="https://pypi.org/project/click/" +TARBALL="$SOURCE-$VERSION.tar.gz" +WGET_URL="https://files.pythonhosted.org/packages/dc/b4/a60bcdba945c00f6d608d8975131ab3f25b22f2bcfe1dab221165194b2d4/$TARBALL" + +DEPENDS="python" +BUILD_DEPENDS="python" + +# Rules to configure and make the package. +compile_rules() +{ + python setup.py install --prefix=/usr --root=$DESTDIR +} + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + cp -a $install/usr $fs/ +}