wok-6.x rev 9693

coreutils: clean up
author Christopher Rogers <slaxemulator@gmail.com>
date Sat May 07 11:36:11 2011 +0000 (2011-05-07)
parents 0ee75cad7429
children 1011f515c592
files coreutils-command/receipt coreutils-conditions/receipt coreutils-context-system/receipt coreutils-context-user/receipt coreutils-context-working/receipt coreutils-directory/receipt coreutils-disk/receipt coreutils-file-attributes/receipt coreutils-file-format/receipt coreutils-file-output-part/receipt coreutils-file-sort/receipt coreutils-file-special/receipt coreutils-file-summarize/receipt coreutils-line/receipt coreutils-numeric/receipt coreutils-operations/receipt coreutils-path/receipt coreutils-print/receipt coreutils-redirection/receipt coreutils/receipt
line diff
     1.1 --- a/coreutils-command/receipt	Sat May 07 11:24:42 2011 +0000
     1.2 +++ b/coreutils-command/receipt	Sat May 07 11:36:11 2011 +0000
     1.3 @@ -48,11 +48,11 @@
     1.4  
     1.5  post_remove()
     1.6  {
     1.7 -	ln -s /bin/busybox /bin/nice
     1.8 -	ln -s /bin/busybox /bin/kill
     1.9 -	ln -s /bin/busybox /bin/sleep
    1.10 -	ln -s /bin/busybox /usr/bin/env
    1.11 -	ln -s /bin/busybox /usr/bin/nohup
    1.12 -	ln -s /bin/busybox /usr/bin/timeout
    1.13 -	ln -s /bin/busybox /usr/sbin/chroot
    1.14 +	ln -s /bin/busybox $1/bin/nice
    1.15 +	ln -s /bin/busybox $1/bin/kill
    1.16 +	ln -s /bin/busybox $1/bin/sleep
    1.17 +	ln -s /bin/busybox $1/usr/bin/env
    1.18 +	ln -s /bin/busybox $1/usr/bin/nohup
    1.19 +	ln -s /bin/busybox $1/usr/bin/timeout
    1.20 +	ln -s /bin/busybox $1/usr/sbin/chroot
    1.21  }
     2.1 --- a/coreutils-conditions/receipt	Sat May 07 11:24:42 2011 +0000
     2.2 +++ b/coreutils-conditions/receipt	Sat May 07 11:36:11 2011 +0000
     2.3 @@ -43,9 +43,9 @@
     2.4  
     2.5  post_remove()
     2.6  {
     2.7 -	ln -s /bin/busybox /bin/false
     2.8 -	ln -s /bin/busybox /bin/true
     2.9 -	ln -s /bin/busybox /usr/bin/test
    2.10 -	ln -s /bin/busybox /usr/bin/[
    2.11 -	ln -s /bin/busybox /usr/bin/expr
    2.12 +	ln -s /bin/busybox $1/bin/false
    2.13 +	ln -s /bin/busybox $1/bin/true
    2.14 +	ln -s /bin/busybox $1/usr/bin/test
    2.15 +	ln -s /bin/busybox $1/usr/bin/[
    2.16 +	ln -s /bin/busybox $1/usr/bin/expr
    2.17  }
     3.1 --- a/coreutils-context-system/receipt	Sat May 07 11:24:42 2011 +0000
     3.2 +++ b/coreutils-context-system/receipt	Sat May 07 11:36:11 2011 +0000
     3.3 @@ -44,8 +44,8 @@
     3.4  
     3.5  post_remove()
     3.6  {
     3.7 -	ln -s /bin/busybox /bin/date
     3.8 -	ln -s /bin/busybox /bin/uname
     3.9 -	ln -s /bin/busybox /usr/bin/hostid
    3.10 -	ln -s /bin/busybox /usr/bin/uptime
    3.11 +	ln -s /bin/busybox $1/bin/date
    3.12 +	ln -s /bin/busybox $1/bin/uname
    3.13 +	ln -s /bin/busybox $1/usr/bin/hostid
    3.14 +	ln -s /bin/busybox $1/usr/bin/uptime
    3.15  }
     4.1 --- a/coreutils-context-user/receipt	Sat May 07 11:24:42 2011 +0000
     4.2 +++ b/coreutils-context-user/receipt	Sat May 07 11:36:11 2011 +0000
     4.3 @@ -45,8 +45,8 @@
     4.4  
     4.5  post_remove()
     4.6  {
     4.7 -	ln -s /bin/busybox /bin/id
     4.8 -	ln -s /bin/busybox /usr/bin/logname
     4.9 -	ln -s /bin/busybox /usr/bin/whoami
    4.10 -	ln -s /bin/busybox /usr/bin/who
    4.11 +	ln -s /bin/busybox $1/bin/id
    4.12 +	ln -s /bin/busybox $1/usr/bin/logname
    4.13 +	ln -s /bin/busybox $1/usr/bin/whoami
    4.14 +	ln -s /bin/busybox $1/usr/bin/who
    4.15  }
     5.1 --- a/coreutils-context-working/receipt	Sat May 07 11:24:42 2011 +0000
     5.2 +++ b/coreutils-context-working/receipt	Sat May 07 11:36:11 2011 +0000
     5.3 @@ -42,8 +42,8 @@
     5.4  
     5.5  post_remove()
     5.6  {
     5.7 -	ln -s /bin/busybox /bin/pwd
     5.8 -	ln -s /bin/busybox /bin/stty
     5.9 -	ln -s /bin/busybox /bin/printenv
    5.10 -	ln -s /bin/busybox /usr/bin/tty
    5.11 +	ln -s /bin/busybox $1/bin/pwd
    5.12 +	ln -s /bin/busybox $1/bin/stty
    5.13 +	ln -s /bin/busybox $1/bin/printenv
    5.14 +	ln -s /bin/busybox $1/usr/bin/tty
    5.15  }
     6.1 --- a/coreutils-directory/receipt	Sat May 07 11:24:42 2011 +0000
     6.2 +++ b/coreutils-directory/receipt	Sat May 07 11:36:11 2011 +0000
     6.3 @@ -41,8 +41,8 @@
     6.4  
     6.5  post_remove()
     6.6  {
     6.7 -	ln -s /bin/busybox /bin/ls
     6.8 -	ln -s /bin/busybox /usr/bin/dir
     6.9 -	ln -s /bin/busybox /usr/bin/vdir
    6.10 -	ln -s /bin/busybox /usr/bin/dircolors
    6.11 +	ln -s /bin/busybox $1/bin/ls
    6.12 +	ln -s /bin/busybox $1/usr/bin/dir
    6.13 +	ln -s /bin/busybox $1/usr/bin/vdir
    6.14 +	ln -s /bin/busybox $1/usr/bin/dircolors
    6.15  }
     7.1 --- a/coreutils-disk/receipt	Sat May 07 11:24:42 2011 +0000
     7.2 +++ b/coreutils-disk/receipt	Sat May 07 11:36:11 2011 +0000
     7.3 @@ -43,8 +43,8 @@
     7.4  
     7.5  post_remove()
     7.6  {
     7.7 -	ln -s /bin/busybox /bin/df
     7.8 -	ln -s /bin/busybox /bin/stat
     7.9 -	ln -s /bin/busybox /bin/sync
    7.10 -	ln -s /bin/busybox /usr/bin/du
    7.11 +	ln -s /bin/busybox $1/bin/df
    7.12 +	ln -s /bin/busybox $1/bin/stat
    7.13 +	ln -s /bin/busybox $1/bin/sync
    7.14 +	ln -s /bin/busybox $1/usr/bin/du
    7.15  }
     8.1 --- a/coreutils-file-attributes/receipt	Sat May 07 11:24:42 2011 +0000
     8.2 +++ b/coreutils-file-attributes/receipt	Sat May 07 11:36:11 2011 +0000
     8.3 @@ -39,8 +39,8 @@
     8.4  
     8.5  post_remove()
     8.6  {
     8.7 -	ln -s /bin/busybox /bin/chown
     8.8 -	ln -s /bin/busybox /bin/chgrp
     8.9 -	ln -s /bin/busybox /bin/chmod
    8.10 -	ln -s /bin/busybox /bin/touch
    8.11 +	ln -s /bin/busybox $1/bin/chown
    8.12 +	ln -s /bin/busybox $1/bin/chgrp
    8.13 +	ln -s /bin/busybox $1/bin/chmod
    8.14 +	ln -s /bin/busybox $1/bin/touch
    8.15  }
     9.1 --- a/coreutils-file-format/receipt	Sat May 07 11:24:42 2011 +0000
     9.2 +++ b/coreutils-file-format/receipt	Sat May 07 11:36:11 2011 +0000
     9.3 @@ -38,5 +38,5 @@
     9.4  
     9.5  post_remove()
     9.6  {
     9.7 -	ln -s /bin/busybox /usr/bin/fold
     9.8 +	ln -s /bin/busybox $1/usr/bin/fold
     9.9  }
    10.1 --- a/coreutils-file-output-part/receipt	Sat May 07 11:24:42 2011 +0000
    10.2 +++ b/coreutils-file-output-part/receipt	Sat May 07 11:36:11 2011 +0000
    10.3 @@ -39,7 +39,7 @@
    10.4  
    10.5  post_remove()
    10.6  {
    10.7 -	ln -s /bin/busybox /usr/bin/head
    10.8 -	ln -s /bin/busybox /usr/bin/tail
    10.9 -	ln -s /bin/busybox /usr/bin/split
   10.10 +	ln -s /bin/busybox $1/usr/bin/head
   10.11 +	ln -s /bin/busybox $1/usr/bin/tail
   10.12 +	ln -s /bin/busybox $1/usr/bin/split
   10.13  }
    11.1 --- a/coreutils-file-sort/receipt	Sat May 07 11:24:42 2011 +0000
    11.2 +++ b/coreutils-file-sort/receipt	Sat May 07 11:36:11 2011 +0000
    11.3 @@ -41,7 +41,7 @@
    11.4  
    11.5  post_remove()
    11.6  {
    11.7 -	ln -s /bin/busybox /usr/bin/sort
    11.8 -	ln -s /bin/busybox /usr/bin/uniq
    11.9 -	ln -s /bin/busybox /usr/bin/comm
   11.10 +	ln -s /bin/busybox $1/usr/bin/sort
   11.11 +	ln -s /bin/busybox $1/usr/bin/uniq
   11.12 +	ln -s /bin/busybox $1/usr/bin/comm
   11.13  }
    12.1 --- a/coreutils-file-special/receipt	Sat May 07 11:24:42 2011 +0000
    12.2 +++ b/coreutils-file-special/receipt	Sat May 07 11:36:11 2011 +0000
    12.3 @@ -48,19 +48,19 @@
    12.4  pre_remove()
    12.5  {
    12.6  	# Need to handle the removal of ln
    12.7 -	cp -a -fd /bin/ln /bin/ln-coreutils
    12.8 +	cp -a -fd /bin/ln $1/bin/ln-coreutils
    12.9  }
   12.10  
   12.11  post_remove()
   12.12  {
   12.13  	# Restore ln
   12.14 -	ln-coreutils -s /bin/busybox /bin/ln
   12.15 +	ln-coreutils -s /bin/busybox $1/bin/ln
   12.16  
   12.17 -	ln -s /bin/busybox /bin/mkdir
   12.18 -	ln -s /bin/busybox /bin/mknod
   12.19 -	ln -s /bin/busybox /bin/rmdir
   12.20 -	ln -s /bin/busybox /usr/bin/mkfifo
   12.21 -	ln -s /bin/busybox /usr/bin/readlink
   12.22 +	ln -s /bin/busybox $1/bin/mkdir
   12.23 +	ln -s /bin/busybox $1/bin/mknod
   12.24 +	ln -s /bin/busybox $1/bin/rmdir
   12.25 +	ln -s /bin/busybox $1/usr/bin/mkfifo
   12.26 +	ln -s /bin/busybox $1/usr/bin/readlink
   12.27  	
   12.28 -	rm -f /bin/ln-coreutils
   12.29 +	rm -f $1/bin/ln-coreutils
   12.30  }
    13.1 --- a/coreutils-file-summarize/receipt	Sat May 07 11:24:42 2011 +0000
    13.2 +++ b/coreutils-file-summarize/receipt	Sat May 07 11:36:11 2011 +0000
    13.3 @@ -46,11 +46,11 @@
    13.4  
    13.5  post_remove()
    13.6  {
    13.7 -	ln -s /bin/busybox /usr/bin/wc
    13.8 -	ln -s /bin/busybox /usr/bin/sum
    13.9 -	ln -s /bin/busybox /usr/bin/cksum
   13.10 -	ln -s /bin/busybox /usr/bin/md5sum
   13.11 -	ln -s /bin/busybox /usr/bin/sha1sum
   13.12 -	ln -s /bin/busybox /usr/bin/sha256sum
   13.13 -	ln -s /bin/busybox /usr/bin/sha512sum
   13.14 +	ln -s /bin/busybox $1/usr/bin/wc
   13.15 +	ln -s /bin/busybox $1/usr/bin/sum
   13.16 +	ln -s /bin/busybox $1/usr/bin/cksum
   13.17 +	ln -s /bin/busybox $1/usr/bin/md5sum
   13.18 +	ln -s /bin/busybox $1/usr/bin/sha1sum
   13.19 +	ln -s /bin/busybox $1/usr/bin/sha256sum
   13.20 +	ln -s /bin/busybox $1/usr/bin/sha512sum
   13.21  }
    14.1 --- a/coreutils-line/receipt	Sat May 07 11:24:42 2011 +0000
    14.2 +++ b/coreutils-line/receipt	Sat May 07 11:36:11 2011 +0000
    14.3 @@ -38,5 +38,5 @@
    14.4  
    14.5  post_remove()
    14.6  {
    14.7 -	ln -s /bin/busybox /usr/bin/cut
    14.8 +	ln -s /bin/busybox $1/usr/bin/cut
    14.9  }
    15.1 --- a/coreutils-numeric/receipt	Sat May 07 11:24:42 2011 +0000
    15.2 +++ b/coreutils-numeric/receipt	Sat May 07 11:36:11 2011 +0000
    15.3 @@ -37,5 +37,5 @@
    15.4  
    15.5  post_remove()
    15.6  {
    15.7 -	ln -s /bin/busybox /usr/bin/seq
    15.8 +	ln -s /bin/busybox $1/usr/bin/seq
    15.9  }
    16.1 --- a/coreutils-operations/receipt	Sat May 07 11:24:42 2011 +0000
    16.2 +++ b/coreutils-operations/receipt	Sat May 07 11:36:11 2011 +0000
    16.3 @@ -51,11 +51,11 @@
    16.4  {
    16.5  	# use busybox ln applet directly since /bin/ln
    16.6          # in this package is remove already
    16.7 -	/bin/busybox ln -s /bin/busybox /bin/cp
    16.8 -	/bin/busybox ln -s /bin/busybox /bin/dd
    16.9 -	/bin/busybox ln -s /bin/busybox /bin/mv
   16.10 -	/bin/busybox ln -s /bin/busybox /bin/ln
   16.11 -	/bin/busybox ln -s /bin/busybox /bin/rm
   16.12 -	/bin/busybox ln -s /bin/busybox /usr/bin/install
   16.13 -	/bin/busybox ln -s /bin/busybox /usr/bin/shred
   16.14 +	/bin/busybox ln -s /bin/busybox $1/bin/cp
   16.15 +	/bin/busybox ln -s /bin/busybox $1/bin/dd
   16.16 +	/bin/busybox ln -s /bin/busybox $1/bin/mv
   16.17 +	/bin/busybox ln -s /bin/busybox $1/bin/ln
   16.18 +	/bin/busybox ln -s /bin/busybox $1/bin/rm
   16.19 +	/bin/busybox ln -s /bin/busybox $1/usr/bin/install
   16.20 +	/bin/busybox ln -s /bin/busybox $1/usr/bin/shred
   16.21  }
    17.1 --- a/coreutils-path/receipt	Sat May 07 11:24:42 2011 +0000
    17.2 +++ b/coreutils-path/receipt	Sat May 07 11:36:11 2011 +0000
    17.3 @@ -38,6 +38,6 @@
    17.4  
    17.5  post_remove()
    17.6  {
    17.7 -	ln -s /bin/busybox /usr/bin/basename
    17.8 -	ln -s /bin/busybox /usr/bin/dirname
    17.9 +	ln -s /bin/busybox $1/usr/bin/basename
   17.10 +	ln -s /bin/busybox $1/usr/bin/dirname
   17.11  }
    18.1 --- a/coreutils-print/receipt	Sat May 07 11:24:42 2011 +0000
    18.2 +++ b/coreutils-print/receipt	Sat May 07 11:36:11 2011 +0000
    18.3 @@ -41,7 +41,7 @@
    18.4  
    18.5  post_remove()
    18.6  {
    18.7 -	ln -s /bin/busybox /bin/echo
    18.8 -	ln -s /bin/busybox /usr/bin/printf
    18.9 -	ln -s /bin/busybox /usr/bin/yes
   18.10 +	ln -s /bin/busybox $1/bin/echo
   18.11 +	ln -s /bin/busybox $1/usr/bin/printf
   18.12 +	ln -s /bin/busybox $1/usr/bin/yes
   18.13  }
    19.1 --- a/coreutils-redirection/receipt	Sat May 07 11:24:42 2011 +0000
    19.2 +++ b/coreutils-redirection/receipt	Sat May 07 11:36:11 2011 +0000
    19.3 @@ -36,5 +36,5 @@
    19.4  
    19.5  post_remove()
    19.6  {
    19.7 -	ln -s /bin/busybox /usr/bin/tee
    19.8 +	ln -s /bin/busybox $1/usr/bin/tee
    19.9  }
    20.1 --- a/coreutils/receipt	Sat May 07 11:24:42 2011 +0000
    20.2 +++ b/coreutils/receipt	Sat May 07 11:36:11 2011 +0000
    20.3 @@ -26,7 +26,7 @@
    20.4  			continue
    20.5  		fi
    20.6  		echo "Apply $patch_file"
    20.7 -		patch -p1 < ../stuff/$patch_file || return 1
    20.8 +		patch -p1 < $stuff/$patch_file || return 1
    20.9  		touch done.$patch_file
   20.10  	done <<EOT
   20.11  ls.u
   20.12 @@ -36,13 +36,7 @@
   20.13  	sed -i 's/1.10a/1.10.2/' configure.ac || return 1
   20.14  	sed -i 's/dist-xz/dist-lzma/' configure.ac || return 1
   20.15  
   20.16 -	./configure \
   20.17 -		--prefix=/usr \
   20.18 -		--infodir=/usr/share/info \
   20.19 -		--mandir=/usr/share/man \
   20.20 -		$CONFIGURE_ARGS &&
   20.21 -	make &&
   20.22 -	make DESTDIR=$PWD/_pkg install
   20.23 +	./configure && make && make install
   20.24  
   20.25  	# Restore original sigcontext.h
   20.26  	# mv -f /usr/include/asm/sigcontext.h.bak /usr/include/asm/sigcontext.h
   20.27 @@ -88,8 +82,8 @@
   20.28  
   20.29  post_remove()
   20.30  {
   20.31 -	ln -s /bin/busybox /usr/bin/od
   20.32 -	ln -s /bin/busybox /usr/bin/split
   20.33 +	ln -s /bin/busybox $1/usr/bin/od
   20.34 +	ln -s /bin/busybox $1/usr/bin/split
   20.35  }
   20.36  
   20.37  clean_wok()