wok diff coreutils-command/receipt @ rev 22567

updated buildbot-slave (0.8.5 -> 0.8.14)
author Hans-G?nter Theisgen
date Sun Jan 05 17:33:37 2020 +0100 (2020-01-05)
parents 6fab3264ba87
children 9b6a3a5c1a07
line diff
     1.1 --- a/coreutils-command/receipt	Fri Dec 25 15:23:46 2015 +0200
     1.2 +++ b/coreutils-command/receipt	Sun Jan 05 17:33:37 2020 +0100
     1.3 @@ -1,45 +1,62 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="coreutils-command"
     1.7 -VERSION="8.12"
     1.8 +VERSION="8.25"
     1.9  CATEGORY="system-tools"
    1.10  SHORT_DESC="GNU command utilities."
    1.11  MAINTAINER="rcx@zoominternet.net"
    1.12  LICENSE="GPL3"
    1.13 -WEB_SITE="http://www.gnu.org/software/coreutils/"
    1.14 +WEB_SITE="https://www.gnu.org/software/coreutils/coreutils.html"
    1.15 +
    1.16  WANTED="coreutils"
    1.17 -
    1.18  DEPENDS="glibc-base"
    1.19  
    1.20  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.21 -#
    1.22 -# This is a special package for installed system or developer. We only take
    1.23 -# a few things, as Busybox provides all the basic utilities, but not for compiling.
    1.24 -# But DO NOT erase a Busybox applet, remove it before with pre_install rules.
    1.25 -#
    1.26  genpkg_rules()
    1.27  {
    1.28 -	mkdir -p $fs/bin
    1.29 -	cp -a $install/usr/bin/nice $fs/bin
    1.30 -	cp -a $install/usr/bin/kill $fs/bin
    1.31 -	cp -a $install/usr/bin/sleep $fs/bin
    1.32 +	mandir="$fs/usr/share/man/man1"
    1.33 +	mkdir -p $mandir ${mandir/1/8}
    1.34  
    1.35 -	mkdir -p $fs/usr/bin
    1.36 -	cp -a $install/usr/bin/env $fs/usr/bin
    1.37 -	cp -a $install/usr/bin/nohup $fs/usr/bin
    1.38 -	cp -a $install/usr/bin/timeout $fs/usr/bin
    1.39 +	while read i; do
    1.40 +		mkdir -p $fs$(dirname $i)
    1.41 +		cp -a $install$i $fs$i
    1.42 +		find $install -name "$(basename $i).*" -exec cp -a \{\} $mandir \;
    1.43 +	done <<EOT
    1.44 +/usr/bin/env
    1.45 +/usr/bin/kill
    1.46 +/usr/bin/nice
    1.47 +/usr/bin/nohup
    1.48 +/usr/bin/sleep
    1.49 +/usr/bin/stdbuf
    1.50 +/usr/bin/timeout
    1.51 +/usr/libexec/coreutils/libstdbuf.so
    1.52 +/usr/sbin/chroot
    1.53 +EOT
    1.54  
    1.55 -	mkdir -p $fs/usr/sbin
    1.56 -	cp -a $install/usr/bin/chroot $fs/usr/sbin
    1.57 +	mv $mandir/chroot.* ${mandir/1/8}
    1.58 +}
    1.59 +
    1.60 +post_install()
    1.61 +{
    1.62 +	# Remove Busybox applets in order to not clash with ("/bin", "/sbin",
    1.63 +	# "/usr/bin" and "/usr/sbin" conflicts with the same filename)
    1.64 +	rm "$1/bin/kill"     # /usr/bin/kill
    1.65 +	rm "$1/bin/nice"     # /usr/bin/nice
    1.66 +	rm "$1/bin/sleep"    # /usr/bin/sleep
    1.67  }
    1.68  
    1.69  post_remove()
    1.70  {
    1.71 -	ln -s /bin/busybox "$1/bin/nice"
    1.72 -	ln -s /bin/busybox "$1/bin/kill"
    1.73 -	ln -s /bin/busybox "$1/bin/sleep"
    1.74 -	ln -s /bin/busybox "$1/usr/bin/env"
    1.75 -	ln -s /bin/busybox "$1/usr/bin/nohup"
    1.76 -	ln -s /bin/busybox "$1/usr/bin/timeout"
    1.77 -	ln -s /bin/busybox "$1/usr/sbin/chroot"
    1.78 +	# Restore all Busybox applets that have been replaced
    1.79 +	while read i; do
    1.80 +		busybox ln -s /bin/busybox "$1$i"
    1.81 +	done <<EOT
    1.82 +/bin/kill
    1.83 +/bin/nice
    1.84 +/bin/sleep
    1.85 +/usr/bin/env
    1.86 +/usr/bin/nohup
    1.87 +/usr/bin/timeout
    1.88 +/usr/sbin/chroot
    1.89 +EOT
    1.90  }