# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1519668196 -3600
# Node ID ccdba9b27403907015dc6408e63f449dcc137e16
# Parent  1cc8dfef291729a17bc8ea58508891e0e9d26070
memtest, ipxe: update bootloader.S

diff -r 1cc8dfef2917 -r ccdba9b27403 ipxe/stuff/bootloader.S
--- a/ipxe/stuff/bootloader.S	Mon Feb 26 17:40:15 2018 +0100
+++ b/ipxe/stuff/bootloader.S	Mon Feb 26 19:03:16 2018 +0100
@@ -167,11 +167,10 @@
 	ldsw	0x78(%bx), %si		# %ds:%bx+0x78 is parameter table address
 	pushw	%es
 	pushw	%di
-	pushw	%ds
 	movb	$6, %cl			# copy 12 bytes
 	rep				# don't worry about cld
 	movsw				# already done above
-	popw	%ds
+	movw	%cx, %ds		# %ds = 0
 #ifdef ONLY8086
 	popw	0x78(%bx)		# update parameter table address
 	popw	0x78+2(%bx)
diff -r 1cc8dfef2917 -r ccdba9b27403 lz4/receipt
--- a/lz4/receipt	Mon Feb 26 17:40:15 2018 +0100
+++ b/lz4/receipt	Mon Feb 26 19:03:16 2018 +0100
@@ -23,8 +23,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/bin
-	cp -a $install/usr/bin/lz4 $fs/usr/bin
-	cp -a $install/usr/bin/lz4cat $fs/usr/bin
-	cp -a $install/usr/bin/unlz4 $fs/usr/bin
+	mkdir -p $fs/usr
+	cp -a $install/usr/bin $fs/usr
 }
diff -r 1cc8dfef2917 -r ccdba9b27403 memtest/stuff/bootloader.S
--- a/memtest/stuff/bootloader.S	Mon Feb 26 17:40:15 2018 +0100
+++ b/memtest/stuff/bootloader.S	Mon Feb 26 19:03:16 2018 +0100
@@ -167,11 +167,10 @@
 	ldsw	0x78(%bx), %si		# %ds:%bx+0x78 is parameter table address
 	pushw	%es
 	pushw	%di
-	pushw	%ds
 	movb	$6, %cl			# copy 12 bytes
 	rep				# don't worry about cld
 	movsw				# already done above
-	popw	%ds
+	movw	%cx, %ds		# %ds = 0
 #ifdef ONLY8086
 	popw	0x78(%bx)		# update parameter table address
 	popw	0x78+2(%bx)