SliTaz Repositories

     1.1 --- a/modules/pkgdb	Fri Oct 20 16:54:05 2017 +0300
     1.2 +++ b/modules/pkgdb	Wed Jan 24 12:14:38 2018 +0200
     1.3 @@ -51,6 +51,11 @@
     1.4  flavors="$SLITAZ/flavors"
     1.5  live="$SLITAZ/live"
     1.6  
     1.7 +arch=''
     1.8 +case "$ARCH" in
     1.9 +	arm*|x86_64) arch="-$ARCH" ;;
    1.10 +esac
    1.11 +
    1.12  echo 'cook:pkgdb' > $command
    1.13  _ 'Cook pkgdb: Creating all packages lists' | log
    1.14  newline; { _ 'Creating lists for "%s"' "$PKGS"; separator; } | dblog
    1.15 @@ -116,8 +121,7 @@
    1.16  		unset_receipt
    1.17  		. ./$pack/receipt
    1.18  
    1.19 -		if [ -f "$PKGS/$PACKAGE-$VERSION$EXTRAVERSION.tazpkg" -o \
    1.20 -		     -f "$PKGS/$PACKAGE-$VERSION$EXTRAVERSION-$ARCH.tazpkg" ]; then
    1.21 +		if [ -f "$PKGS/$PACKAGE-$VERSION$EXTRAVERSION$arch.tazpkg" ]; then
    1.22  
    1.23  			# packages.desc lets us search easily in DB
    1.24  			cat >> $PKGS/packages.desc <<EOT
    1.25 @@ -165,7 +169,7 @@
    1.26  			sed "s|^|$PACKAGE: \0|" $i/taz/$j/files.list >> $PKGS/files.list
    1.27  
    1.28  			# list of unnecessary packages
    1.29 -			sed -i "/ $PACKAGE-$VERSION$EXTRAVERSION.tazpkg/d" $PKGS/packages.toremove
    1.30 +			sed -i "/ $PACKAGE-$VERSION$EXTRAVERSION$arch.tazpkg/d" $PKGS/packages.toremove
    1.31  		else
    1.32  			# if receipt variable HOST_ARCH absent/empty or contains ARCH
    1.33  			if [ -z "$HOST_ARCH" -o "${HOST_ARCH/$ARCH/}" != "$HOST_ARCH" ]; then
    1.34 @@ -209,13 +213,15 @@
    1.35  _n 'Creating file "%s"' 'files.list.lzma' | dblog
    1.36  touch files.list
    1.37  # pkgs.slitaz.org strongly depends on list sorted by packages names
    1.38 -lzma e files.list files.list.lzma
    1.39 +#lzma e files.list files.list.lzma
    1.40 +/bin/lzma -zeqcT0 files.list > files.list.lzma
    1.41  echo " ($(filesize $PKGS/files.list.lzma))" | dblog
    1.42  
    1.43  # Pre-sorting filenames causes 10% smaller resulting lzma file
    1.44  _n 'Creating file "%s"' 'files-list.lzma' | dblog
    1.45  cat files.list | sort -k2 -o files.list.sorted
    1.46 -lzma e files.list.sorted files-list.lzma
    1.47 +#lzma e files.list.sorted files-list.lzma
    1.48 +/bin/lzma -zeqcT0 files.list.sorted > files-list.lzma
    1.49  rm -f files.list files.list.sorted
    1.50  echo " ($(filesize $PKGS/files-list.lzma))" | dblog
    1.51  
    1.52 @@ -235,10 +241,11 @@
    1.53  	wget -q -O extra.list http://mirror1.slitaz.org/packages/get.list
    1.54  	echo -n '.' | dblog; sleep 5
    1.55  done
    1.56 -busybox tar -chaf bundle.tar.lzma \
    1.57 +busybox tar -chf bundle.tar \
    1.58  	mirrors extra.list files-list.md5 packages.info descriptions.txt \
    1.59  	packages.desc packages.md5 packages.txt packages.list packages.equiv
    1.60 -rm ./mirrors
    1.61 +/bin/lzma -zeqcT0 bundle.tar > bundle.tar.lzma
    1.62 +rm ./bundle.tar ./mirrors
    1.63  echo " ($(filesize $PKGS/bundle.tar.lzma))" | dblog
    1.64  
    1.65  # Display some info.