From 3e19f5fbf7a0bb55faff7f94b4f02e88f637cb00 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Thu, 12 Jul 2012 17:38:27 +0100 Subject: Use liw/fix branch for coreutils while fixing build problem --- devel.morph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devel.morph b/devel.morph index 28e78d2..1d4fc21 100644 --- a/devel.morph +++ b/devel.morph @@ -79,7 +79,7 @@ { "name": "coreutils", "repo": "upstream:coreutils", - "ref": "baserock/morph", + "ref": "liw/fox", "build-depends": [ "make" ] }, { -- cgit v1.2.1 From 71c9f6621f589ae41223cbeada8f7ad968f00177 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Thu, 12 Jul 2012 17:53:23 +0100 Subject: Fix fox --- devel.morph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devel.morph b/devel.morph index 1d4fc21..4b38656 100644 --- a/devel.morph +++ b/devel.morph @@ -79,7 +79,7 @@ { "name": "coreutils", "repo": "upstream:coreutils", - "ref": "liw/fox", + "ref": "liw/fix", "build-depends": [ "make" ] }, { -- cgit v1.2.1 From 12b16edc969733d2f161bb726b671bbcedfdd377 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Fri, 27 Jul 2012 17:00:41 +0100 Subject: Add system-kind fields to all system morphologies --- arm-versatile-base-system.morph | 1 + arm-versatile-devel-system.morph | 1 + x86_64-generic-base-system.morph | 1 + x86_64-generic-devel-system.morph | 1 + x86_64-generic-morph-cache-server-system.morph | 1 + 5 files changed, 5 insertions(+) diff --git a/arm-versatile-base-system.morph b/arm-versatile-base-system.morph index 526a296..d3a48cb 100644 --- a/arm-versatile-base-system.morph +++ b/arm-versatile-base-system.morph @@ -2,6 +2,7 @@ "name": "arm-versatile-base-system", "description": "The set of strata required to have a minimal system for an ARM versatile system.", "kind": "system", + "system-kind": "rootfs-tarball", "arch": "arm", "disk-size": "2G", "strata": [ diff --git a/arm-versatile-devel-system.morph b/arm-versatile-devel-system.morph index 43297eb..0f30c9d 100644 --- a/arm-versatile-devel-system.morph +++ b/arm-versatile-devel-system.morph @@ -2,6 +2,7 @@ "name": "arm-versatile-devel-system", "description": "A system that is able to build other systems based on the ARM versatile architecture.", "kind": "system", + "system-kind": "rootfs-tarball", "arch": "arm", "disk-size": "10G", "strata": [ diff --git a/x86_64-generic-base-system.morph b/x86_64-generic-base-system.morph index f293f3e..aa22d8a 100644 --- a/x86_64-generic-base-system.morph +++ b/x86_64-generic-base-system.morph @@ -2,6 +2,7 @@ "name": "x86_64-generic-base-system", "description": "The set of strata required to have a minimal system for a 64-bit x86 system.", "kind": "system", + "system-kind": "syslinux-disk", "arch": "x86_64", "disk-size": "2G", "disk-size": "10G", diff --git a/x86_64-generic-devel-system.morph b/x86_64-generic-devel-system.morph index 0fc8060..f81d3db 100644 --- a/x86_64-generic-devel-system.morph +++ b/x86_64-generic-devel-system.morph @@ -2,6 +2,7 @@ "name": "x86_64-generic-devel-system", "description": "A system that is able to build other systems based on the 64-bit x86 architecture.", "kind": "system", + "system-kind": "syslinux-disk", "arch": "x86_64", "disk-size": "10G", "strata": [ diff --git a/x86_64-generic-morph-cache-server-system.morph b/x86_64-generic-morph-cache-server-system.morph index c7a55ef..c15fd51 100644 --- a/x86_64-generic-morph-cache-server-system.morph +++ b/x86_64-generic-morph-cache-server-system.morph @@ -2,6 +2,7 @@ "name": "x86_64-generic-morph-cache-server-system", "description": "A system that will be able to provide a remote repository or artifact cache for morph, designed to run on the 64-bit x86 architecture.", "kind": "system", + "system-kind": "syslinux-disk", "arch": "x86_64", "disk-size": "500m", "strata": [ -- cgit v1.2.1