diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-06-15 23:00:32 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-06-15 23:00:32 -0400 |
commit | fbfcdfb31cd1a14d2356c1e0a42191c35ad33055 (patch) | |
tree | d7cb8f797b31ce5d516f9a9c7a01a3d42eaf0a9b /config | |
parent | c76ecd8ae9425f0717f30cdac8e47485c887bcb6 (diff) | |
parent | d902025a8a000c1383c7612e9f442c6734290169 (diff) |
Merge branch 'master' into lukeshu/archlinux+xbs+merge-parabola
Conflicts:
config
libremessages
Diffstat (limited to 'config')
-rw-r--r-- | config | 16 |
1 files changed, 10 insertions, 6 deletions
@@ -3,24 +3,28 @@ FTP_BASE="/srv/http/repo/public" SVNREPO="/var/abs" # Repos from Arch -ARCHREPOS=('core' 'testing' 'extra' 'community' 'multilib') +ARCHREPOS=('core' 'testing' 'extra' 'community' 'multilib' 'multilib-testing') TESTING_REPO='testing' # Official Parabola repos -OURREPOS=('libre' 'libre-testing') +OURREPOS=('libre' 'libre-testing' 'libre-multilib' 'libre-multilib-testing') # User repos USERREPOS=('~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde' '~drtan') # Community project repos PROJREPOS=('pcr' 'kernels' 'cross' 'java' 'java-ugly' 'nonprism') # Remote repos PKGREPOS=("${ARCHREPOS[@]}" "${OURREPOS[@]}" "${USERREPOS[@]}" "${PROJREPOS[@]}") -PKGPOOL='pool/packages' -SRCPOOL='sources/packages' +PKGPOOL='pool/parabola' +SRCPOOL='sources/parabola' # Directories where packages are shared between repos # *relative to FTP_BASE* -PKGPOOLS=('pool/packages' 'pool/community') +ARCHPKGPOOLS=(pool/{packages,community}) +OURPKGPOOLS=(pool/parabola) +PKGPOOLS=(${OURPKGPOOLS[@]} ${ARCHPKGPOOLS[@]}) # Directories where sources are stored -SRCPOOLS=('sources/packages' 'sources/community') +ARCHSRCPOOLS=(sources/{packages,community}) +OURPKGPOOLS=(sources/parabola) +SRCPOOLS=(${OURSRCPOOLS[@]} ${ARCHSRCPOOLS[@]}) CLEANUP_DESTDIR="$FTP_BASE/old/packages" CLEANUP_DRYRUN=false |