summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--base-system-x86_32-generic.morph2
-rw-r--r--base-system-x86_64-generic.morph2
-rw-r--r--core.morph6
-rw-r--r--devel-system-armv7-versatile.morph2
-rw-r--r--devel-system-x86_32-generic.morph2
-rw-r--r--devel-system-x86_64-generic.morph2
-rw-r--r--foundation.morph8
-rw-r--r--nfs.morph2
-rw-r--r--tools.morph22
9 files changed, 24 insertions, 24 deletions
diff --git a/base-system-x86_32-generic.morph b/base-system-x86_32-generic.morph
index 23f518d1..2e29dbe2 100644
--- a/base-system-x86_32-generic.morph
+++ b/base-system-x86_32-generic.morph
@@ -2,7 +2,7 @@
"name": "base-system-x86_32-generic",
"description": "The set of strata required to have a minimal system for a 32-bit x86 system.",
"kind": "system",
- "system-kind": "syslinux-disk",
+ "system-kind": "rootfs-tarball",
"arch": "x86_32",
"disk-size": "2G",
"strata": [
diff --git a/base-system-x86_64-generic.morph b/base-system-x86_64-generic.morph
index c41be08c..4ae4e713 100644
--- a/base-system-x86_64-generic.morph
+++ b/base-system-x86_64-generic.morph
@@ -2,7 +2,7 @@
"name": "base-system-x86_64-generic",
"description": "The set of strata required to have a minimal system for a 64-bit x86 system.",
"kind": "system",
- "system-kind": "syslinux-disk",
+ "system-kind": "rootfs-tarball",
"arch": "x86_64",
"disk-size": "2G",
"strata": [
diff --git a/core.morph b/core.morph
index 2279b91a..0238f3d5 100644
--- a/core.morph
+++ b/core.morph
@@ -106,7 +106,7 @@
{
"name": "error-perl-tarball",
"repo": "upstream:error-perl-tarball",
- "ref": "master",
+ "ref": "baserock/morph",
"build-depends": [
"perl"
]
@@ -130,7 +130,7 @@
{
"name": "libxml2",
"repo": "upstream:libxml2",
- "ref": "master",
+ "ref": "baserock/morph",
"build-depends": [
"autoconf",
"automake",
@@ -179,7 +179,7 @@
{
"name": "XML-Parser",
"repo": "upstream:XML-Parser",
- "ref": "master",
+ "ref": "baserock/morph",
"build-depends": [
"libexpat",
"libxml2",
diff --git a/devel-system-armv7-versatile.morph b/devel-system-armv7-versatile.morph
index fb3a30c5..b10a52fe 100644
--- a/devel-system-armv7-versatile.morph
+++ b/devel-system-armv7-versatile.morph
@@ -1,5 +1,5 @@
{
- "name": "arm-versatile-devel-system",
+ "name": "devel-system-armv7-versatile",
"description": "A system that is able to build other systems based on the ARM versatile architecture.",
"kind": "system",
"system-kind": "rootfs-tarball",
diff --git a/devel-system-x86_32-generic.morph b/devel-system-x86_32-generic.morph
index ed67df89..c0f4b877 100644
--- a/devel-system-x86_32-generic.morph
+++ b/devel-system-x86_32-generic.morph
@@ -2,7 +2,7 @@
"name": "devel-system-x86_32-generic",
"description": "A system that is able to build other systems based on the 32-bit x86 architecture.",
"kind": "system",
- "system-kind": "syslinux-disk",
+ "system-kind": "rootfs-tarball",
"arch": "x86_32",
"disk-size": "2G",
"strata": [
diff --git a/devel-system-x86_64-generic.morph b/devel-system-x86_64-generic.morph
index ebaf46ef..48729610 100644
--- a/devel-system-x86_64-generic.morph
+++ b/devel-system-x86_64-generic.morph
@@ -2,7 +2,7 @@
"name": "devel-system-x86_64-generic",
"description": "A system that is able to build other systems based on the 64-bit x86 architecture.",
"kind": "system",
- "system-kind": "syslinux-disk",
+ "system-kind": "rootfs-tarball",
"arch": "x86_64",
"disk-size": "2G",
"strata": [
diff --git a/foundation.morph b/foundation.morph
index 53a77b0e..39e366d1 100644
--- a/foundation.morph
+++ b/foundation.morph
@@ -39,13 +39,13 @@
{
"name": "libffi",
"repo": "upstream:libffi",
- "ref": "master",
+ "ref": "baserock/morph",
"build-depends": []
},
{
"name": "libusbx",
"repo": "upstream:libusbx",
- "ref": "master",
+ "ref": "baserock/morph",
"build-depends": []
},
{
@@ -65,7 +65,7 @@
{
"name": "glib",
"repo": "upstream:glib",
- "ref": "master",
+ "ref": "baserock/morph",
"build-depends": [
"libffi"
]
@@ -125,7 +125,7 @@
{
"name": "libxslt",
"repo": "upstream:libxslt",
- "ref": "master",
+ "ref": "baserock/morph",
"build-depends": []
},
{
diff --git a/nfs.morph b/nfs.morph
index c85877f5..ee6744ea 100644
--- a/nfs.morph
+++ b/nfs.morph
@@ -12,7 +12,7 @@
{
"name": "sqlite3",
"repo": "upstream:sqlite3",
- "ref": "master",
+ "ref": "baserock/morph",
"build-depends": []
},
{
diff --git a/tools.morph b/tools.morph
index abad2c16..007dad52 100644
--- a/tools.morph
+++ b/tools.morph
@@ -13,7 +13,7 @@
{
"name": "lzo",
"repo": "upstream:lzo",
- "ref": "master",
+ "ref": "baserock/morph",
"build-depends": []
},
{
@@ -61,7 +61,7 @@
{
"name": "cliapp",
"repo": "upstream:cliapp",
- "ref": "trunk",
+ "ref": "baserock/morph",
"build-depends": [
"python-coverage-test-runner"
]
@@ -78,7 +78,7 @@
{
"name": "cmake",
"repo": "upstream:cmake",
- "ref": "master",
+ "ref": "baserock/morph",
"build-depends": []
},
{
@@ -92,7 +92,7 @@
{
"name": "distcc",
"repo": "upstream:distcc",
- "ref": "master",
+ "ref": "baserock/morph",
"build-depends": [
"lzo"
]
@@ -100,25 +100,25 @@
{
"name": "e2fsprogs",
"repo": "upstream:e2fsprogs",
- "ref": "master",
+ "ref": "baserock/morph",
"build-depends": []
},
{
"name": "gdb",
"repo": "upstream:gdb",
- "ref": "refs/heads/master",
+ "ref": "baserock/morph",
"build-depends": []
},
{
"name": "less",
"repo": "upstream:less",
- "ref": "master",
+ "ref": "baserock/morph",
"build-depends": []
},
{
"name": "linux-user-chroot",
"repo": "upstream:linux-user-chroot",
- "ref": "master",
+ "ref": "baserock/morph",
"build-depends": []
},
{
@@ -141,7 +141,7 @@
{
"name": "pv",
"repo": "upstream:pv",
- "ref": "master",
+ "ref": "baserock/morph",
"build-depends": []
},
{
@@ -153,7 +153,7 @@
{
"name": "strace",
"repo": "upstream:strace",
- "ref": "master",
+ "ref": "baserock/morph",
"build-depends": []
},
{
@@ -165,7 +165,7 @@
{
"name": "gtk-doc-stub",
"repo": "upstream:gtk-doc-stub",
- "ref": "master",
+ "ref": "baserock/morph",
"build-depends": []
},
{