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.
This commit is contained in:
Juan RP 2014-05-05 10:59:33 +02:00
parent 4d9ed5639f
commit ea719b3f59
4 changed files with 22 additions and 5 deletions

View file

@ -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

View file

@ -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
}

View file

@ -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

View file

@ -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