From adac44f6248996d0d45d0bb87af3a689122f7027 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Fri, 1 Feb 2013 13:10:56 +0000 Subject: Split 'foundation' stratum back out of 'core' Mixing together the set of build tools required to build the base system and the components in the base system itself has one big issue: changing any component of the base system triggers a rebuild of every higher stratum, which even for simple Baserock systems means constantly rebuilding Linux. To solve this, I have turned 'core' into a sort of larger version of build-essential (I am considering renaming it to 'build-core' or even just 'build'). Chunks which are required for running a base system but not during the build of other components are now in the resurrected 'foundation' stratum, along with their specific dependencies (which stratum a chunk should go in is roughly decided by its utility to chunks outside of foundation). --- foundation.morph | 226 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 226 insertions(+) create mode 100644 foundation.morph (limited to 'foundation.morph') diff --git a/foundation.morph b/foundation.morph new file mode 100644 index 00000000..1a5b53f5 --- /dev/null +++ b/foundation.morph @@ -0,0 +1,226 @@ +{ + "name": "foundation", + "kind": "stratum", + "description": "Non-build components of a Baserock base system", + "build-depends": [ + { + "repo": "baserock:baserock/morphs", + "ref": "baserock/samthursfield/minimal-core", + "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": "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": "usbutils", + "repo": "upstream:usbutils", + "ref": "baserock/morph", + "build-depends": [ + "libusbx" + ] + }, + { + "name": "util-linux", + "repo": "upstream:util-linux", + "ref": "baserock/morph", + "build-depends": [] + }, + { + "name": "glib", + "repo": "upstream:glib", + "ref": "master", + "build-depends": [ + "libffi" + ] + }, + { + "name": "gobject-introspection", + "repo": "upstream:gobject-introspection", + "ref": "baserock/morph", + "build-depends": [ + "glib" + ] + }, + { + "name": "python-coveragepy", + "repo": "upstream:python-coveragepy", + "ref": "baserock/morph", + "build-depends": [ + "python-setuptools" + ] + }, + { + "name": "dbus-pre", + "repo": "upstream:dbus", + "ref": "baserock/build-essential", + "build-depends": [ + "glib" + ] + }, + { + "name": "python-coverage-test-runner", + "repo": "upstream:python-coverage-test-runner", + "ref": "baserock/morph", + "build-depends": [ + "python-coveragepy" + ] + }, + { + "name": "systemd", + "repo": "upstream:systemd", + "ref": "baserock/morph", + "build-depends": [ + "dbus-pre", + "gobject-introspection", + "kmod", + "libcap2", + "pciutils", + "usbutils", + "util-linux" + ] + }, + { + "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": "btrfs-progs", + "repo": "upstream:btrfs-progs", + "ref": "baserock/morph", + "build-depends": [ + "attr", + "util-linux" + ] + }, + { + "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": "morph", + "repo": "baserock:baserock/morph", + "ref": "master", + "build-depends": [ + "cliapp", + "cmdtest", + "python-coverage-test-runner", + "pyyaml" + ] + }, + { + "name": "openssh", + "repo": "upstream:openssh", + "ref": "baserock/morph", + "build-depends": [ + "groff" + ] + }, + { + "name": "tbdiff", + "repo": "baserock:baserock/tbdiff", + "ref": "master", + "build-depends": [ + "attr" + ] + } + ] +} -- cgit v1.2.1 From e02c0d120f1615f1eb9e3c4f45294e01f11fe98e Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Fri, 1 Feb 2013 13:47:03 +0000 Subject: Move Morph from 'foundation' back to 'tools' Morph isn't necessary for a Baserock base system and shouldn't ever be. --- foundation.morph | 64 -------------------------------------------------------- 1 file changed, 64 deletions(-) (limited to 'foundation.morph') diff --git a/foundation.morph b/foundation.morph index 1a5b53f5..1ed1a157 100644 --- a/foundation.morph +++ b/foundation.morph @@ -54,26 +54,6 @@ "ref": "baserock/morph", "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": "usbutils", "repo": "upstream:usbutils", @@ -104,14 +84,6 @@ "glib" ] }, - { - "name": "python-coveragepy", - "repo": "upstream:python-coveragepy", - "ref": "baserock/morph", - "build-depends": [ - "python-setuptools" - ] - }, { "name": "dbus-pre", "repo": "upstream:dbus", @@ -120,14 +92,6 @@ "glib" ] }, - { - "name": "python-coverage-test-runner", - "repo": "upstream:python-coverage-test-runner", - "ref": "baserock/morph", - "build-depends": [ - "python-coveragepy" - ] - }, { "name": "systemd", "repo": "upstream:systemd", @@ -142,23 +106,6 @@ "util-linux" ] }, - { - "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": "btrfs-progs", "repo": "upstream:btrfs-progs", @@ -195,17 +142,6 @@ "ref": "master", "build-depends": [] }, - { - "name": "morph", - "repo": "baserock:baserock/morph", - "ref": "master", - "build-depends": [ - "cliapp", - "cmdtest", - "python-coverage-test-runner", - "pyyaml" - ] - }, { "name": "openssh", "repo": "upstream:openssh", -- cgit v1.2.1 From 2334938471a2ef6c5a60ec24ab7d92ede26a4753 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Tue, 5 Feb 2013 12:48:47 +0000 Subject: Move util-linux back into core It is needed in the syslinux build. --- foundation.morph | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'foundation.morph') diff --git a/foundation.morph b/foundation.morph index 1ed1a157..e1d121cf 100644 --- a/foundation.morph +++ b/foundation.morph @@ -62,12 +62,6 @@ "libusbx" ] }, - { - "name": "util-linux", - "repo": "upstream:util-linux", - "ref": "baserock/morph", - "build-depends": [] - }, { "name": "glib", "repo": "upstream:glib", @@ -102,8 +96,7 @@ "kmod", "libcap2", "pciutils", - "usbutils", - "util-linux" + "usbutils" ] }, { @@ -111,8 +104,7 @@ "repo": "upstream:btrfs-progs", "ref": "baserock/morph", "build-depends": [ - "attr", - "util-linux" + "attr" ] }, { -- cgit v1.2.1