SliTaz Repositories

     1.1 --- a/drbd-utils/receipt	Fri Jan 17 16:08:05 2020 +0100
     1.2 +++ b/drbd-utils/receipt	Sat Jan 18 11:42:51 2020 +0100
     1.3 @@ -27,9 +27,6 @@
     1.4  		--with-systemdunitdir=none	\
     1.5  		--with-prebuiltman		\
     1.6  		$CONFIGURE_ARGS
     1.7 -	cd	${src}/user/shared/ &&
     1.8 -	mv	drbd_buildtag.h.new	drbd_buildtag.h
     1.9 -	cd	$src
    1.10  	make &&
    1.11  	make DESTDIR=$DESTDIR install
    1.12  }

     2.1 --- a/linld/stuff/src/CRTL.ASM	Fri Jan 17 16:08:05 2020 +0100
     2.2 +++ b/linld/stuff/src/CRTL.ASM	Sat Jan 18 11:42:51 2020 +0100
     2.3 @@ -17,7 +17,7 @@
     2.4  
     2.5          segment _DATA byte public use16 'DATA'
     2.6  
     2.7 -msg_hang	db      "High mem corrupted: halt",0
     2.8 +msg_hang	db      "High mem corrupted",0
     2.9  vcpi_alloc_err	db	"VCPI"
    2.10  		global	overflow:byte
    2.11  overflow	db	"/"
    2.12 @@ -289,11 +289,19 @@
    2.13          global  @rewind$qi:near			; fd=ax
    2.14          proc    @rewind$qi near
    2.15  
    2.16 +		ifdef EXTRA
    2.17 +		xchg	ax,bx			; catch ISO image case
    2.18 +		mov	cx,-512			; curpos = 512
    2.19 +		stc				; see LOAD.CPP
    2.20 +		mov	bl,2
    2.21 +		jmp	lseekword
    2.22 +		endif
    2.23  rewind:						; rewind(ax)
    2.24  		mov	bl,0
    2.25  lseek0:						; lseek0(ax,bl=dir)
    2.26 -		xor	dx,dx
    2.27 -		xor	cx,cx
    2.28 +		xor	cx,cx			; clear C
    2.29 +lseekword:
    2.30 +		sbb	dx,dx
    2.31  lseekset:
    2.32  		xchg	ax,bx
    2.33  lseek:

     3.1 --- a/linld/stuff/src/LOAD.CPP	Fri Jan 17 16:08:05 2020 +0100
     3.2 +++ b/linld/stuff/src/LOAD.CPP	Sat Jan 18 11:42:51 2020 +0100
     3.3 @@ -121,6 +121,7 @@
     3.4  struct image_himem imgs[2];
     3.5  
     3.6  static const char kernel_file_error[] = "Can't use kernel file";
     3.7 +#define not_kernel  "Not a kernel"
     3.8  void load_kernel() {
     3.9  
    3.10      struct	image_himem *m = ±
    3.11 @@ -136,8 +137,7 @@
    3.12      open_image(m, kernel_name);
    3.13  
    3.14  do {
    3.15 - if (readrm(m, 0x200) == 0x200) {
    3.16 -
    3.17 +    readrm(m, 0x200);
    3.18      rewind(m->fd);
    3.19      if(kernelparams->setup_sects == 0) {
    3.20  #if 1
    3.21 @@ -151,15 +151,14 @@
    3.22      }
    3.23      if((kernelparams->setup_sects)>=(_32k/512) || // 0th sector not counted
    3.24  	 kernelparams->boot_flag != 0xAA55)
    3.25 -        die("Not a kernel");
    3.26 +        die(not_kernel);
    3.27      _rm_size=0x200*(kernelparams->setup_sects+1);
    3.28      m->size -= _rm_size;
    3.29      m->chunk_size -= _rm_size;
    3.30  
    3.31      // Read remaining rm loader
    3.32      if (readrm(m, _rm_size) == _rm_size) break;
    3.33 - }
    3.34 -        die(kernel_file_error);
    3.35 +    die(kernel_file_error);
    3.36  } while (0);
    3.37  
    3.38      // Tell rm loader some info

     4.1 --- a/python-pyweb/receipt	Fri Jan 17 16:08:05 2020 +0100
     4.2 +++ b/python-pyweb/receipt	Sat Jan 18 11:42:51 2020 +0100
     4.3 @@ -8,7 +8,7 @@
     4.4  MAINTAINER="pascal.bellard@slitaz.org"
     4.5  LICENSE="PublicDomain"
     4.6  TARBALL="$SOURCE-$VERSION.tar.gz"
     4.7 -WEB_SITE="http://webpy.org/"
     4.8 +WEB_SITE="https://webpy.org/"
     4.9  WGET_URL="${WEB_SITE}static/$TARBALL"
    4.10  
    4.11  DEPENDS="python"