# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1530729233 -7200
# Node ID d71bd8881bcd20bf8440c04f63d6a28eac78ba5c
# Parent  88e2011c8afe39d3699442d54f5396b6f5f7a080
linux: disable setup packing...

diff -r 88e2011c8afe -r d71bd8881bcd linux/receipt
--- a/linux/receipt	Sun Jul 01 10:56:29 2018 +0200
+++ b/linux/receipt	Wed Jul 04 20:33:53 2018 +0200
@@ -61,7 +61,6 @@
 	cp $stuff/linux-$VERSION-slitaz.config .config
 	yes '' | make ARCH=i386 HOSTCC=gcc-2 config
 	make ARCH=i386 CC=gcc-2 HOSTCC=gcc-2 -j 4 bzImage
-	$stuff/pack bzImage
 	grep -q "CONFIG_MODULES=y" .config &&
 	make ARCH=i386 CC=gcc-2 HOSTCC=gcc-2 -j 4 modules &&
 	make ARCH=i386 INSTALL_MOD_PATH=$DESTDIR -j 1 modules_install || true
@@ -78,6 +77,7 @@
 	cp -a $src/arch/i386/boot/bzImage $fs/boot/
 	dd if=$src/bootloader.bin of=$fs/boot/bzImage conv=notrunc
 	dd if=$src/cmdline.bin bs=1 seek=560 of=$fs/boot/bzImage conv=notrunc
+	#( cd $src ; $stuff/pack $fs/boot/bzImage )
 	cp -a $src/System.map $fs/boot/
 	cp -a $src/.config $fs/boot/config
 	cp -a $src/config-busybox $fs/boot
diff -r 88e2011c8afe -r d71bd8881bcd linux/stuff/pack
--- a/linux/stuff/pack	Sun Jul 01 10:56:29 2018 +0200
+++ b/linux/stuff/pack	Wed Jul 04 20:33:53 2018 +0200
@@ -23,6 +23,13 @@
 	echo $(od -j $(($1)) -N ${3:-2} -t u${3:-2} -An "$2")
 }
 
+if [ ! -s "$1" ]; then
+	cat << EOT
+Usage: $0 bzImage [bootsector helper] [bootsector]
+EOT
+	exit 1
+fi
+
 if which lz4 > /dev/null ; then
 
 # boot + head param
diff -r 88e2011c8afe -r d71bd8881bcd linux/stuff/unpacklz4.S
--- a/linux/stuff/unpacklz4.S	Sun Jul 01 10:56:29 2018 +0200
+++ b/linux/stuff/unpacklz4.S	Wed Jul 04 20:33:53 2018 +0200
@@ -19,9 +19,10 @@
 	pushw	%cx			// IP = 0
 	call	packed_moved
 next:
-	popw	%di
-	addw	%di, %si
-	addw	$0x200+start-next, %di
+	popw	%bx
+	//leaw	packed-next(%bx,%si), %si
+	.byte	0x8D,0x70,packed-next
+	leaw	start-next(%bx), %di
 #if LZMA
 	call	unlzma
 #else
@@ -35,8 +36,10 @@
 	lodsl				// get chunkSize
 	//cmpl	$ARCHIVE_MAGICNUMBER, %eax
 	//je	lz4main
+	//lodsw
 	addw	%si, %ax
 	xchgw	%ax, %dx
+	//lodsw
 	jmp	lz4chunk		// %cx = 0
 
 lz4len:					// get length in %cx
@@ -68,8 +71,8 @@
 	lodsw				// get string offset
 	xchgw	%ax, %bx
 	call	lz4len			// get string length
+	add	$4, %cx			// minimum match is 4
 #if BYTE_RLE
-	add	$4, %cx			// minimum match is 4
 	decw	%bx
 	jz	lz4rle
 # if NEGATIVE_OFFSETS
@@ -86,9 +89,6 @@
 	subw	%bx, %si
 #endif
 	rep movsb %ds:(%si), %es:(%di)	// copy string
-#if !BYTE_RLE
-	movsl %ds:(%si), %es:(%di)	// minimum match is 4
-#endif
 	xchgw	%ax, %si
 
 lz4chunk:				// uncompress chunk
@@ -101,10 +101,13 @@
 	jb	lz4string
 #endif
 done:
-	movw	$0x20E, %di
+	movw	$0x000E, %di
 	movsw				// version string
-	movw	$0x1F1, %di
-	movsb				// setup size
+	//movw	%ds, %ax
+	//decw	%ax
+	//movw	%ax, %es
+	//movw	$0x0001, %di
+	//movsb				// setup size
 	retf
 
 #if LZMA