wok diff busybox/receipt @ rev 23877

Up busybox (1.32.0)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Wed Jul 01 17:06:12 2020 +0000 (2020-07-01)
parents c251d5eb8ec2
children 675c9264bc6a
line diff
     1.1 --- a/busybox/receipt	Mon Apr 06 16:30:06 2020 +0000
     1.2 +++ b/busybox/receipt	Wed Jul 01 17:06:12 2020 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="busybox"
     1.7 -VERSION="1.31.1"
     1.8 +VERSION="1.32.0"
     1.9  CATEGORY="base-system"
    1.10  SHORT_DESC="Busybox combines tiny versions of many common UNIX utilities."
    1.11  MAINTAINER="pascal.bellard@slitaz.org"
    1.12 @@ -38,7 +38,7 @@
    1.13      	[ -f done.$file ] && continue
    1.14      	echo "Apply $file..."
    1.15      	patch -p1 < $stuff/$PACKAGE-${VERSION%.*}-$file || return 1
    1.16 -	touch done.$file
    1.17 +	cp $stuff/$PACKAGE-${VERSION%.*}-$file done.$file
    1.18      done <<EOT
    1.19  tar.u
    1.20  stat.u
    1.21 @@ -53,9 +53,9 @@
    1.22  shutdown.u
    1.23  scriptreplay.u
    1.24  mkfs_vfat.u
    1.25 -ash.u
    1.26  EOT
    1.27      cp $stuff/$PACKAGE-${VERSION%.*}.config .config
    1.28 +    cp $stuff/$PACKAGE-${VERSION%.*}.config .
    1.29  }
    1.30  
    1.31  # Rules to configure and make the package.
    1.32 @@ -78,6 +78,7 @@
    1.33  			make && make install || return 1
    1.34  		    strip --strip-unneeded -R .eh_frame -R .eh_frame_hdr \
    1.35  				$src/_install/bin/busybox
    1.36 +		    cp busybox busybox-glibc
    1.37  		    mv busybox_unstripped.map busybox-glibc.map
    1.38  		    mv docs/busybox.1 docs/busybox.base.1
    1.39  
    1.40 @@ -94,6 +95,7 @@
    1.41  		    if [ -x /usr/bin/uclibc-i486-gcc ]; then
    1.42  			echo "=== Build busybox-uclibc ==="
    1.43  			cp $stuff/$PACKAGE-${VERSION%.*}.config-static .config
    1.44 +			cp $stuff/$PACKAGE-${VERSION%.*}.config-static .
    1.45  			sed -i 's/# CONFIG_ASH_INTERNAL_GLOB is not set/CONFIG_ASH_INTERNAL_GLOB=y/' .config
    1.46  			make oldconfig | sed 's|ERROR|error|' &&
    1.47  			LDFLAGS="" make || return 1
    1.48 @@ -107,6 +109,7 @@
    1.49  			echo "=== Build busybox-musl ==="
    1.50  			# prepare busybox-musl package
    1.51  			cp $stuff/$PACKAGE-${VERSION%.*}.config-static .config
    1.52 +			cp $stuff/$PACKAGE-${VERSION%.*}.config-static .
    1.53  			sed -i 's|uclibc-i486-||' .config
    1.54  			make oldconfig | sed 's|ERROR|error|' &&
    1.55  			if make CC=musl-gcc 2> musl-err.log ; then
    1.56 @@ -120,6 +123,7 @@
    1.57  			echo "=== Build busybox-diet ==="
    1.58  			# prepare busybox-diet package
    1.59  			cp $stuff/$PACKAGE-${VERSION%.*}.config-static .config
    1.60 +			cp $stuff/$PACKAGE-${VERSION%.*}.config-static .
    1.61  			sed -i 's|uclibc-i486-||;s|CFLAGS="|&-D_BSD_SOURCE |;s|LDFLAGS="|&-Wl,--allow-multiple-definition |;s|LDLIBS="|&compat rpc |' .config
    1.62  			make oldconfig | sed 's|ERROR|error|' &&
    1.63  			if make CC="/usr/lib/diet/bin/diet gcc" 2> diet-err.log ; then
    1.64 @@ -134,6 +138,7 @@
    1.65  		    rootfs=$src/ssfs-busybox/usr/share/ssfs/rootfs
    1.66  		    mkdir -p $rootfs/etc
    1.67  		    cp $stuff/$PACKAGE-${VERSION%.*}.config-ssfs .config
    1.68 +		    cp $stuff/$PACKAGE-${VERSION%.*}.config-ssfs .
    1.69  		    make oldconfig | sed 's|ERROR|error|' && make busybox &&
    1.70  		    make CONFIG_PREFIX=$rootfs install || return 1
    1.71  		    mv busybox_unstripped.map busybox-ssfs.map