user/spack: relocate default configuration. fixes #1108.

Switching to a file-based (as opposed to patch-based)
configuration will be easier for us to maintain. Note
that '/opt/spack/etc/spack/config.yaml' will override
values in '/etc/spack/config.yaml'.

Also:

  * change upstream spack.git provider; fixes spack#8,
    which gives users immediate access to our patches
    if they wish to set up a separate Spack tree

1 files changed, 27 insertions, 0 deletions

diff --git a/user/spack/default-adelie-upstream-git.patch b/user/spack/default-adelie-upstream-git.patch
new file mode 100644
index 000000000..cf8e982dd
--- /dev/null
+++ b/user/spack/default-adelie-upstream-git.patch
@@ -0,0 +1,27 @@
+diff --git a/lib/spack/spack/cmd/clone.py b/lib/spack/spack/cmd/clone.py
+index ade3c2a739..610ef78ea1 100644
+--- a/lib/spack/spack/cmd/clone.py
++++ b/lib/spack/spack/cmd/clone.py
+@@ -12,7 +12,7 @@
+ import spack.util.git
+ from spack.util.executable import ProcessError
+ 
+-_SPACK_UPSTREAM = "https://github.com/spack/spack"
++_SPACK_UPSTREAM = "https://git.adelielinux.org/adelie/spack.git"
+ 
+ description = "create a new installation of spack in another prefix"
+ section = "admin"
+@@ -37,10 +37,10 @@ def get_origin_info(remote):
+     try:
+         branch = git("symbolic-ref", "--short", "HEAD", output=str)
+     except ProcessError:
+-        branch = "develop"
++        branch = "adelie"
+         tty.warn("No branch found; using default branch: %s" % branch)
+-    if remote == "origin" and branch not in ("master", "develop"):
+-        branch = "develop"
++    if remote == "origin" and branch not in ("master", "develop", "adelie"):
++        branch = "adelie"
+         tty.warn("Unknown branch found; using default branch: %s" % branch)
+     try:
+         origin_url = git(