From 891b7e661e3b0b06dcdf9f9b1cb24f79be1a9b0b Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 13 Mar 2015 09:53:12 +0100 Subject: [PATCH] xbps-src: move xbps repo conf files to etc/. --- common/xbps-src/shutils/chroot.sh | 8 ++++---- {common/xbps-src/chroot => etc}/repos-local-x86_64.conf | 0 {common/xbps-src/chroot => etc}/repos-local.conf | 0 {common/xbps-src/chroot => etc}/repos-remote-x86_64.conf | 0 {common/xbps-src/chroot => etc}/repos-remote.conf | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename {common/xbps-src/chroot => etc}/repos-local-x86_64.conf (100%) rename {common/xbps-src/chroot => etc}/repos-local.conf (100%) rename {common/xbps-src/chroot => etc}/repos-remote-x86_64.conf (100%) rename {common/xbps-src/chroot => etc}/repos-remote.conf (100%) diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh index 747b5743e68..a1490fbb3cc 100644 --- a/common/xbps-src/shutils/chroot.sh +++ b/common/xbps-src/shutils/chroot.sh @@ -116,15 +116,15 @@ chroot_sync_repos() { local f= # Copy xbps configuration files to the masterdir. - install -Dm644 ${XBPS_COMMONDIR}/xbps-src/chroot/repos-local.conf \ + install -Dm644 ${XBPS_DISTDIR}/etc/repos-local.conf \ ${XBPS_MASTERDIR}/etc/xbps.d/10-repository-local.conf - install -Dm644 ${XBPS_COMMONDIR}/xbps-src/chroot/repos-remote.conf \ + install -Dm644 ${XBPS_DISTDIR}/etc/repos-remote.conf \ ${XBPS_MASTERDIR}/etc/xbps.d/20-repository-remote.conf if [ "$XBPS_MACHINE" = "x86_64" ]; then - install -Dm644 ${XBPS_COMMONDIR}/xbps-src/chroot/repos-local-x86_64.conf \ + install -Dm644 ${XBPS_DISTDIR}/etc/repos-local-x86_64.conf \ ${XBPS_MASTERDIR}/etc/xbps.d/12-repository-local-x86_64.conf - install -Dm644 ${XBPS_COMMONDIR}/xbps-src/chroot/repos-remote-x86_64.conf \ + install -Dm644 ${XBPS_DISTDIR}/etc/repos-remote-x86_64.conf \ ${XBPS_MASTERDIR}/etc/xbps.d/22-repository-remote-x86_64.conf fi diff --git a/common/xbps-src/chroot/repos-local-x86_64.conf b/etc/repos-local-x86_64.conf similarity index 100% rename from common/xbps-src/chroot/repos-local-x86_64.conf rename to etc/repos-local-x86_64.conf diff --git a/common/xbps-src/chroot/repos-local.conf b/etc/repos-local.conf similarity index 100% rename from common/xbps-src/chroot/repos-local.conf rename to etc/repos-local.conf diff --git a/common/xbps-src/chroot/repos-remote-x86_64.conf b/etc/repos-remote-x86_64.conf similarity index 100% rename from common/xbps-src/chroot/repos-remote-x86_64.conf rename to etc/repos-remote-x86_64.conf diff --git a/common/xbps-src/chroot/repos-remote.conf b/etc/repos-remote.conf similarity index 100% rename from common/xbps-src/chroot/repos-remote.conf rename to etc/repos-remote.conf