From ea719b3f598584e7217a4e9b1f34735a7ce25cac Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 5 May 2014 10:59:33 +0200
Subject: [PATCH] Added multilib, multilib/nonfree and debug repositories by
 default.

- multilib: to store 32bit packages.
- multilib/nonfree: to store nonfree 32bit packages.
- debug: to store debug packages.
---
 common/hooks/do-pkg/00-gen-pkg.sh        | 10 +++++++---
 common/hooks/post-pkg/00-register-pkg.sh | 12 ++++++++++--
 common/xbps-src/chroot/repos-local.conf  |  3 +++
 common/xbps-src/chroot/repos-remote.conf |  2 ++
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/common/hooks/do-pkg/00-gen-pkg.sh b/common/hooks/do-pkg/00-gen-pkg.sh
index 2522e3ec53a..2645a69b8d5 100644
--- a/common/hooks/do-pkg/00-gen-pkg.sh
+++ b/common/hooks/do-pkg/00-gen-pkg.sh
@@ -75,7 +75,7 @@ genpkg() {
 		done
 	fi
 
-	msg_normal "$sourcepkg: creating $binpkg for repository $pkgdir ...\n"
+	msg_normal "Creating $binpkg for repository $pkgdir ...\n"
 
 	#
 	# Create the XBPS binary package.
@@ -107,8 +107,6 @@ genpkg() {
 		rm -f $pkgdir/$binpkg
 		msg_error "Failed to created binary package: $binpkg!\n"
 	fi
-
-	msg_normal "Created binary package successfully: ${binpkg}\n"
 }
 
 hook() {
@@ -137,6 +135,7 @@ hook() {
 
 	# Generate -dbg pkg.
 	if [ -d "${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET}/${pkgname}-dbg-${version}" ]; then
+		repo=$XBPS_REPOSITORY/debug
 		_pkgver=${pkgname}-dbg-${version}_${revision}
 		_desc="${short_desc} (debug files)"
 		binpkg=${_pkgver}.${arch}.xbps
@@ -149,6 +148,11 @@ hook() {
 	fi
 	if [ -d "${XBPS_DESTDIR}/${pkgname}-32bit-${version}" ]; then
 		unset conf_files provides replaces preserve
+		if [ -n "$nonfree" ]; then
+			repo=$XBPS_REPOSITORY/multilib/nonfree
+		else
+			repo=$XBPS_REPOSITORY/multilib
+		fi
 		_pkgver=${pkgname}-32bit-${version}_${revision}
 		_desc="${short_desc} (32bit)"
 		binpkg=${_pkgver}.x86_64.xbps
diff --git a/common/hooks/post-pkg/00-register-pkg.sh b/common/hooks/post-pkg/00-register-pkg.sh
index 8bbdf1d3e95..1308fb84184 100644
--- a/common/hooks/post-pkg/00-register-pkg.sh
+++ b/common/hooks/post-pkg/00-register-pkg.sh
@@ -48,7 +48,9 @@ hook() {
 	fi
 
 	# Register -dbg binpkg if it exists.
-	if [ -f ${pkgdir}/${binpkg_dbg} ]; then
+	pkgdir=$XBPS_REPOSITORY/debug
+	PKGDESTDIR="${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET}/${pkgname}-dbg-${version}"
+	if [ -d ${PKGDESTDIR} -a -f ${pkgdir}/${binpkg_dbg} ]; then
 		registerpkg ${pkgdir} ${binpkg_dbg}
 	fi
 
@@ -56,7 +58,13 @@ hook() {
 	if [ "$XBPS_TARGET_MACHINE" != "i686" ]; then
 		return
 	fi
-	if [ -f ${pkgdir}/${binpkg32} ]; then
+	if [ -n "$nonfree" ]; then
+		pkgdir=$XBPS_REPOSITORY/multilib/nonfree
+	else
+		pkgdir=$XBPS_REPOSITORY/multilib
+	fi
+	PKGDESTDIR="${XBPS_DESTDIR}/${pkgname}-32bit-${version}"
+	if [ -d ${PKGDESTDIR} -a -f ${pkgdir}/${binpkg32} ]; then
 		registerpkg ${pkgdir} ${binpkg32} x86_64
 	fi
 }
diff --git a/common/xbps-src/chroot/repos-local.conf b/common/xbps-src/chroot/repos-local.conf
index 1ff2f6da763..45c6072acf5 100644
--- a/common/xbps-src/chroot/repos-local.conf
+++ b/common/xbps-src/chroot/repos-local.conf
@@ -1,3 +1,6 @@
 # Local repositories
 repository=/host/binpkgs
 repository=/host/binpkgs/nonfree
+repository=/host/binpkgs/multilib
+repository=/host/binpkgs/multilib/nonfree
+repository=/host/binpkgs/debug
diff --git a/common/xbps-src/chroot/repos-remote.conf b/common/xbps-src/chroot/repos-remote.conf
index 027e2cf7fbd..a6db40a0bcb 100644
--- a/common/xbps-src/chroot/repos-remote.conf
+++ b/common/xbps-src/chroot/repos-remote.conf
@@ -1,3 +1,5 @@
 # Remote repositories
 repository=http://repo.voidlinux.eu/current
 repository=http://repo.voidlinux.eu/current/nonfree
+repository=http://repo.voidlinux.eu/current/multilib
+repository=http://repo.voidlinux.eu/current/multilib/nonfree