Added support for using noarch packages.

--HG--
extra : convert_revision : a96166ddecb6efe65d35283f25e06a944cc4a038

shutils/binpkg-genindex.sh

@@ -43,23 +43,23 @@ write_repo_pkgindex()
 	[ -z "$repodir" ] && repodir=$XBPS_PACKAGESDIR
 	[ ! -d $repodir ] && exit 1
 
-	found="$(echo $repodir/*)"
+	found="$(echo $repodir/$xbps_machine/*)"
 	if $(echo $found|grep -vq .xbps); then
 		msg_error "couldn't find binary packages on $repodir."
 	fi
 
-	pkgindexf=$(mktemp -t pkgidx.XXXXXXXXXX) || exit 1
-	tmppkgdir=$(mktemp -d -t pkgdir.XXXXXXXX) || exit 1
+	pkgindexf=$(mktemp -t xbps-pkgidx.XXXXXXXXXX) || exit 1
+	tmppkgdir=$(mktemp -d -t xbps-pkgdir.XXXXXXXX) || exit 1
 
 	# Write the header.
 	msg_normal "Creating package index for $repodir..."
 	write_repo_pkgindex_header $pkgindexf $repodir
 
 	#
-	# Write pkg dictionaries from all packages currently available at
-	# XBPS_PACKAGESDIR.
+	# Write pkg dictionaries for all packages currently available at
+	# XBPS_PACKAGESDIR, both for your cpu arch and non arch dependent.
 	#
-	for i in $(echo $repodir/*.xbps); do
+	for i in $(find $repodir/$xbps_machine -type f -name \*.xbps); do
 		pkgname="$(basename ${i%%-[0-9]*.*.$xbps_machine.xbps})"
 		propsf="./var/db/xbps/metadata/$pkgname/props.plist"
 		cd $tmppkgdir && tar xfjp $i $propsf
@@ -67,7 +67,26 @@ write_repo_pkgindex()
 			msg_warn "Couldn't extract $(basename $i) metadata!"
 			continue
 		fi
-		write_repo_pkgindex_dict $propsf $pkgindexf $(basename $i)
+		write_repo_pkgindex_dict $propsf $pkgindexf $(basename $i) \
+			$xbps_machine
+		if [ $? -ne 0 ]; then
+			msg_warn "Couldn't write $i metadata to index file!"
+			continue
+		fi
+		echo "$(basename $i) added."
+		pkgsum=$(($pkgsum + 1))
+	done
+
+	for i in $(find $repodir/noarch -type f -name \*.xbps); do
+		pkgname="$(basename ${i%%-[0-9]*.*.noarch.xbps})"
+		propsf="./var/db/xbps/metadata/$pkgname/props.plist"
+		cd $tmppkgdir && tar xfjp $i $propsf
+		if [ $? -ne 0 ]; then
+			msg_warn "Couldn't extract $(basename $i) metadata!"
+			continue
+		fi
+		write_repo_pkgindex_dict $propsf $pkgindexf $(basename $i) \
+			noarch
 		if [ $? -ne 0 ]; then
 			msg_warn "Couldn't write $i metadata to index file!"
 			continue
@@ -85,7 +104,7 @@ write_repo_pkgindex()
 			exit 1
 		fi
 		msg_normal "Package index created (total pkgs: $pkgsum)."
-		cp -f $pkgindexf $repodir/pkg-index.plist
+		cp -f $pkgindexf $repodir/$xbps_machine/pkg-index.plist
 	fi
 	rm -f $pkgindexf
 	rm -rf $tmppkgdir
@@ -140,14 +159,15 @@ write_repo_pkgindex_dict()
 	local pkgf="$1"
 	local indexf="$2"
 	local binpkgf="$3"
+	local arch="$4"
 	local first_dict=
 	local tmpdictf=
-	local binpkg="$XBPS_PACKAGESDIR/$binpkgf"
-	local getsize=$(du $binpkg|awk '{print $1}')
+	local binpkg="$XBPS_PACKAGESDIR/$arch/$binpkgf"
+	local getsize=$(du -b $binpkg|awk '{print $1}')
 
 	[ -z "$pkgf" -o -z "$indexf" -o -z "$binpkgf" ] && return 1
 
-	tmpdictf=$(mktemp -t pkgdict.XXXXXXXXXX) || exit 1
+	tmpdictf=$(mktemp -t xbps-pkgdict.XXXXXXXXXX) || exit 1
 
 	cat $pkgf | while read line; do
 		# Find the first dictionary.

shutils/binpkg.sh

@@ -32,6 +32,7 @@ xbps_write_metadata_pkg()
 	local destdir=$XBPS_DESTDIR/$pkgname-$version
 	local metadir=$destdir/var/db/xbps/metadata/$pkgname
 	local prioinst=
+	local arch=
 
 	if [ ! -d "$destdir" ]; then
 		echo "ERROR: $pkgname not installed into destdir."
@@ -44,6 +45,12 @@ xbps_write_metadata_pkg()
 		prioinst=0
 	fi
 
+	if [ -n "$noarch" ]; then
+		arch=noarch
+	else
+		arch=$xbps_machine
+	fi
+
 	# Write the files list.
 	local TMPFLIST=$(mktemp -t flist.XXXXXXXXXX) || exit 1
 	# First add the regular files.
@@ -66,7 +73,7 @@ xbps_write_metadata_pkg()
 	<key>version</key>
 	<string>$version</string>
 	<key>architecture</key>
-	<string>$xbps_machine</string>
+	<string>$arch</string>
 	<key>priority</key>
 	<integer>$prioinst</integer>
 	<key>installed_size</key>
@@ -144,14 +151,24 @@ _EOF
 xbps_make_binpkg()
 {
 	local destdir=$XBPS_DESTDIR/$pkgname-$version
-	local binpkg=$pkgname-$version.$xbps_machine.xbps
-
+	local binpkg=
+	local pkgdir=
+	local arch=
 	cd $destdir || exit 1
 
+	if [ -n "$noarch" ]; then
+		arch=noarch
+	else
+		arch=$xbps_machine
+	fi
+
+	binpkg=$pkgname-$version.$arch.xbps
+	pkgdir=$XBPS_PACKAGESDIR/$arch
+
 	run_rootcmd tar cfjp $XBPS_DESTDIR/$binpkg .
 	if [ $? -eq 0 ]; then
-		[ ! -d $XBPS_PACKAGESDIR ] && mkdir -p $XBPS_PACKAGESDIR
-		mv -f $XBPS_DESTDIR/$binpkg $XBPS_PACKAGESDIR
+		[ ! -d $pkgdir ] && mkdir -p $pkgdir
+		mv -f $XBPS_DESTDIR/$binpkg $pkgdir
 		echo "=> Built package: $binpkg"
 	fi