# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1640709122 0
# Node ID 7d48eab9ceeb0af90e143148eecceb06eb55bd08
# Parent  82053bab32c15ce58773f421d7b937a814f175d3
Up tazlito (533)

diff -r 82053bab32c1 -r 7d48eab9ceeb cookutils/receipt
--- a/cookutils/receipt	Tue Dec 28 08:42:55 2021 +0100
+++ b/cookutils/receipt	Tue Dec 28 16:32:02 2021 +0000
@@ -32,6 +32,8 @@
 	patch -p1 -i $stuff/pkgdb-no-parallel.patch
 	patch -p1 -i $stuff/cook-newest.patch
 	patch -p1 -i $stuff/wanted-version.patch
+	patch -p1 -i $stuff/avoid-gawk-warning.patch
+	patch -p1 -i $stuff/avoid-hard-link-exist-error.patch
 	sed -i 's|preinit core-4in1|preinit core-4in1 core-5in1|' cookiso
 	mkdir -p $DESTDIR/usr/bin $DESTDIR/etc/slitaz
 	make DESTDIR=$DESTDIR install
diff -r 82053bab32c1 -r 7d48eab9ceeb cookutils/stuff/avoid-gawk-warning.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cookutils/stuff/avoid-gawk-warning.patch	Tue Dec 28 16:32:02 2021 +0000
@@ -0,0 +1,22 @@
+gawk raise a warning with some scripts.
+
+--- a/modules/compressor
++++ b/modules/compressor
+@@ -376,7 +376,7 @@
+ 		echo >> "$tmpfile"
+ 
+ 		# get Plural-Forms
+-		awk '
++		busybox awk '
+ 		BEGIN { skip = ""; }
+ 		{
+ 			if (! skip) {
+@@ -394,7 +394,7 @@
+ 		fi
+ 
+ 		# main
+-		awk -v pf="$(cat "$tmpfile.pf")" '
++		busybox awk -v pf="$(cat "$tmpfile.pf")" '
+ 		function clean() {
+ 			mode = msgctxt = msgid = msgid_plural = msgstr = msgstr0 = msgstr1 = msgstr2 = msgstr3 = msgstr4 = msgstr5 = "";
+ 		}
diff -r 82053bab32c1 -r 7d48eab9ceeb cookutils/stuff/avoid-hard-link-exist-error.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cookutils/stuff/avoid-hard-link-exist-error.patch	Tue Dec 28 16:32:02 2021 +0000
@@ -0,0 +1,19 @@
+A void error "cp: cannot create hard link 'file1' to 'file2': file exists"
+
+--- a/cook
++++ b/cook
+@@ -423,11 +423,9 @@
+ # A bit smarter function than the classic `cp` command
+ 
+ copy() {
+-	if [ "$(stat -c %h -- "$1")" -gt 1 ]; then
+-		cp -al "$1" "$2"	# copy hardlinks
+-	else
+-		cp -a  "$1" "$2"	# copy generic files
+-	fi
++	[ "$(stat -c %h -- "$1")" -gt 1 ] &&
++	cp -al "$1" "$2" 2>/dev/null ||	# copy hardlinks
++	cp -a  "$1" "$2"		# copy generic files
+ }
+ 
+ 
diff -r 82053bab32c1 -r 7d48eab9ceeb linld/stuff/src/CRTL.ASM
--- a/linld/stuff/src/CRTL.ASM	Tue Dec 28 08:42:55 2021 +0100
+++ b/linld/stuff/src/CRTL.ASM	Tue Dec 28 16:32:02 2021 +0000
@@ -963,8 +963,8 @@
 		cmp	al,'/'			; 2f
 		jne	@@notopt
 		mov	al,'-'
+		;endif
 @@notopt:
-		;endif
 		inc	bx			; keywords++
 		cmp	al,[bx]
 		je	@@match
@@ -1053,7 +1053,7 @@
 @@setnum2:
 		xchg	ax,si
 @@done:
-		or	[di],si
+		mov	[di],si
 		xchg	ax,di
 @@nokeyword:
 		pop	di si bx
diff -r 82053bab32c1 -r 7d48eab9ceeb tazlito/receipt
--- a/tazlito/receipt	Tue Dec 28 08:42:55 2021 +0100
+++ b/tazlito/receipt	Tue Dec 28 16:32:02 2021 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="tazlito"
-VERSION="531"
+VERSION="533"
 CATEGORY="base-system"
 SHORT_DESC="SliTaz Live Tool."
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -26,6 +26,7 @@
 # Rules to configure and make the package.
 compile_rules()
 {
+cp $stuff/* applications
 	sed -i "s/^VERSION=.*/VERSION=$VERSION/" tazlito
 	make DESTDIR=$DESTDIR VERSION=$VERSION install
 }
@@ -37,7 +38,7 @@
 	cp -a $install/* $fs
 	chown -R root.root $fs
 	chmod 755 $fs/usr/bin/tazlito*
-	sed 's|.*boot/grub|#&|' $fs/usr/bin/tazlito*	# keep splash.xpm.gz for tazinst
+	sed 's|.*boot/grub|#&|' -i $fs/usr/bin/tazlito*	# keep splash.xpm.gz for tazinst
 	# Declare /etc/tazlito/distro-packages.list & /etc/tazlito/tazlito.conf
 	touch $fs/etc/tazlito/tazlito.conf
 	touch $fs/etc/tazlito/distro-packages.list