SliTaz Repositories

     1.1 --- a/cook	Sun Jan 14 17:12:15 2018 +0200
     1.2 +++ b/cook	Wed Jan 24 12:14:38 2018 +0200
     1.3 @@ -303,14 +303,18 @@
     1.4  # Display cooked package summary.
     1.5  
     1.6  summary() {
     1.7 +	local arch=''
     1.8 +	case "$ARCH" in
     1.9 +		arm*|x86_64) arch="-$ARCH" ;;
    1.10 +	esac
    1.11 +
    1.12  	set_paths
    1.13  	cd $WOK/$pkg
    1.14  	[ -d $WOK/$pkg/install ] && prod=$(du -sh $WOK/$pkg/install | awk '{print $1}' 2>/dev/null)
    1.15  	[ -d $WOK/$pkg/source ] && srcdir=$(du -sh $WOK/$pkg/source | awk '{print $1}' 2>/dev/null)
    1.16  	[ -n "$TARBALL" ] && srcsize=$(du -sh $SRC/$TARBALL | awk '{print $1}')
    1.17  
    1.18 -	_ 'Summary for: %s' "$PACKAGE $VERSION$EXTRAVERSION"
    1.19 -	separator
    1.20 +	title 'Summary for: %s' "$PACKAGE $VERSION$EXTRAVERSION$arch"
    1.21  
    1.22  	# L10n: keep the same width of translations to get a consistent view
    1.23  	[ -n "$TARBALL" ] && _ 'Src file    : %s' "$TARBALL"
    1.24 @@ -319,7 +323,7 @@
    1.25  	[ -n "$prod" ]    && _ 'Produced    : %s' "$prod"
    1.26  	_ 'Cook time   : %s' "$(disp_time "$time")"
    1.27  	_ 'Cook date   : %s' "$(date "$(_ '+%%F %%R')")"
    1.28 -	_ 'Host arch   : %s' "$ARCH"
    1.29 +	_ 'Target arch : %s' "$ARCH"
    1.30  
    1.31  	separator -
    1.32  	_ ' # :  Packed : Compressed : Files : Package name'
    1.33 @@ -327,7 +331,7 @@
    1.34  	pkgi=1
    1.35  	for i in $(all_names); do
    1.36  		fs=$(du -sh $WOK/$pkg/taz/$i-$VERSION$EXTRAVERSION | awk '{print $1}')
    1.37 -		pkgname="$i-$VERSION$EXTRAVERSION.tazpkg"
    1.38 +		pkgname="$i-$VERSION$EXTRAVERSION$arch.tazpkg"
    1.39  		size=$(ls -lh $PKGS/$pkgname | awk '{print $5}')
    1.40  		files=$(wc -l < $WOK/$pkg/taz/$i-$VERSION$EXTRAVERSION/files.list)
    1.41  		printf "%2d : %7s : %10s : %5s : %s\n" "$pkgi" "$fs" "$size" "$files" "$pkgname"
    1.42 @@ -559,6 +563,7 @@
    1.43  	set_paths
    1.44  
    1.45  	# Handle cross-tools.
    1.46 +	[ "$BUILD_SYSTEM" != "$HOST_SYSTEM" ] &&
    1.47  	case "$ARCH" in
    1.48  		arm*|x86_64)
    1.49  			# CROSS_COMPILE is used by at least Busybox and the kernel to set
    1.50 @@ -965,8 +970,8 @@
    1.51  	# Build cpio archive.
    1.52  	action 'Compressing the FS...'
    1.53  	find fs -newer $receipt -exec touch -hr $receipt '{}' \;
    1.54 -	find fs | cpio -o -H newc --quiet | lzma-alone e fs.cpio.lzma -si
    1.55 -#	find fs | cpio -o -H newc --quiet | /bin/lzma -zeT0 -vv >fs.cpio.lzma
    1.56 +#	find fs | cpio -o -H newc --quiet | lzma-alone e fs.cpio.lzma -si
    1.57 +	find fs | cpio -o -H newc --quiet | /bin/lzma -qzeT0 >fs.cpio.lzma
    1.58  	mv fs ../
    1.59  	status
    1.60  
    1.61 @@ -1007,9 +1012,14 @@
    1.62  # Verify package quality and consistency.
    1.63  
    1.64  packit_quality() {
    1.65 +	local arch=''
    1.66 +	case "$ARCH" in
    1.67 +		arm*|x86_64) arch="-$ARCH" ;;
    1.68 +	esac
    1.69 +
    1.70  	local rsum rsumold='' rsum_changed old_file
    1.71  	local pi="$PKGS/packages.info" fl="$cache/files.list"
    1.72 -	local pkg_file="$PKGS/$PACKAGE-$VERSION$EXTRAVERSION.tazpkg"
    1.73 +	local pkg_file="$PKGS/$PACKAGE-$VERSION$EXTRAVERSION$arch.tazpkg"
    1.74  	local rsum_file=$(mktemp) rsum_file_old=$(mktemp) tmpdir=$(mktemp -d)
    1.75  
    1.76  
    1.77 @@ -1083,11 +1093,11 @@
    1.78  			status
    1.79  		fi
    1.80  		# package changed, substitute old package by new one
    1.81 -		mv -f $pkgdir/taz/$PACKAGE-$VERSION$EXTRAVERSION.tazpkg $PKGS
    1.82 +		mv -f $pkgdir/taz/$PACKAGE-$VERSION$EXTRAVERSION$arch.tazpkg $PKGS
    1.83  		_ 'The release checksum has changed.'
    1.84  	else
    1.85  		# package not changed, remove new package
    1.86 -		rm -f $pkgdir/taz/$PACKAGE-$VERSION$EXTRAVERSION.tazpkg
    1.87 +		rm -f $pkgdir/taz/$PACKAGE-$VERSION$EXTRAVERSION$arch.tazpkg
    1.88  		_ 'The release checksum has not changed.'
    1.89  	fi
    1.90  
    1.91 @@ -1951,7 +1961,7 @@
    1.92  		esac
    1.93  
    1.94  		# Some packages are not included in some arch or fail to cross compile.
    1.95 -		: ${HOST_ARCH=i486}
    1.96 +		: ${HOST_ARCH=$ARCH}
    1.97  		debug "$(_ 'Host arch %s' "$HOST_ARCH")"
    1.98  		# Handle arm{v6hf,v7,..}
    1.99  		if ! $(echo "$HOST_ARCH" | egrep -q "${ARCH%v[0-9]*}|any"); then