From 5e881431688ea2ff9bb886d9dbaa69a38762c5bf Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 6 Jun 2015 16:49:11 -0600 Subject: Tidy up the default libretools.conf - REPOS is now only used by toru-path - ARCHES is also used by xbs-abslibre - remove the claim that ARCHES affects createworkdir from the docs. --- doc/createworkdir.md | 3 --- src/libretools.conf | 18 +++++++++--------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/doc/createworkdir.md b/doc/createworkdir.md index 44eee34..e50b00f 100644 --- a/doc/createworkdir.md +++ b/doc/createworkdir.md @@ -25,9 +25,6 @@ This directory contains one directory for each repository, where the resulting packages are in moved for syncing against the main repository on Parabola's server. This directory is architecture independent. -*Related Variables* - - REPOS - ## abslibre/ This is the git repo for Parabola's PKGBUILDs. Here you can find the ABS tree diff --git a/src/libretools.conf b/src/libretools.conf index a54d73b..e2a661d 100644 --- a/src/libretools.conf +++ b/src/libretools.conf @@ -14,16 +14,8 @@ BLACKLIST=https://projects.parabola.nu/blacklist.git/plain/blacklist.txt ## Used by `aur`, `diff-unfree` DIFFPROG=$(which $([ -z "${DISPLAY:-}" ]||echo kdiff3 meld gvimdiff) vimdiff colordiff diff 2>/dev/null|sed 's/\s.*//;1q') -## The repos you'll be packaging for -## Used by `toru`, `toru-path` -# Tip: As early repos take precedence on $REPOS loops, you can use this as -# inverted order of precedence. Put testing repos first so dagpkg will find new -# PKGBUILDs first, for instance. `toru-path` uses reverse order to enforce repo -# precedence on the path cache (the last path added replaces the rest) -REPOS=('core' 'libre' 'extra' 'community' 'libre-testing' 'social' 'sugar' 'pcr' 'java') - ## The architectures you'll be packaging for -## Used by `librestage` +## Used by `librestage`, `xbs-abslibre` ARCHES=('x86_64' 'i686' 'mips64el') ## ABSLibre @@ -71,3 +63,11 @@ HOOKLOCALRELEASE="librestage" ################################################################################ TORUPATH=/var/lib/libretools/toru + +## The repos you'll be packaging for +## Used by: `toru-path` +# Tip: As early repos take precedence on $REPOS loops, you can use this as +# inverted order of precedence. Put testing repos first so dagpkg will find new +# PKGBUILDs first, for instance. `toru-path` uses reverse order to enforce repo +# precedence on the path cache (the last path added replaces the rest) +REPOS=('core' 'libre' 'extra' 'community' 'libre-testing' 'social' 'sugar' 'pcr' 'java') -- cgit v1.2.3