summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--base-system-armv7-versatile.morph5
-rw-r--r--base-system-x86_32-generic.morph5
-rw-r--r--base-system-x86_64-generic.morph5
-rw-r--r--core.morph323
-rw-r--r--devel-system-armv7-versatile.morph5
-rw-r--r--devel-system-x86_32-generic.morph5
-rw-r--r--devel-system-x86_64-generic.morph5
-rw-r--r--foundation.morph154
-rw-r--r--tools.morph66
9 files changed, 268 insertions, 305 deletions
diff --git a/base-system-armv7-versatile.morph b/base-system-armv7-versatile.morph
index 710024a6..04db502d 100644
--- a/base-system-armv7-versatile.morph
+++ b/base-system-armv7-versatile.morph
@@ -17,6 +17,11 @@
"ref": "master"
},
{
+ "morph": "foundation",
+ "repo": "baserock:baserock/morphs",
+ "ref": "master"
+ },
+ {
"morph": "bsp-armv7-versatile",
"repo": "baserock:baserock/morphs",
"ref": "master"
diff --git a/base-system-x86_32-generic.morph b/base-system-x86_32-generic.morph
index 5b914031..23f518d1 100644
--- a/base-system-x86_32-generic.morph
+++ b/base-system-x86_32-generic.morph
@@ -17,6 +17,11 @@
"ref": "master"
},
{
+ "morph": "foundation",
+ "repo": "baserock:baserock/morphs",
+ "ref": "master"
+ },
+ {
"morph": "bsp-x86_32-generic",
"repo": "baserock:baserock/morphs",
"ref": "master"
diff --git a/base-system-x86_64-generic.morph b/base-system-x86_64-generic.morph
index f5ef472e..c41be08c 100644
--- a/base-system-x86_64-generic.morph
+++ b/base-system-x86_64-generic.morph
@@ -17,6 +17,11 @@
"ref": "master"
},
{
+ "morph": "foundation",
+ "repo": "baserock:baserock/morphs",
+ "ref": "master"
+ },
+ {
"morph": "bsp-x86_64-generic",
"repo": "baserock:baserock/morphs",
"ref": "master"
diff --git a/core.morph b/core.morph
index 15abf900..2279b91a 100644
--- a/core.morph
+++ b/core.morph
@@ -1,6 +1,6 @@
{
"name": "core",
- "description": "Core components required to build a Baserock devel system",
+ "description": "Core components of a Baserock base system that are build tools required for the BSP and Foundation strata, but a step above build-essential",
"kind": "stratum",
"build-depends": [
{
@@ -23,18 +23,6 @@
"build-depends": []
},
{
- "name": "gperf",
- "repo": "upstream:gperf",
- "ref": "baserock/morph",
- "build-depends": []
- },
- {
- "name": "libffi",
- "repo": "upstream:libffi",
- "ref": "master",
- "build-depends": []
- },
- {
"name": "m4",
"repo": "upstream:m4",
"ref": "baserock/build-essential",
@@ -53,12 +41,6 @@
"build-depends": []
},
{
- "name": "pciutils",
- "repo": "upstream:pciutils",
- "ref": "baserock/morph",
- "build-depends": []
- },
- {
"name": "perl",
"repo": "upstream:perl",
"ref": "baserock/morph",
@@ -146,16 +128,6 @@
]
},
{
- "name": "libusbx",
- "repo": "upstream:libusbx",
- "ref": "master",
- "build-depends": [
- "autoconf",
- "automake",
- "libtool"
- ]
- },
- {
"name": "libxml2",
"repo": "upstream:libxml2",
"ref": "master",
@@ -174,39 +146,6 @@
]
},
{
- "name": "usbutils",
- "repo": "upstream:usbutils",
- "ref": "baserock/morph",
- "build-depends": [
- "autoconf",
- "automake",
- "libusbx",
- "pkg-config"
- ]
- },
- {
- "name": "xz",
- "repo": "upstream:xz",
- "ref": "baserock/morph",
- "build-depends": [
- "autoconf",
- "automake",
- "gettext",
- "libtool"
- ]
- },
- {
- "name": "attr",
- "repo": "upstream:attr",
- "ref": "baserock/morph",
- "build-depends": [
- "autoconf",
- "automake",
- "gettext",
- "libtool"
- ]
- },
- {
"name": "cpython",
"repo": "upstream:cpython",
"ref": "baserock/morph-2.7",
@@ -228,41 +167,6 @@
]
},
{
- "name": "glib",
- "repo": "upstream:glib",
- "ref": "master",
- "build-depends": [
- "autoconf",
- "automake",
- "cpython",
- "gettext",
- "libffi",
- "libtool",
- "pkg-config",
- "zlib"
- ]
- },
- {
- "name": "kmod",
- "repo": "upstream:kmod",
- "ref": "baserock/morph",
- "build-depends": [
- "autoconf",
- "automake",
- "libtool",
- "pkg-config",
- "zlib"
- ]
- },
- {
- "name": "libcap2",
- "repo": "upstream:libcap2",
- "ref": "baserock/morph",
- "build-depends": [
- "attr"
- ]
- },
- {
"name": "libexpat",
"repo": "upstream:libexpat",
"ref": "baserock/morph",
@@ -273,31 +177,6 @@
]
},
{
- "name": "python-setuptools",
- "repo": "upstream:python-setuptools",
- "ref": "baserock/morph",
- "build-depends": [
- "cpython"
- ]
- },
- {
- "name": "python-ttystatus",
- "repo": "upstream:python-ttystatus",
- "ref": "baserock/morph",
- "build-depends": [
- "cpython"
- ]
- },
- {
- "name": "pyyaml",
- "repo": "upstream:pyyaml",
- "ref": "baserock/morph",
- "build-depends": [
- "cpython",
- "python-setuptools"
- ]
- },
- {
"name": "XML-Parser",
"repo": "upstream:XML-Parser",
"ref": "master",
@@ -308,19 +187,6 @@
]
},
{
- "name": "dbus-pre",
- "repo": "upstream:dbus",
- "ref": "baserock/build-essential",
- "build-depends": [
- "autoconf",
- "automake",
- "glib",
- "libexpat",
- "libtool",
- "pkg-config"
- ]
- },
- {
"name": "git",
"repo": "upstream:git",
"ref": "baserock/morph",
@@ -336,39 +202,6 @@
]
},
{
- "name": "intltool",
- "repo": "upstream:intltool",
- "ref": "baserock/morph",
- "build-depends": [
- "XML-Parser",
- "autoconf",
- "automake",
- "perl"
- ]
- },
- {
- "name": "python-coveragepy",
- "repo": "upstream:python-coveragepy",
- "ref": "baserock/morph",
- "build-depends": [
- "cpython",
- "python-setuptools"
- ]
- },
- {
- "name": "util-linux",
- "repo": "upstream:util-linux",
- "ref": "baserock/morph",
- "build-depends": [
- "autoconf",
- "automake",
- "gettext",
- "git",
- "libtool",
- "pkg-config"
- ]
- },
- {
"name": "bison",
"repo": "upstream:bison",
"ref": "baserock/morph",
@@ -383,167 +216,49 @@
]
},
{
- "name": "gobject-introspection",
- "repo": "upstream:gobject-introspection",
- "ref": "baserock/morph",
- "build-depends": [
- "autoconf",
- "automake",
- "bison",
- "cpython",
- "flex",
- "glib",
- "libtool",
- "pkg-config"
- ]
- },
- {
- "name": "groff",
- "repo": "upstream:groff",
- "ref": "baserock/morph",
- "build-depends": [
- "bison",
- "texinfo-tarball"
- ]
- },
- {
- "name": "python-coverage-test-runner",
- "repo": "upstream:python-coverage-test-runner",
- "ref": "baserock/morph",
- "build-depends": [
- "cpython",
- "python-coveragepy"
- ]
- },
- {
- "name": "systemd",
- "repo": "upstream:systemd",
- "ref": "baserock/morph",
- "build-depends": [
- "autoconf",
- "automake",
- "dbus-pre",
- "gobject-introspection",
- "gperf",
- "intltool",
- "kmod",
- "libcap2",
- "libtool",
- "pciutils",
- "usbutils",
- "util-linux",
- "xz"
- ]
- },
- {
- "name": "cliapp",
- "repo": "upstream:cliapp",
- "ref": "trunk",
- "build-depends": [
- "cpython",
- "python-coverage-test-runner"
- ]
- },
- {
- "name": "cmdtest",
- "repo": "upstream:cmdtest",
- "ref": "baserock/morph",
- "build-depends": [
- "cliapp",
- "cpython",
- "python-ttystatus"
- ]
- },
- {
- "name": "btrfs-progs",
- "repo": "upstream:btrfs-progs",
- "ref": "baserock/morph",
- "build-depends": [
- "attr",
- "util-linux",
- "zlib"
- ]
- },
- {
"name": "bzip2",
"repo": "upstream:bzip2",
"ref": "baserock/morph",
"build-depends": []
},
{
- "name": "dbus",
- "repo": "upstream:dbus",
- "ref": "baserock/build-essential",
- "build-depends": [
- "autoconf",
- "automake",
- "glib",
- "libexpat",
- "libtool",
- "pkg-config",
- "systemd"
- ]
- },
- {
- "name": "gtk-doc-stub",
- "repo": "upstream:gtk-doc-stub",
- "ref": "master",
- "build-depends": [
- "bash"
- ]
+ "name": "gperf",
+ "repo": "upstream:gperf",
+ "ref": "baserock/morph",
+ "build-depends": []
},
{
- "name": "help2man",
- "repo": "upstream:help2man",
+ "name": "intltool",
+ "repo": "upstream:intltool",
"ref": "baserock/morph",
"build-depends": [
+ "XML-Parser",
"autoconf",
- "perl",
- "texinfo-tarball"
+ "automake",
+ "perl"
]
},
{
- "name": "libxslt",
- "repo": "upstream:libxslt",
- "ref": "master",
+ "name": "util-linux",
+ "repo": "upstream:util-linux",
+ "ref": "baserock/morph",
"build-depends": [
"autoconf",
"automake",
- "libtool",
- "libxml2"
- ]
- },
- {
- "name": "morph",
- "repo": "baserock:baserock/morph",
- "ref": "master",
- "build-depends": [
- "cliapp",
- "cmdtest",
+ "gettext",
"git",
- "python-coverage-test-runner",
- "pyyaml"
+ "libtool",
+ "pkg-config"
]
},
{
- "name": "openssh",
- "repo": "upstream:openssh",
+ "name": "xz",
+ "repo": "upstream:xz",
"ref": "baserock/morph",
"build-depends": [
"autoconf",
- "groff",
- "openssl",
- "zlib"
- ]
- },
- {
- "name": "tbdiff",
- "repo": "baserock:baserock/tbdiff",
- "ref": "master",
- "build-depends": [
- "attr",
- "autoconf",
"automake",
+ "gettext",
"libtool"
]
}
diff --git a/devel-system-armv7-versatile.morph b/devel-system-armv7-versatile.morph
index d268259b..fb3a30c5 100644
--- a/devel-system-armv7-versatile.morph
+++ b/devel-system-armv7-versatile.morph
@@ -17,6 +17,11 @@
"ref": "master"
},
{
+ "morph": "foundation",
+ "repo": "baserock:baserock/morphs",
+ "ref": "master"
+ },
+ {
"morph": "bsp-armv7-versatile",
"repo": "baserock:baserock/morphs",
"ref": "master"
diff --git a/devel-system-x86_32-generic.morph b/devel-system-x86_32-generic.morph
index 0a328bc7..ed67df89 100644
--- a/devel-system-x86_32-generic.morph
+++ b/devel-system-x86_32-generic.morph
@@ -17,6 +17,11 @@
"ref": "master"
},
{
+ "morph": "foundation",
+ "repo": "baserock:baserock/morphs",
+ "ref": "master"
+ },
+ {
"morph": "bsp-x86_32-generic",
"repo": "baserock:baserock/morphs",
"ref": "master"
diff --git a/devel-system-x86_64-generic.morph b/devel-system-x86_64-generic.morph
index 33756f39..ebaf46ef 100644
--- a/devel-system-x86_64-generic.morph
+++ b/devel-system-x86_64-generic.morph
@@ -17,6 +17,11 @@
"ref": "master"
},
{
+ "morph": "foundation",
+ "repo": "baserock:baserock/morphs",
+ "ref": "master"
+ },
+ {
"morph": "bsp-x86_64-generic",
"repo": "baserock:baserock/morphs",
"ref": "master"
diff --git a/foundation.morph b/foundation.morph
new file mode 100644
index 00000000..f13cc85a
--- /dev/null
+++ b/foundation.morph
@@ -0,0 +1,154 @@
+{
+ "name": "foundation",
+ "kind": "stratum",
+ "description": "Basic userland runtime system",
+ "build-depends": [
+ {
+ "repo": "baserock:baserock/morphs",
+ "ref": "master",
+ "morph": "core"
+ }
+ ],
+ "chunks": [
+ {
+ "name": "attr",
+ "repo": "upstream:attr",
+ "ref": "baserock/morph",
+ "build-depends": []
+ },
+ {
+ "name": "groff",
+ "repo": "upstream:groff",
+ "ref": "baserock/morph",
+ "build-depends": []
+ },
+ {
+ "name": "kmod",
+ "repo": "upstream:kmod",
+ "ref": "baserock/morph",
+ "build-depends": []
+ },
+ {
+ "name": "libcap2",
+ "repo": "upstream:libcap2",
+ "ref": "baserock/morph",
+ "build-depends": [
+ "attr"
+ ]
+ },
+ {
+ "name": "libffi",
+ "repo": "upstream:libffi",
+ "ref": "master",
+ "build-depends": []
+ },
+ {
+ "name": "libusbx",
+ "repo": "upstream:libusbx",
+ "ref": "master",
+ "build-depends": []
+ },
+ {
+ "name": "pciutils",
+ "repo": "upstream:pciutils",
+ "ref": "baserock/morph",
+ "build-depends": []
+ },
+ {
+ "name": "usbutils",
+ "repo": "upstream:usbutils",
+ "ref": "baserock/morph",
+ "build-depends": [
+ "libusbx"
+ ]
+ },
+ {
+ "name": "glib",
+ "repo": "upstream:glib",
+ "ref": "master",
+ "build-depends": [
+ "libffi"
+ ]
+ },
+ {
+ "name": "gobject-introspection",
+ "repo": "upstream:gobject-introspection",
+ "ref": "baserock/morph",
+ "build-depends": [
+ "glib"
+ ]
+ },
+ {
+ "name": "dbus-pre",
+ "repo": "upstream:dbus",
+ "ref": "baserock/build-essential",
+ "build-depends": [
+ "glib"
+ ]
+ },
+ {
+ "name": "systemd",
+ "repo": "upstream:systemd",
+ "ref": "baserock/morph",
+ "build-depends": [
+ "dbus-pre",
+ "gobject-introspection",
+ "kmod",
+ "libcap2",
+ "pciutils",
+ "usbutils"
+ ]
+ },
+ {
+ "name": "btrfs-progs",
+ "repo": "upstream:btrfs-progs",
+ "ref": "baserock/morph",
+ "build-depends": [
+ "attr"
+ ]
+ },
+ {
+ "name": "dbus",
+ "repo": "upstream:dbus",
+ "ref": "baserock/build-essential",
+ "build-depends": [
+ "glib",
+ "systemd"
+ ]
+ },
+ {
+ "name": "gtk-doc-stub",
+ "repo": "upstream:gtk-doc-stub",
+ "ref": "master",
+ "build-depends": []
+ },
+ {
+ "name": "help2man",
+ "repo": "upstream:help2man",
+ "ref": "baserock/morph",
+ "build-depends": []
+ },
+ {
+ "name": "libxslt",
+ "repo": "upstream:libxslt",
+ "ref": "master",
+ "build-depends": []
+ },
+ {
+ "name": "openssh",
+ "repo": "upstream:openssh",
+ "ref": "baserock/morph",
+ "build-depends": [
+ "groff"
+ ]
+ },
+ {
+ "name": "tbdiff",
+ "repo": "baserock:baserock/tbdiff",
+ "ref": "master",
+ "build-depends": [
+ "attr"
+ ]
+ }
+ ]
+}
diff --git a/tools.morph b/tools.morph
index 96d4272e..e337bf31 100644
--- a/tools.morph
+++ b/tools.morph
@@ -6,7 +6,7 @@
{
"repo": "baserock:baserock/morphs",
"ref": "master",
- "morph": "core"
+ "morph": "foundation"
}
],
"chunks": [
@@ -23,6 +23,59 @@
"build-depends": []
},
{
+ "name": "python-setuptools",
+ "repo": "upstream:python-setuptools",
+ "ref": "baserock/morph",
+ "build-depends": []
+ },
+ {
+ "name": "python-ttystatus",
+ "repo": "upstream:python-ttystatus",
+ "ref": "baserock/morph",
+ "build-depends": []
+ },
+ {
+ "name": "pyyaml",
+ "repo": "upstream:pyyaml",
+ "ref": "baserock/morph",
+ "build-depends": [
+ "python-setuptools"
+ ]
+ },
+ {
+ "name": "python-coveragepy",
+ "repo": "upstream:python-coveragepy",
+ "ref": "baserock/morph",
+ "build-depends": [
+ "python-setuptools"
+ ]
+ },
+ {
+ "name": "python-coverage-test-runner",
+ "repo": "upstream:python-coverage-test-runner",
+ "ref": "baserock/morph",
+ "build-depends": [
+ "python-coveragepy"
+ ]
+ },
+ {
+ "name": "cliapp",
+ "repo": "upstream:cliapp",
+ "ref": "trunk",
+ "build-depends": [
+ "python-coverage-test-runner"
+ ]
+ },
+ {
+ "name": "cmdtest",
+ "repo": "upstream:cmdtest",
+ "ref": "baserock/morph",
+ "build-depends": [
+ "cliapp",
+ "python-ttystatus"
+ ]
+ },
+ {
"name": "cmake",
"repo": "upstream:cmake",
"ref": "master",
@@ -75,6 +128,17 @@
"build-depends": []
},
{
+ "name": "morph",
+ "repo": "baserock:baserock/morph",
+ "ref": "master",
+ "build-depends": [
+ "cliapp",
+ "cmdtest",
+ "python-coverage-test-runner",
+ "pyyaml"
+ ]
+ },
+ {
"name": "pv",
"repo": "upstream:pv",
"ref": "master",
View Lorry Controller Status