wok-tiny rev 140

linux: disable setup packing...
author Pascal Bellard <pascal.bellard@slitaz.org>
date Wed Jul 04 20:33:53 2018 +0200 (2018-07-04)
parents 88e2011c8afe
children d22f6fcf51da
files linux/receipt linux/stuff/pack linux/stuff/unpacklz4.S
line diff
     1.1 --- a/linux/receipt	Sun Jul 01 10:56:29 2018 +0200
     1.2 +++ b/linux/receipt	Wed Jul 04 20:33:53 2018 +0200
     1.3 @@ -61,7 +61,6 @@
     1.4  	cp $stuff/linux-$VERSION-slitaz.config .config
     1.5  	yes '' | make ARCH=i386 HOSTCC=gcc-2 config
     1.6  	make ARCH=i386 CC=gcc-2 HOSTCC=gcc-2 -j 4 bzImage
     1.7 -	$stuff/pack bzImage
     1.8  	grep -q "CONFIG_MODULES=y" .config &&
     1.9  	make ARCH=i386 CC=gcc-2 HOSTCC=gcc-2 -j 4 modules &&
    1.10  	make ARCH=i386 INSTALL_MOD_PATH=$DESTDIR -j 1 modules_install || true
    1.11 @@ -78,6 +77,7 @@
    1.12  	cp -a $src/arch/i386/boot/bzImage $fs/boot/
    1.13  	dd if=$src/bootloader.bin of=$fs/boot/bzImage conv=notrunc
    1.14  	dd if=$src/cmdline.bin bs=1 seek=560 of=$fs/boot/bzImage conv=notrunc
    1.15 +	#( cd $src ; $stuff/pack $fs/boot/bzImage )
    1.16  	cp -a $src/System.map $fs/boot/
    1.17  	cp -a $src/.config $fs/boot/config
    1.18  	cp -a $src/config-busybox $fs/boot
     2.1 --- a/linux/stuff/pack	Sun Jul 01 10:56:29 2018 +0200
     2.2 +++ b/linux/stuff/pack	Wed Jul 04 20:33:53 2018 +0200
     2.3 @@ -23,6 +23,13 @@
     2.4  	echo $(od -j $(($1)) -N ${3:-2} -t u${3:-2} -An "$2")
     2.5  }
     2.6  
     2.7 +if [ ! -s "$1" ]; then
     2.8 +	cat << EOT
     2.9 +Usage: $0 bzImage [bootsector helper] [bootsector]
    2.10 +EOT
    2.11 +	exit 1
    2.12 +fi
    2.13 +
    2.14  if which lz4 > /dev/null ; then
    2.15  
    2.16  # boot + head param
     3.1 --- a/linux/stuff/unpacklz4.S	Sun Jul 01 10:56:29 2018 +0200
     3.2 +++ b/linux/stuff/unpacklz4.S	Wed Jul 04 20:33:53 2018 +0200
     3.3 @@ -19,9 +19,10 @@
     3.4  	pushw	%cx			// IP = 0
     3.5  	call	packed_moved
     3.6  next:
     3.7 -	popw	%di
     3.8 -	addw	%di, %si
     3.9 -	addw	$0x200+start-next, %di
    3.10 +	popw	%bx
    3.11 +	//leaw	packed-next(%bx,%si), %si
    3.12 +	.byte	0x8D,0x70,packed-next
    3.13 +	leaw	start-next(%bx), %di
    3.14  #if LZMA
    3.15  	call	unlzma
    3.16  #else
    3.17 @@ -35,8 +36,10 @@
    3.18  	lodsl				// get chunkSize
    3.19  	//cmpl	$ARCHIVE_MAGICNUMBER, %eax
    3.20  	//je	lz4main
    3.21 +	//lodsw
    3.22  	addw	%si, %ax
    3.23  	xchgw	%ax, %dx
    3.24 +	//lodsw
    3.25  	jmp	lz4chunk		// %cx = 0
    3.26  
    3.27  lz4len:					// get length in %cx
    3.28 @@ -68,8 +71,8 @@
    3.29  	lodsw				// get string offset
    3.30  	xchgw	%ax, %bx
    3.31  	call	lz4len			// get string length
    3.32 +	add	$4, %cx			// minimum match is 4
    3.33  #if BYTE_RLE
    3.34 -	add	$4, %cx			// minimum match is 4
    3.35  	decw	%bx
    3.36  	jz	lz4rle
    3.37  # if NEGATIVE_OFFSETS
    3.38 @@ -86,9 +89,6 @@
    3.39  	subw	%bx, %si
    3.40  #endif
    3.41  	rep movsb %ds:(%si), %es:(%di)	// copy string
    3.42 -#if !BYTE_RLE
    3.43 -	movsl %ds:(%si), %es:(%di)	// minimum match is 4
    3.44 -#endif
    3.45  	xchgw	%ax, %si
    3.46  
    3.47  lz4chunk:				// uncompress chunk
    3.48 @@ -101,10 +101,13 @@
    3.49  	jb	lz4string
    3.50  #endif
    3.51  done:
    3.52 -	movw	$0x20E, %di
    3.53 +	movw	$0x000E, %di
    3.54  	movsw				// version string
    3.55 -	movw	$0x1F1, %di
    3.56 -	movsb				// setup size
    3.57 +	//movw	%ds, %ax
    3.58 +	//decw	%ax
    3.59 +	//movw	%ax, %es
    3.60 +	//movw	$0x0001, %di
    3.61 +	//movsb				// setup size
    3.62  	retf
    3.63  
    3.64  #if LZMA