wok rev 24166

Up tazlito (533)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Dec 28 16:32:02 2021 +0000 (2021-12-28)
parents 82053bab32c1
children e6fa7b2baedd
files cookutils/receipt cookutils/stuff/avoid-gawk-warning.patch cookutils/stuff/avoid-hard-link-exist-error.patch linld/stuff/src/CRTL.ASM tazlito/receipt
line diff
     1.1 --- a/cookutils/receipt	Tue Dec 28 08:42:55 2021 +0100
     1.2 +++ b/cookutils/receipt	Tue Dec 28 16:32:02 2021 +0000
     1.3 @@ -32,6 +32,8 @@
     1.4  	patch -p1 -i $stuff/pkgdb-no-parallel.patch
     1.5  	patch -p1 -i $stuff/cook-newest.patch
     1.6  	patch -p1 -i $stuff/wanted-version.patch
     1.7 +	patch -p1 -i $stuff/avoid-gawk-warning.patch
     1.8 +	patch -p1 -i $stuff/avoid-hard-link-exist-error.patch
     1.9  	sed -i 's|preinit core-4in1|preinit core-4in1 core-5in1|' cookiso
    1.10  	mkdir -p $DESTDIR/usr/bin $DESTDIR/etc/slitaz
    1.11  	make DESTDIR=$DESTDIR install
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/cookutils/stuff/avoid-gawk-warning.patch	Tue Dec 28 16:32:02 2021 +0000
     2.3 @@ -0,0 +1,22 @@
     2.4 +gawk raise a warning with some scripts.
     2.5 +
     2.6 +--- a/modules/compressor
     2.7 ++++ b/modules/compressor
     2.8 +@@ -376,7 +376,7 @@
     2.9 + 		echo >> "$tmpfile"
    2.10 + 
    2.11 + 		# get Plural-Forms
    2.12 +-		awk '
    2.13 ++		busybox awk '
    2.14 + 		BEGIN { skip = ""; }
    2.15 + 		{
    2.16 + 			if (! skip) {
    2.17 +@@ -394,7 +394,7 @@
    2.18 + 		fi
    2.19 + 
    2.20 + 		# main
    2.21 +-		awk -v pf="$(cat "$tmpfile.pf")" '
    2.22 ++		busybox awk -v pf="$(cat "$tmpfile.pf")" '
    2.23 + 		function clean() {
    2.24 + 			mode = msgctxt = msgid = msgid_plural = msgstr = msgstr0 = msgstr1 = msgstr2 = msgstr3 = msgstr4 = msgstr5 = "";
    2.25 + 		}
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/cookutils/stuff/avoid-hard-link-exist-error.patch	Tue Dec 28 16:32:02 2021 +0000
     3.3 @@ -0,0 +1,19 @@
     3.4 +A void error "cp: cannot create hard link 'file1' to 'file2': file exists"
     3.5 +
     3.6 +--- a/cook
     3.7 ++++ b/cook
     3.8 +@@ -423,11 +423,9 @@
     3.9 + # A bit smarter function than the classic `cp` command
    3.10 + 
    3.11 + copy() {
    3.12 +-	if [ "$(stat -c %h -- "$1")" -gt 1 ]; then
    3.13 +-		cp -al "$1" "$2"	# copy hardlinks
    3.14 +-	else
    3.15 +-		cp -a  "$1" "$2"	# copy generic files
    3.16 +-	fi
    3.17 ++	[ "$(stat -c %h -- "$1")" -gt 1 ] &&
    3.18 ++	cp -al "$1" "$2" 2>/dev/null ||	# copy hardlinks
    3.19 ++	cp -a  "$1" "$2"		# copy generic files
    3.20 + }
    3.21 + 
    3.22 + 
     4.1 --- a/linld/stuff/src/CRTL.ASM	Tue Dec 28 08:42:55 2021 +0100
     4.2 +++ b/linld/stuff/src/CRTL.ASM	Tue Dec 28 16:32:02 2021 +0000
     4.3 @@ -963,8 +963,8 @@
     4.4  		cmp	al,'/'			; 2f
     4.5  		jne	@@notopt
     4.6  		mov	al,'-'
     4.7 +		;endif
     4.8  @@notopt:
     4.9 -		;endif
    4.10  		inc	bx			; keywords++
    4.11  		cmp	al,[bx]
    4.12  		je	@@match
    4.13 @@ -1053,7 +1053,7 @@
    4.14  @@setnum2:
    4.15  		xchg	ax,si
    4.16  @@done:
    4.17 -		or	[di],si
    4.18 +		mov	[di],si
    4.19  		xchg	ax,di
    4.20  @@nokeyword:
    4.21  		pop	di si bx
     5.1 --- a/tazlito/receipt	Tue Dec 28 08:42:55 2021 +0100
     5.2 +++ b/tazlito/receipt	Tue Dec 28 16:32:02 2021 +0000
     5.3 @@ -1,7 +1,7 @@
     5.4  # SliTaz package receipt.
     5.5  
     5.6  PACKAGE="tazlito"
     5.7 -VERSION="531"
     5.8 +VERSION="533"
     5.9  CATEGORY="base-system"
    5.10  SHORT_DESC="SliTaz Live Tool."
    5.11  MAINTAINER="pascal.bellard@slitaz.org"
    5.12 @@ -26,6 +26,7 @@
    5.13  # Rules to configure and make the package.
    5.14  compile_rules()
    5.15  {
    5.16 +cp $stuff/* applications
    5.17  	sed -i "s/^VERSION=.*/VERSION=$VERSION/" tazlito
    5.18  	make DESTDIR=$DESTDIR VERSION=$VERSION install
    5.19  }
    5.20 @@ -37,7 +38,7 @@
    5.21  	cp -a $install/* $fs
    5.22  	chown -R root.root $fs
    5.23  	chmod 755 $fs/usr/bin/tazlito*
    5.24 -	sed 's|.*boot/grub|#&|' $fs/usr/bin/tazlito*	# keep splash.xpm.gz for tazinst
    5.25 +	sed 's|.*boot/grub|#&|' -i $fs/usr/bin/tazlito*	# keep splash.xpm.gz for tazinst
    5.26  	# Declare /etc/tazlito/distro-packages.list & /etc/tazlito/tazlito.conf
    5.27  	touch $fs/etc/tazlito/tazlito.conf
    5.28  	touch $fs/etc/tazlito/distro-packages.list