summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2012-11-08 14:42:33 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2012-11-08 14:42:57 +0000
commit380c110ced82006b2c355cc61878c0902365014b (patch)
treeb4c62d16ae582dddac99a1abb6a16b30b153f382
parent494222dd3967ae1f954627543bbcd2eb0f28c8c1 (diff)
parent7f0c3548e6dca3819c4fd56b2326e5713680b8cc (diff)
downloadmorphs-380c110ced82006b2c355cc61878c0902365014b.tar.gz
Merge branch 'liw/url-change' of git://git.baserock.org/baserock/morphs
We're going to move git.baserock.org to a new host, and also running on a new software stack. Because of the new software stack, the repo URLs that currently are of the form "baserock:foo" will need to change to the form "baserock:baserock/foo". We have added a compatibility symlink so that the new form works on the old git.baserock.org server, so changing morphologies now is harmless.
-rw-r--r--base-system-armv7-versatile.morph4
-rw-r--r--base-system-x86_64-generic.morph4
-rw-r--r--bootstrap-pass2.morph2
-rw-r--r--bootstrap-pass3-imx53.morph6
-rw-r--r--bootstrap-pass3-x86_64-generic.morph6
-rw-r--r--devel-system-armv7-versatile.morph6
-rw-r--r--devel-system-x86_64-generic.morph6
-rw-r--r--devel.morph2
-rw-r--r--foundation.morph4
9 files changed, 20 insertions, 20 deletions
diff --git a/base-system-armv7-versatile.morph b/base-system-armv7-versatile.morph
index bcd8b02..9f49ea8 100644
--- a/base-system-armv7-versatile.morph
+++ b/base-system-armv7-versatile.morph
@@ -8,12 +8,12 @@
"strata": [
{
"morph": "bsp-armv7-versatile",
- "repo": "baserock:morphs",
+ "repo": "baserock:baserock/morphs",
"ref": "master"
},
{
"morph": "foundation",
- "repo": "baserock:morphs",
+ "repo": "baserock:baserock/morphs",
"ref": "master"
}
]
diff --git a/base-system-x86_64-generic.morph b/base-system-x86_64-generic.morph
index 4c5c6f9..94c93ff 100644
--- a/base-system-x86_64-generic.morph
+++ b/base-system-x86_64-generic.morph
@@ -8,12 +8,12 @@
"strata": [
{
"morph": "bsp-x86_64-generic",
- "repo": "baserock:morphs",
+ "repo": "baserock:baserock/morphs",
"ref": "master"
},
{
"morph": "foundation",
- "repo": "baserock:morphs",
+ "repo": "baserock:baserock/morphs",
"ref": "master"
}
]
diff --git a/bootstrap-pass2.morph b/bootstrap-pass2.morph
index 3de7441..3166041 100644
--- a/bootstrap-pass2.morph
+++ b/bootstrap-pass2.morph
@@ -5,7 +5,7 @@
"chunks": [
{
"name": "fhs-dirs",
- "repo": "baserock:fhs-dirs",
+ "repo": "baserock:baserock/fhs-dirs",
"ref": "master",
"build-depends": []
},
diff --git a/bootstrap-pass3-imx53.morph b/bootstrap-pass3-imx53.morph
index e451968..facd764 100644
--- a/bootstrap-pass3-imx53.morph
+++ b/bootstrap-pass3-imx53.morph
@@ -5,17 +5,17 @@
"build-depends": [
{
"morph": "foundation",
- "repo": "baserock:morphs",
+ "repo": "baserock:baserock/morphs",
"ref": "master"
},
{
"morph": "devel",
- "repo": "baserock:morphs",
+ "repo": "baserock:baserock/morphs",
"ref": "master"
},
{
"morph": "bsp-imx53",
- "repo": "baserock:morphs",
+ "repo": "baserock:baserock/morphs",
"ref": "master"
}
]
diff --git a/bootstrap-pass3-x86_64-generic.morph b/bootstrap-pass3-x86_64-generic.morph
index 538b157..78da758 100644
--- a/bootstrap-pass3-x86_64-generic.morph
+++ b/bootstrap-pass3-x86_64-generic.morph
@@ -5,17 +5,17 @@
"build-depends": [
{
"morph": "foundation",
- "repo": "baserock:morphs",
+ "repo": "baserock:baserock/morphs",
"ref": "master"
},
{
"morph": "devel",
- "repo": "baserock:morphs",
+ "repo": "baserock:baserock/morphs",
"ref": "master"
},
{
"morph": "bsp-x86_64-generic",
- "repo": "baserock:morphs",
+ "repo": "baserock:baserock/morphs",
"ref": "master"
}
]
diff --git a/devel-system-armv7-versatile.morph b/devel-system-armv7-versatile.morph
index 1a092d4..5d799fc 100644
--- a/devel-system-armv7-versatile.morph
+++ b/devel-system-armv7-versatile.morph
@@ -8,17 +8,17 @@
"strata": [
{
"morph": "bsp-armv7-versatile",
- "repo": "baserock:morphs",
+ "repo": "baserock:baserock/morphs",
"ref": "master"
},
{
"morph": "foundation",
- "repo": "baserock:morphs",
+ "repo": "baserock:baserock/morphs",
"ref": "master"
},
{
"morph": "devel",
- "repo": "baserock:morphs",
+ "repo": "baserock:baserock/morphs",
"ref": "master"
}
]
diff --git a/devel-system-x86_64-generic.morph b/devel-system-x86_64-generic.morph
index 09b322c..c9bcda6 100644
--- a/devel-system-x86_64-generic.morph
+++ b/devel-system-x86_64-generic.morph
@@ -8,17 +8,17 @@
"strata": [
{
"morph": "bsp-x86_64-generic",
- "repo": "baserock:morphs",
+ "repo": "baserock:baserock/morphs",
"ref": "master"
},
{
"morph": "foundation",
- "repo": "baserock:morphs",
+ "repo": "baserock:baserock/morphs",
"ref": "master"
},
{
"morph": "devel",
- "repo": "baserock:morphs",
+ "repo": "baserock:baserock/morphs",
"ref": "master"
}
]
diff --git a/devel.morph b/devel.morph
index 1be1517..f5e1a2c 100644
--- a/devel.morph
+++ b/devel.morph
@@ -411,7 +411,7 @@
},
{
"name": "morph",
- "repo": "baserock:morph",
+ "repo": "baserock:baserock/morph",
"ref": "master",
"build-depends": [
"cliapp",
diff --git a/foundation.morph b/foundation.morph
index 46ad824..e3a7867 100644
--- a/foundation.morph
+++ b/foundation.morph
@@ -5,7 +5,7 @@
"chunks": [
{
"name": "fhs-dirs",
- "repo": "baserock:fhs-dirs",
+ "repo": "baserock:baserock/fhs-dirs",
"ref": "master",
"build-depends": []
},
@@ -75,7 +75,7 @@
},
{
"name": "tbdiff",
- "repo": "baserock:tbdiff",
+ "repo": "baserock:baserock/tbdiff",
"ref": "master",
"build-depends": [
"eglibc",