summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--base-system-armv7-versatile.morph11
-rw-r--r--base-system-x86_32-generic.morph13
-rw-r--r--base-system-x86_64-generic.morph13
-rw-r--r--bsp-x86_64-generic.morph7
-rw-r--r--build-essential.morph61
-rw-r--r--core.morph (renamed from devel.morph)563
-rw-r--r--devel-system-armv7-versatile.morph17
-rw-r--r--devel-system-x86_32-generic.morph17
-rw-r--r--devel-system-x86_64-generic.morph17
-rw-r--r--foundation.morph182
-rw-r--r--tools.morph108
11 files changed, 525 insertions, 484 deletions
diff --git a/base-system-armv7-versatile.morph b/base-system-armv7-versatile.morph
index 9f49ea8b..7aafc39b 100644
--- a/base-system-armv7-versatile.morph
+++ b/base-system-armv7-versatile.morph
@@ -7,12 +7,17 @@
"disk-size": "2G",
"strata": [
{
- "morph": "bsp-armv7-versatile",
+ "morph": "build-essential",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/samthursfield/build-essential"
+ },
+ {
+ "morph": "core",
+ "repo": "baserock:baserock/morphs",
+ "ref": "baserock/samthursfield/build-essential"
},
{
- "morph": "foundation",
+ "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 b1af9feb..548a5d65 100644
--- a/base-system-x86_32-generic.morph
+++ b/base-system-x86_32-generic.morph
@@ -7,14 +7,19 @@
"disk-size": "2G",
"strata": [
{
- "morph": "bsp-x86_32-generic",
+ "morph": "build-essential",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/samthursfield/build-essential"
},
{
- "morph": "foundation",
+ "morph": "core",
+ "repo": "baserock:baserock/morphs",
+ "ref": "baserock/samthursfield/build-essential"
+ },
+ {
+ "morph": "bsp-x86_32-generic",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/samthursfield/build-essential"
}
]
}
diff --git a/base-system-x86_64-generic.morph b/base-system-x86_64-generic.morph
index 94c93ff1..68fc7761 100644
--- a/base-system-x86_64-generic.morph
+++ b/base-system-x86_64-generic.morph
@@ -7,14 +7,19 @@
"disk-size": "2G",
"strata": [
{
- "morph": "bsp-x86_64-generic",
+ "morph": "build-essential",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/samthursfield/build-essential"
},
{
- "morph": "foundation",
+ "morph": "core",
+ "repo": "baserock:baserock/morphs",
+ "ref": "baserock/samthursfield/build-essential"
+ },
+ {
+ "morph": "bsp-x86_64-generic",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/samthursfield/build-essential"
}
]
}
diff --git a/bsp-x86_64-generic.morph b/bsp-x86_64-generic.morph
index 954b7b54..ae477fe2 100644
--- a/bsp-x86_64-generic.morph
+++ b/bsp-x86_64-generic.morph
@@ -2,6 +2,13 @@
"name": "bsp-x86_64-generic",
"description": "The set of platform specific components required for booting a 64-bit x86 based system.",
"kind": "stratum",
+ "build-depends": [
+ {
+ "repo": "baserock:baserock/morphs",
+ "ref": "baserock/samthursfield/build-essential",
+ "morph": "core"
+ }
+ ],
"chunks": [
{
"name": "linux",
diff --git a/build-essential.morph b/build-essential.morph
new file mode 100644
index 00000000..5a3fb2c0
--- /dev/null
+++ b/build-essential.morph
@@ -0,0 +1,61 @@
+{
+ "name": "build-essential",
+ "description": "Toolchain stratum",
+ "kind": "stratum",
+ "chunks": [
+ {
+ "name": "binutils",
+ "repo": "upstream:binutils-redhat",
+ "ref": "baserock/build-essential",
+ "build-depends": []
+ },
+ {
+ "name": "busybox",
+ "repo": "upstream:busybox",
+ "ref": "baserock/build-essential",
+ "build-depends": []
+ },
+ {
+ "name": "eglibc",
+ "repo": "upstream:eglibc2",
+ "ref": "baserock/2.15-build-essential",
+ "build-depends": []
+ },
+ {
+ "name": "fhs-dirs",
+ "repo": "baserock:baserock/fhs-dirs",
+ "ref": "master",
+ "build-depends": []
+ },
+ {
+ "name": "gcc",
+ "repo": "upstream:gcc-tarball",
+ "ref": "baserock/build-essential",
+ "build-depends": []
+ },
+ {
+ "name": "linux-api-headers",
+ "repo": "upstream:linux",
+ "ref": "baserock/build-essential",
+ "build-depends": []
+ },
+ {
+ "name": "gawk",
+ "repo": "upstream:gawk",
+ "ref": "baserock/build-essential",
+ "build-depends": []
+ },
+ {
+ "name": "make",
+ "repo": "upstream:make",
+ "ref": "baserock/build-essential",
+ "build-depends": []
+ },
+ {
+ "name": "ccache",
+ "repo": "upstream:ccache",
+ "ref": "baserock/build-essential",
+ "build-depends": []
+ }
+ ]
+}
diff --git a/devel.morph b/core.morph
index c789c5b8..29811389 100644
--- a/devel.morph
+++ b/core.morph
@@ -1,135 +1,116 @@
{
- "name": "devel",
- "description": "The set of programs that, when combined with foundation, are able to build devel and foundation. This is somewhat analogous to debian's build-essential",
+ "name": "core",
+ "description": "Core components required to build a Baserock devel system",
"kind": "stratum",
+ "build-depends": [
+ {
+ "repo": "baserock:baserock/morphs",
+ "ref": "baserock/samthursfield/build-essential",
+ "morph": "build-essential"
+ }
+ ],
"chunks": [
{
- "name": "linux-api-headers",
- "repo": "upstream:linux",
- "ref": "baserock/3.2-headers",
+ "name": "gdbm",
+ "repo": "upstream:gdbm",
+ "ref": "baserock/build-essential",
"build-depends": []
},
{
- "name": "eglibc",
- "repo": "upstream:eglibc2",
- "ref": "baserock/2.15-morph",
- "build-depends": [
- "linux-api-headers"
- ]
- },
- {
- "name": "binutils",
- "repo": "upstream:binutils-redhat",
- "ref": "baserock/morph",
- "build-depends": [
- "eglibc"
- ]
+ "name": "gettext",
+ "repo": "upstream:gettext",
+ "ref": "baserock/build-essential",
+ "build-depends": []
},
{
- "name": "gmp",
- "repo": "upstream:gmp",
+ "name": "gperf",
+ "repo": "upstream:gperf",
"ref": "baserock/morph",
- "build-depends": [
- "eglibc"
- ]
+ "build-depends": []
},
{
- "name": "mpfr",
- "repo": "upstream:mpfr",
- "ref": "baserock/morph",
- "build-depends": [
- "gmp"
- ]
+ "name": "libffi",
+ "repo": "upstream:libffi",
+ "ref": "master",
+ "build-depends": []
},
{
- "name": "mpc",
- "repo": "upstream:mpc",
- "ref": "baserock/morph",
- "build-depends": [
- "mpfr"
- ]
+ "name": "m4",
+ "repo": "upstream:m4",
+ "ref": "baserock/build-essential",
+ "build-depends": []
},
{
- "name": "gcc",
- "repo": "upstream:gcc-tarball",
- "ref": "baserock/morph",
- "build-depends": [
- "mpc",
- "binutils",
- "eglibc"
- ]
+ "name": "mini-utils",
+ "repo": "baserock:baserock/mini-utils",
+ "ref": "master",
+ "build-depends": []
},
{
- "name": "ccache",
- "repo": "upstream:ccache",
+ "name": "ncurses",
+ "repo": "upstream:ncurses",
"ref": "baserock/morph",
- "build-depends": [
- "gcc"
- ]
+ "build-depends": []
},
{
- "name": "make",
- "repo": "upstream:make",
+ "name": "pciutils",
+ "repo": "upstream:pciutils",
"ref": "baserock/morph",
- "build-depends": [
- "gcc"
- ]
+ "build-depends": []
},
{
- "name": "patch",
- "repo": "upstream:patch",
+ "name": "perl",
+ "repo": "upstream:perl",
"ref": "baserock/morph",
"build-depends": [
- "make"
+ "gdbm"
]
},
{
- "name": "ncurses",
- "repo": "upstream:ncurses",
- "ref": "baserock/morph",
- "build-depends": [
- "make"
- ]
+ "name": "pkg-config",
+ "repo": "upstream:pkg-config",
+ "ref": "baserock/build-essential",
+ "build-depends": []
},
{
- "name": "gperf",
- "repo": "upstream:gperf",
+ "name": "readline",
+ "repo": "upstream:readline",
"ref": "baserock/morph",
"build-depends": [
- "make"
+ "ncurses"
]
},
{
- "name": "coreutils",
- "repo": "upstream:coreutils",
+ "name": "texinfo-tarball",
+ "repo": "upstream:texinfo-tarball",
"ref": "baserock/morph",
"build-depends": [
- "make"
+ "ncurses"
]
},
{
- "name": "m4",
- "repo": "upstream:m4",
+ "name": "zlib",
+ "repo": "upstream:zlib",
"ref": "baserock/morph",
- "build-depends": [
- "make"
- ]
+ "build-depends": []
},
{
- "name": "bison",
- "repo": "upstream:bison",
- "ref": "baserock/morph",
+ "name": "autoconf",
+ "repo": "upstream:autoconf",
+ "ref": "baserock/build-essential",
"build-depends": [
- "make"
+ "m4",
+ "perl"
]
},
{
- "name": "readline",
- "repo": "upstream:readline",
+ "name": "automake",
+ "repo": "upstream:automake",
"ref": "baserock/morph",
"build-depends": [
- "make",
- "ncurses"
+ "autoconf",
+ "perl",
+ "texinfo-tarball"
]
},
{
@@ -137,205 +118,223 @@
"repo": "upstream:bash",
"ref": "baserock/morph",
"build-depends": [
- "make",
"readline"
]
},
{
- "name": "gdbm",
- "repo": "upstream:gdbm",
- "ref": "baserock/morph",
- "build-depends": [
- "make"
- ]
- },
- {
- "name": "perl",
- "repo": "upstream:perl",
- "ref": "baserock/morph",
+ "name": "error-perl-tarball",
+ "repo": "upstream:error-perl-tarball",
+ "ref": "master",
"build-depends": [
- "make",
- "gdbm"
+ "perl"
]
},
{
- "name": "autoconf",
- "repo": "upstream:autoconf",
- "ref": "baserock/morph",
+ "name": "flex",
+ "repo": "upstream:flex",
+ "ref": "baserock/build-essential",
"build-depends": [
"m4"
]
},
{
- "name": "automake",
- "repo": "upstream:automake",
- "ref": "baserock/morph",
- "build-depends": [
- "autoconf",
- "perl"
- ]
- },
- {
"name": "libtool",
"repo": "upstream:libtool",
- "ref": "baserock/morph",
+ "ref": "baserock/build-essential",
"build-depends": [
"bash"
]
},
{
- "name": "gawk",
- "repo": "upstream:gawk",
- "ref": "baserock/morph",
+ "name": "libusbx",
+ "repo": "upstream:libusbx",
+ "ref": "master",
"build-depends": [
- "make"
+ "autoconf",
+ "automake",
+ "libtool"
]
},
{
- "name": "help2man",
- "repo": "upstream:help2man",
- "ref": "baserock/morph",
+ "name": "libxml2",
+ "repo": "upstream:libxml2",
+ "ref": "master",
"build-depends": [
- "perl"
+ "autoconf",
+ "automake",
+ "libtool"
]
},
{
- "name": "flex",
- "repo": "upstream:flex",
+ "name": "openssl",
+ "repo": "upstream:openssl",
"ref": "baserock/morph",
"build-depends": [
- "make"
+ "perl"
]
},
{
- "name": "gettext",
- "repo": "upstream:gettext",
+ "name": "usbutils",
+ "repo": "upstream:usbutils",
"ref": "baserock/morph",
"build-depends": [
- "make",
- "perl"
+ "autoconf",
+ "automake",
+ "libusbx",
+ "pkg-config"
]
},
{
- "name": "pkg-config",
- "repo": "upstream:pkg-config",
+ "name": "xz",
+ "repo": "upstream:xz",
"ref": "baserock/morph",
"build-depends": [
- "make"
+ "autoconf",
+ "automake",
+ "gettext",
+ "libtool"
]
},
{
- "name": "linux-user-chroot",
- "repo": "upstream:linux-user-chroot",
- "ref": "master",
+ "name": "attr",
+ "repo": "upstream:attr",
+ "ref": "baserock/morph",
"build-depends": [
- "make",
"autoconf",
"automake",
+ "gettext",
"libtool"
]
},
{
- "name": "groff",
- "repo": "upstream:groff",
+ "name": "cpython",
+ "repo": "upstream:cpython",
+ "ref": "baserock/morph-2.7",
+ "build-depends": [
+ "openssl",
+ "readline",
+ "zlib"
+ ]
+ },
+ {
+ "name": "curl",
+ "repo": "upstream:curl",
"ref": "baserock/morph",
"build-depends": [
- "make"
+ "autoconf",
+ "automake",
+ "libtool",
+ "openssl"
]
},
{
- "name": "gtk-doc-stub",
- "repo": "upstream:gtk-doc-stub",
+ "name": "glib",
+ "repo": "upstream:glib",
"ref": "master",
"build-depends": [
- "bash",
- "make"
+ "autoconf",
+ "automake",
+ "cpython",
+ "gettext",
+ "libffi",
+ "libtool",
+ "pkg-config",
+ "zlib"
]
},
{
- "name": "texinfo-tarball",
- "repo": "upstream:texinfo-tarball",
+ "name": "kmod",
+ "repo": "upstream:kmod",
"ref": "baserock/morph",
"build-depends": [
- "make"
+ "autoconf",
+ "automake",
+ "libtool",
+ "pkg-config",
+ "zlib"
]
},
{
- "name": "vim",
- "repo": "upstream:vim",
+ "name": "libcap2",
+ "repo": "upstream:libcap2",
"ref": "baserock/morph",
"build-depends": [
- "make",
- "ncurses",
- "texinfo-tarball"
+ "attr"
]
},
{
- "name": "openssl",
- "repo": "upstream:openssl",
+ "name": "libexpat",
+ "repo": "upstream:libexpat",
"ref": "baserock/morph",
"build-depends": [
- "make"
+ "autoconf",
+ "automake",
+ "libtool"
]
},
{
- "name": "curl",
- "repo": "upstream:curl",
+ "name": "python-setuptools",
+ "repo": "upstream:python-setuptools",
"ref": "baserock/morph",
"build-depends": [
- "make",
- "openssl"
+ "cpython"
]
},
{
- "name": "cpython",
- "repo": "upstream:cpython",
- "ref": "baserock/morph-2.7",
+ "name": "python-ttystatus",
+ "repo": "upstream:python-ttystatus",
+ "ref": "baserock/morph",
"build-depends": [
- "make",
- "readline",
- "openssl"
+ "cpython"
]
},
{
- "name": "error-perl-tarball",
- "repo": "upstream:error-perl-tarball",
+ "name": "XML-Parser",
+ "repo": "upstream:XML-Parser",
"ref": "master",
"build-depends": [
+ "libexpat",
+ "libxml2",
"perl"
]
},
{
- "name": "git",
- "repo": "upstream:git",
- "ref": "baserock/morph",
+ "name": "dbus-pre",
+ "repo": "upstream:dbus",
+ "ref": "baserock/build-essential",
"build-depends": [
- "make",
- "openssl",
- "curl",
- "cpython",
- "error-perl-tarball"
+ "autoconf",
+ "automake",
+ "glib",
+ "libexpat",
+ "libtool",
+ "pkg-config"
]
},
{
- "name": "openssh",
- "repo": "upstream:openssh",
+ "name": "git",
+ "repo": "upstream:git",
"ref": "baserock/morph",
"build-depends": [
- "make",
"autoconf",
- "automake",
- "libtool",
+ "cpython",
+ "curl",
+ "error-perl-tarball",
"gettext",
- "openssl"
+ "libexpat",
+ "openssl",
+ "zlib"
]
},
{
- "name": "python-setuptools",
- "repo": "upstream:python-setuptools",
+ "name": "intltool",
+ "repo": "upstream:intltool",
"ref": "baserock/morph",
"build-depends": [
- "cpython"
+ "XML-Parser",
+ "autoconf",
+ "automake",
+ "perl"
]
},
{
@@ -348,175 +347,193 @@
]
},
{
- "name": "python-coverage-test-runner",
- "repo": "upstream:python-coverage-test-runner",
+ "name": "util-linux",
+ "repo": "upstream:util-linux",
"ref": "baserock/morph",
"build-depends": [
- "cpython",
- "python-coveragepy"
- ]
- },
- {
- "name": "cliapp",
- "repo": "upstream:cliapp",
- "ref": "trunk",
- "build-depends": [
- "cpython",
- "python-coverage-test-runner"
+ "autoconf",
+ "automake",
+ "gettext",
+ "git",
+ "libtool",
+ "pkg-config"
]
},
{
- "name": "python-ttystatus",
- "repo": "upstream:python-ttystatus",
+ "name": "bison",
+ "repo": "upstream:bison",
"ref": "baserock/morph",
"build-depends": [
- "cpython"
+ "autoconf",
+ "automake",
+ "bash",
+ "flex",
+ "gettext",
+ "git",
+ "mini-utils"
]
},
{
- "name": "cmdtest",
- "repo": "upstream:cmdtest",
+ "name": "gobject-introspection",
+ "repo": "upstream:gobject-introspection",
"ref": "baserock/morph",
"build-depends": [
+ "autoconf",
+ "automake",
+ "bison",
"cpython",
- "python-ttystatus"
+ "flex",
+ "glib",
+ "libtool",
+ "pkg-config"
]
},
{
- "name": "libxml2",
- "repo": "upstream:libxml2",
- "ref": "master",
+ "name": "groff",
+ "repo": "upstream:groff",
+ "ref": "baserock/morph",
"build-depends": [
- "make"
+ "bison",
+ "texinfo-tarball"
]
},
{
- "name": "libxslt",
- "repo": "upstream:libxslt",
- "ref": "master",
+ "name": "python-coverage-test-runner",
+ "repo": "upstream:python-coverage-test-runner",
+ "ref": "baserock/morph",
"build-depends": [
- "libxml2"
+ "cpython",
+ "python-coveragepy"
]
},
{
- "name": "XML-Parser",
- "repo": "upstream:XML-Parser",
- "ref": "master",
+ "name": "systemd",
+ "repo": "upstream:systemd",
+ "ref": "baserock/morph",
"build-depends": [
- "make",
- "perl",
- "libxml2"
+ "autoconf",
+ "automake",
+ "dbus-pre",
+ "gobject-introspection",
+ "gperf",
+ "intltool",
+ "kmod",
+ "libcap2",
+ "libtool",
+ "pciutils",
+ "usbutils",
+ "util-linux",
+ "xz"
]
},
{
- "name": "intltool",
- "repo": "upstream:intltool",
- "ref": "baserock/morph",
+ "name": "cliapp",
+ "repo": "upstream:cliapp",
+ "ref": "trunk",
"build-depends": [
- "perl",
- "XML-Parser"
+ "cpython",
+ "python-coverage-test-runner"
]
},
{
- "name": "morph",
- "repo": "baserock:baserock/morph",
- "ref": "master",
+ "name": "cmdtest",
+ "repo": "upstream:cmdtest",
+ "ref": "baserock/morph",
"build-depends": [
"cliapp",
- "cmdtest",
- "python-coverage-test-runner"
+ "cpython",
+ "python-ttystatus"
]
},
{
- "name": "pv",
- "repo": "upstream:pv",
- "ref": "master",
+ "name": "btrfs-progs",
+ "repo": "upstream:btrfs-progs",
+ "ref": "baserock/morph",
"build-depends": [
- "make"
+ "attr",
+ "util-linux",
+ "zlib"
]
},
{
- "name": "lzo",
- "repo": "upstream:lzo",
- "ref": "master",
- "build-depends": [
- "make"
- ]
+ "name": "bzip2",
+ "repo": "upstream:bzip2",
+ "ref": "baserock/morph",
+ "build-depends": []
},
{
- "name": "distcc",
- "repo": "upstream:distcc",
- "ref": "master",
+ "name": "dbus",
+ "repo": "upstream:dbus",
+ "ref": "baserock/build-essential",
"build-depends": [
- "make",
- "lzo"
+ "autoconf",
+ "automake",
+ "glib",
+ "libexpat",
+ "libtool",
+ "pkg-config",
+ "systemd"
]
},
{
- "name": "strace",
- "repo": "upstream:strace",
+ "name": "gtk-doc-stub",
+ "repo": "upstream:gtk-doc-stub",
"ref": "master",
"build-depends": [
- "make"
+ "bash"
]
},
{
- "name": "vala",
- "repo": "upstream:vala",
- "ref": "master",
+ "name": "help2man",
+ "repo": "upstream:help2man",
+ "ref": "baserock/morph",
"build-depends": [
"autoconf",
- "automake",
- "make"
+ "perl",
+ "texinfo-tarball"
]
},
{
- "name": "cmake",
- "repo": "upstream:cmake",
+ "name": "libxslt",
+ "repo": "upstream:libxslt",
"ref": "master",
"build-depends": [
- "bash",
- "make"
+ "autoconf",
+ "automake",
+ "libtool",
+ "libxml2"
]
},
{
- "name": "less",
- "repo": "upstream:less",
+ "name": "morph",
+ "repo": "baserock:baserock/morph",
"ref": "master",
"build-depends": [
- "make"
- ]
- },
- {
- "name": "lsof",
- "repo": "upstream:lsof",
- "ref": "baserock/morph",
- "build-depends": [
- "make"
+ "cliapp",
+ "cmdtest",
+ "python-coverage-test-runner"
]
},
{
- "name": "rsync",
- "repo": "upstream:rsync",
+ "name": "openssh",
+ "repo": "upstream:openssh",
"ref": "baserock/morph",
"build-depends": [
- "make"
- ]
- },
- {
- "name": "gdb",
- "repo": "upstream:gdb",
- "ref": "refs/heads/master",
- "build-depends": [
- "make"
+ "autoconf",
+ "groff",
+ "openssl",
+ "zlib"
]
},
{
- "name": "e2fsprogs",
- "repo": "upstream:e2fsprogs",
+ "name": "tbdiff",
+ "repo": "baserock:baserock/tbdiff",
"ref": "master",
"build-depends": [
- "make"
+ "attr",
+ "autoconf",
+ "automake",
+ "libtool"
]
}
]
diff --git a/devel-system-armv7-versatile.morph b/devel-system-armv7-versatile.morph
index 5d799fcb..343b3667 100644
--- a/devel-system-armv7-versatile.morph
+++ b/devel-system-armv7-versatile.morph
@@ -7,19 +7,24 @@
"disk-size": "2G",
"strata": [
{
- "morph": "bsp-armv7-versatile",
+ "morph": "build-essential",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/samthursfield/build-essential"
},
{
- "morph": "foundation",
+ "morph": "core",
+ "repo": "baserock:baserock/morphs",
+ "ref": "baserock/samthursfield/build-essential"
+ },
+ {
+ "morph": "bsp-armv7-versatile",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/samthursfield/build-essential"
},
{
- "morph": "devel",
+ "morph": "tools",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/samthursfield/build-essential"
}
]
}
diff --git a/devel-system-x86_32-generic.morph b/devel-system-x86_32-generic.morph
index 99e23ef0..6c6b06ef 100644
--- a/devel-system-x86_32-generic.morph
+++ b/devel-system-x86_32-generic.morph
@@ -7,19 +7,24 @@
"disk-size": "2G",
"strata": [
{
- "morph": "bsp-x86_32-generic",
+ "morph": "build-essential",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/samthursfield/build-essential"
},
{
- "morph": "foundation",
+ "morph": "core",
+ "repo": "baserock:baserock/morphs",
+ "ref": "baserock/samthursfield/build-essential"
+ },
+ {
+ "morph": "bsp-x86_32-generic",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/samthursfield/build-essential"
},
{
- "morph": "devel",
+ "morph": "tools",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/samthursfield/build-essential"
}
]
}
diff --git a/devel-system-x86_64-generic.morph b/devel-system-x86_64-generic.morph
index c9bcda6b..2da2d1f3 100644
--- a/devel-system-x86_64-generic.morph
+++ b/devel-system-x86_64-generic.morph
@@ -7,19 +7,24 @@
"disk-size": "2G",
"strata": [
{
- "morph": "bsp-x86_64-generic",
+ "morph": "build-essential",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/samthursfield/build-essential"
},
{
- "morph": "foundation",
+ "morph": "core",
+ "repo": "baserock:baserock/morphs",
+ "ref": "baserock/samthursfield/build-essential"
+ },
+ {
+ "morph": "bsp-x86_64-generic",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/samthursfield/build-essential"
},
{
- "morph": "devel",
+ "morph": "tools",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/samthursfield/build-essential"
}
]
}
diff --git a/foundation.morph b/foundation.morph
deleted file mode 100644
index 7176320b..00000000
--- a/foundation.morph
+++ /dev/null
@@ -1,182 +0,0 @@
-{
- "name": "foundation",
- "description": "The components that go into every system. This is a balance between minimal and functional. It should be platform independent.",
- "kind": "stratum",
- "chunks": [
- {
- "name": "fhs-dirs",
- "repo": "baserock:baserock/fhs-dirs",
- "ref": "master",
- "build-depends": []
- },
- {
- "name": "eglibc",
- "repo": "upstream:eglibc2",
- "ref": "baserock/2.15-morph",
- "build-depends": []
- },
- {
- "name": "zlib",
- "repo": "upstream:zlib",
- "ref": "baserock/morph",
- "build-depends": [
- "eglibc"
- ]
- },
- {
- "name": "busybox",
- "repo": "upstream:busybox",
- "ref": "baserock/morph",
- "build-depends": [
- "eglibc"
- ]
- },
- {
- "name": "kmod",
- "repo": "upstream:kmod",
- "ref": "baserock/morph",
- "build-depends": [
- "eglibc"
- ]
- },
- {
- "name": "attr",
- "repo": "upstream:attr",
- "ref": "baserock/morph",
- "build-depends": [
- "eglibc"
- ]
- },
- {
- "name": "util-linux",
- "repo": "upstream:util-linux",
- "ref": "baserock/morph",
- "build-depends": [
- "eglibc"
- ]
- },
- {
- "name": "libcap2",
- "repo": "upstream:libcap2",
- "ref": "baserock/morph",
- "build-depends": [
- "eglibc",
- "attr"
- ]
- },
- {
- "name": "btrfs-progs",
- "repo": "upstream:btrfs-progs",
- "ref": "baserock/morph",
- "build-depends": [
- "eglibc",
- "attr"
- ]
- },
- {
- "name": "tbdiff",
- "repo": "baserock:baserock/tbdiff",
- "ref": "master",
- "build-depends": [
- "eglibc",
- "attr"
- ]
- },
- {
- "name": "libusbx",
- "repo": "upstream:libusbx",
- "ref": "master",
- "build-depends": [
- "eglibc"
- ]
- },
- {
- "name": "usbutils",
- "repo": "upstream:usbutils",
- "ref": "baserock/morph",
- "build-depends": [
- "eglibc",
- "libusbx"
- ]
- },
- {
- "name": "pciutils",
- "repo": "upstream:pciutils",
- "ref": "baserock/morph",
- "build-depends": [
- "eglibc"
- ]
- },
- {
- "name": "libffi",
- "repo": "upstream:libffi",
- "ref": "master",
- "build-depends": [
- "eglibc"
- ]
- },
- {
- "name": "libexpat",
- "repo": "upstream:libexpat",
- "ref": "baserock/morph",
- "build-depends": [
- "eglibc"
- ]
- },
- {
- "name": "glib",
- "repo": "upstream:glib",
- "ref": "master",
- "build-depends": [
- "eglibc",
- "libffi"
- ]
- },
- {
- "name": "dbus",
- "repo": "upstream:dbus",
- "ref": "baserock/morph",
- "build-depends": [
- "libexpat",
- "glib"
- ]
- },
- {
- "name": "gobject-introspection",
- "repo": "upstream:gobject-introspection",
- "ref": "baserock/morph",
- "build-depends": [
- "glib"
- ]
- },
- {
- "name": "xz",
- "repo": "upstream:xz",
- "ref": "baserock/morph",
- "build-depends": []
- },
- {
- "name": "systemd",
- "repo": "upstream:systemd",
- "ref": "baserock/morph",
- "build-depends": [
- "xz",
- "dbus",
- "gobject-introspection",
- "kmod",
- "util-linux",
- "libcap2",
- "usbutils",
- "pciutils"
- ]
- },
- {
- "name": "bzip2",
- "repo": "upstream:bzip2",
- "ref": "baserock/morph",
- "build-depends": [
- "eglibc"
- ]
- }
- ]
-}
diff --git a/tools.morph b/tools.morph
new file mode 100644
index 00000000..7f64489e
--- /dev/null
+++ b/tools.morph
@@ -0,0 +1,108 @@
+{
+ "name": "tools",
+ "description": "Extra development tools included in the devel system",
+ "kind": "stratum",
+ "build-depends": [
+ {
+ "repo": "baserock:baserock/morphs",
+ "ref": "baserock/samthursfield/build-essential",
+ "morph": "core"
+ }
+ ],
+ "chunks": [
+ {
+ "name": "lzo",
+ "repo": "upstream:lzo",
+ "ref": "master",
+ "build-depends": []
+ },
+ {
+ "name": "patch",
+ "repo": "upstream:patch",
+ "ref": "baserock/morph",
+ "build-depends": []
+ },
+ {
+ "name": "cmake",
+ "repo": "upstream:cmake",
+ "ref": "master",
+ "build-depends": []
+ },
+ {
+ "name": "coreutils",
+ "repo": "upstream:coreutils",
+ "ref": "baserock/morph",
+ "build-depends": [
+ "patch"
+ ]
+ },
+ {
+ "name": "distcc",
+ "repo": "upstream:distcc",
+ "ref": "master",
+ "build-depends": [
+ "lzo"
+ ]
+ },
+ {
+ "name": "e2fsprogs",
+ "repo": "upstream:e2fsprogs",
+ "ref": "master",
+ "build-depends": []
+ },
+ {
+ "name": "gdb",
+ "repo": "upstream:gdb",
+ "ref": "refs/heads/master",
+ "build-depends": []
+ },
+ {
+ "name": "less",
+ "repo": "upstream:less",
+ "ref": "master",
+ "build-depends": []
+ },
+ {
+ "name": "linux-user-chroot",
+ "repo": "upstream:linux-user-chroot",
+ "ref": "master",
+ "build-depends": []
+ },
+ {
+ "name": "lsof",
+ "repo": "upstream:lsof",
+ "ref": "baserock/morph",
+ "build-depends": []
+ },
+ {
+ "name": "pv",
+ "repo": "upstream:pv",
+ "ref": "master",
+ "build-depends": []
+ },
+ {
+ "name": "rsync",
+ "repo": "upstream:rsync",
+ "ref": "baserock/morph",
+ "build-depends": []
+ },
+ {
+ "name": "strace",
+ "repo": "upstream:strace",
+ "ref": "master",
+ "build-depends": []
+ },
+ {
+ "name": "vala",
+ "repo": "upstream:vala",
+ "ref": "baserock/bootstrap",
+ "build-depends": []
+ },
+ {
+ "name": "vim",
+ "repo": "upstream:vim",
+ "ref": "baserock/morph",
+ "build-depends": []
+ }
+ ]
+}
View Lorry Controller Status