moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

xbps-src: make local/remote multilib repos only available on x86_64.

Browse source
This commit is contained in:
Juan RP 2014-06-10 09:22:18 +02:00
parent f7e1b296c8
commit b747269490
5 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
common/xbps-src/chroot/repos-local-x86_64.conf Normal file
View file

@ -0,0 +1,3 @@
# Local repositories
repository=/host/binpkgs/multilib
repository=/host/binpkgs/multilib/nonfree

2
common/xbps-src/chroot/repos-local.conf
View file

@ -1,6 +1,4 @@
# Local repositories # Local repositories
repository=/host/binpkgs repository=/host/binpkgs
repository=/host/binpkgs/nonfree repository=/host/binpkgs/nonfree
repository=/host/binpkgs/multilib
repository=/host/binpkgs/multilib/nonfree
repository=/host/binpkgs/debug repository=/host/binpkgs/debug

3
common/xbps-src/chroot/repos-remote-x86_64.conf Normal file
View file

@ -0,0 +1,3 @@
# Remote repositories
repository=http://repo.voidlinux.eu/current/multilib
repository=http://repo.voidlinux.eu/current/multilib/nonfree

2
common/xbps-src/chroot/repos-remote.conf
View file

@ -1,5 +1,3 @@
# Remote repositories # Remote repositories
repository=http://repo.voidlinux.eu/current repository=http://repo.voidlinux.eu/current
repository=http://repo.voidlinux.eu/current/nonfree repository=http://repo.voidlinux.eu/current/nonfree
repository=http://repo.voidlinux.eu/current/multilib
repository=http://repo.voidlinux.eu/current/multilib/nonfree

8
common/xbps-src/shutils/chroot.sh
View file

@ -120,9 +120,17 @@ chroot_sync_repos() {
install -Dm644 ${XBPS_COMMONDIR}/xbps-src/chroot/repos-remote.conf \ install -Dm644 ${XBPS_COMMONDIR}/xbps-src/chroot/repos-remote.conf \
${XBPS_MASTERDIR}/etc/xbps/repo.d/20-remote.conf ${XBPS_MASTERDIR}/etc/xbps/repo.d/20-remote.conf
if [ "$XBPS_MACHINE" = "x86_64" ]; then
install -Dm644 ${XBPS_COMMONDIR}/xbps-src/chroot/repos-local-x86_64.conf \
${XBPS_MASTERDIR}/etc/xbps/repo.d/12-local-x86_64.conf
install -Dm644 ${XBPS_COMMONDIR}/xbps-src/chroot/repos-remote-x86_64.conf \
${XBPS_MASTERDIR}/etc/xbps/repo.d/22-remote-x86_64.conf
fi
# if -N is set, comment out remote repositories from xbps.conf. # if -N is set, comment out remote repositories from xbps.conf.
if [ -n "$XBPS_SKIP_REMOTEREPOS" ]; then if [ -n "$XBPS_SKIP_REMOTEREPOS" ]; then
rm -f ${XBPS_MASTERDIR}/etc/xbps/repo.d/20-remote.conf rm -f ${XBPS_MASTERDIR}/etc/xbps/repo.d/20-remote.conf
rm -f ${XBPS_MASTERDIR}/etc/xbps/repo.d/22-remote-x86_64.conf
else else
# Make sure to sync index for remote repositories. # Make sure to sync index for remote repositories.
$CHROOT_CMD $XBPS_MASTERDIR /usr/sbin/xbps-install -S $CHROOT_CMD $XBPS_MASTERDIR /usr/sbin/xbps-install -S