10:10 a.m.
Repo: git://git.baserock.org/baserock/baserock/morph.git
Ref: baserock/richardmaw/S8041/update-README
Sha1: 0b9b85619fefe0d2718f43afe6a588fa7e1b483a
Land: master
This is entirely corrections, where we may want to also change the scope
of the README.
Richard Maw (8):
re-brand ourselves as an appliance Linux solution
Update build instructions
Rewrite morphologies in YAML
List more build systems.
Fix typo
Remove disk-size field from manual.
Augment instructions for running morph's tests
Update build environment description
README | 188 +++++++++++++++++++++++++++++-----------------------------------
1 file changed, 85 insertions(+), 103 deletions(-)
--
1.7.10.4
10:10 a.m.
New subject: [PATCH 1/8] re-brand ourselves as an appliance Linux solution
Embedded linux is strictly on hardware, while Baserock is suitable
for virtual machines as well.
---
README | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README b/README
index 3c9fa8a..369ef43 100644
--- a/README
+++ b/README
@@ -6,7 +6,7 @@ README for morph
problems, mail baserock-dev(a)baserock.org.
`morph` builds binaries for [Baserock](http://www.baserock.org/),
-an embedded Linux solution. Please see the website for overall information.
+an appliance Linux solution. Please see the website for overall information.
Usage
--
1.7.10.4
10:10 a.m.
New subject: [PATCH 2/8] Update build instructions
---
README | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/README b/README
index 369ef43..98ac878 100644
--- a/README
+++ b/README
@@ -14,23 +14,23 @@ Usage
The Baserock builds are controlled by **morphology** files,
which are build recipes. See below for their syntax. Everything
-in Baserock is built from git commits, and also the morphologies
-must be committed in git before building. The `morph` tool is
+in Baserock is built from git commits.
+Morphologies must be committed in git before building. The `morph` tool is
used to actually run the build. The usual workflow is this:
* put the morphology for an upstream project with its source code
* put other morphologies in the `morphs` (note plural) repository
-* run `fakeroot morph` or `sudo morph` to build stuff
+* run `morph` to build stuff
-Eventually, `morph` will get a manual page. Meanwhile, a short usage:
+`morph --help` will provide some information, though a full guide is
+really required. Meanwhile a short usage to build a disk image:
- fakeroot morph --keep-path -v build-morphology morphs master foundation
- sudo morph --keep-path -v build-morphology morphs master base-system
-
-(Run with `fakeroot`, when building anything but a system image; run
-with `sudo` when building a system image.)
-
-Run `morph --help` to get a list of all options and short descriptions.
+ morph init workspace
+ cd workspace
+ morph checkout baserock:baserock/morphs master
+ morph build base-system-x86_64-generic
+ morph deploy --no-git-update rawkdisk base-system-x86_64-generic \
+ disk-image.img
You can write a configuration file to avoid having to write options on
the command line every time. Put it in `~/.morph.conf` and make it look
--
1.7.10.4
10:10 a.m.
New subject: [PATCH 3/8] Rewrite morphologies in YAML
---
README | 137 +++++++++++++++++++++++++---------------------------------------
1 file changed, 53 insertions(+), 84 deletions(-)
diff --git a/README b/README
index 98ac878..b2203b8 100644
--- a/README
+++ b/README
@@ -48,24 +48,18 @@ All of the above settings apart from `log` are the defaults, so may be
omitted.
Morphology file syntax
----------------------
-JSON is used for the morphology syntax. For example, to build a chunk:
-
- {
- "name": "foo",
- "kind": "chunk",
- "configure-commands": [
- "./configure --prefix=\"$PREFIX\""
- ],
- "build-commands": [
- "make"
- ],
- "test-commands": [
- "make check"
- ],
- "install-commands": [
- "make DESTDIR=\"$DESTDIR\" install"
- ]
- }
+YAML is used for the morphology syntax. For example, to build a chunk:
+
+ name: foo
+ kind: chunk
+ configure-commands:
+ - ./configure --prefix="$PREFIX"
+ build-commands:
+ - make
+ test-commands:
+ - make check
+ install-commands:
+ - make DESTDIR="$DESTDIR" install
For all morphologies, use the following fields:
@@ -169,78 +163,53 @@ For systems, use the following fields:
Example chunk (simplified commands):
- {
- "name": "eglibc",
- "kind": "chunk",
- "configure-commands": [
- "mkdir o",
- "cd o && ../libc/configure --prefix=/usr"
- ],
- "build-commands": [
- "cd o && make"
- ],
- "install-commands": [
- "cd o && make install_root=\"$DESTDIR\" install"
- ]
- }
+ name: eglibc
+ kind: chunk
+ configure-commands:
+ - mkdir o
+ - cd o && ../libc/configure --prefix=/usr
+ build-commands:
+ - cd o && make
+ install-commands:
+ - cd o && make install_root="$DESTDIR" install
Example stratum:
- {
- "name": "foundation",
- "kind": "stratum",
- "chunks": [
- {
- "name": "fhs-dirs",
- "repo": "upstream:fhs-dirs",
- "ref": "baserock/bootstrap",
- "build-depends": [],
- },
- {
- "name": "linux-api-headers",
- "repo": "upstream:linux",
- "ref": "baserock/morph",
- "build-depends": ["fhs-dirs"]
- },
- {
- "name": "eglibc",
- "repo": "upstream:eglibc",
- "ref": "baserock/bootstrap",
- "build-depends": [
- "linux-api-headers"
- ]
- },
- {
- "name": "busybox",
- "repo": "upstream:busybox",
- "ref": "baserock/bootstrap",
- "build-depends": [
- "fhs-dirs",
- "linux-api-headers"
- ]
- }
- ]
- }
+ name: foundation
+ kind: stratum
+ chunks:
+ - name: fhs-dirs
+ repo: upstream:fhs-dirs
+ ref: baserock/bootstrap
+ build-depends: []
+ - name: linux-api-headers
+ repo: upstream:linux
+ ref: baserock/morph
+ build-depends:
+ - fhs-dirs
+ - name: eglibc
+ repo: upstream:eglibc
+ ref: baserock/bootstrap
+ build-depends:
+ - linux-api-headers
+ - name: busybox
+ repo: upstream:busybox
+ ref: baserock/bootstrap
+ build-depends:
+ - fhs-dirs
+ - linux-api-headers
Example system:
- {
- "name": "base",
- "kind": "system",
- "disk-size": "1G",
- "strata": [
- {
- "morph": "foundation",
- "repo": "baserock:baserock/morphs",
- "ref": "master"
- },
- {
- "morph": "linux-stratum",
- "repo": "baserock:baserock/morphs",
- "ref": "master"
- }
- ]
- }
+ name: base
+ kind: system
+ strata:
+ - morph: foundation
+ repo: baserock:baserock/morphs
+ ref: master
+ - morph: linux-stratum
+ repo: baserock:baserock/morphs
+ ref: master
Note that currently, unknown keys in morphologies are silently ignored.
--
1.7.10.4
10:10 a.m.
New subject: [PATCH 4/8] List more build systems.
---
README | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/README b/README
index b2203b8..cb38279 100644
--- a/README
+++ b/README
@@ -69,10 +69,17 @@ For all morphologies, use the following fields:
For chunks, use the following fields:
+
* `build-system`: if the program is built using a build system known to
`morph`, you can set this field and avoid having to set the various
- `*-commands` fields; only `autotools` is currently known; the commands
- that the build system specifies can be overridden;
+ `*-commands` fields; the commands that the build system specifies can be overridden;
the following build-systems are known:
+
+ - `autotools`
+ - `python-distutils`
+ - `cpan`
+ - `cmake`
+ - `qmake`
+
optional
* `pre-configure-commands`: a list of shell commands to run at
--
1.7.10.4
10:10 a.m.
New subject: [PATCH 5/8] Fix typo
---
README | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README b/README
index cb38279..ee7db35 100644
--- a/README
+++ b/README
@@ -152,7 +152,7 @@ For strata, use the following fields:
`build-depends` field. This field may be omitted to make the source
depend on all other chunks that are listed earlier in the `chunks`
list. The field may be an empty list to indicate that the chunk does
- not depend on anything else in the same stratum. To specify one ore
+ not depend on anything else in the same stratum. To specify one or
more chunk dependencies, `build-depends` needs to be set to a list
that contains the names of chunks that the source depends on in the
same stratum. These names correspond to the values of the `name`
--
1.7.10.4
10:10 a.m.
New subject: [PATCH 6/8] Remove disk-size field from manual.
---
README | 2 --
1 file changed, 2 deletions(-)
diff --git a/README b/README
index ee7db35..a6613ae 100644
--- a/README
+++ b/README
@@ -160,8 +160,6 @@ For strata, use the following fields:
For systems, use the following fields:
-* `disk-size`: size of the disk image to be created; may use suffixes like
- `M` and `G`; **required**
* `strata`: a list of triples specifying strata to be included in the system
image. Similar to chunks, you should give `repo`, `ref` and `morph`
(filename without the .morph extension) for each stratum. The value of
--
1.7.10.4
10:10 a.m.
New subject: [PATCH 7/8] Augment instructions for running morph's tests
---
README | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/README b/README
index a6613ae..2fe4eae 100644
--- a/README
+++ b/README
@@ -234,7 +234,10 @@ Hacking morph
Run the test suite with this command:
- ./check
+ ./check --full
+
+If your /tmp is a tmpfs you may need to set TMPDIR to a different path,
+as there are tests for large disk image deploys.
Install CoverageTestRunner (from <http://liw.fi/coverage-test-runner/>),
and check out the `cmdtest` utility (from <http://liw.fi/cmdtest/>).
--
1.7.10.4
10:10 a.m.
New subject: [PATCH 8/8] Update build environment description
---
README | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/README b/README
index 2fe4eae..8c3054a 100644
--- a/README
+++ b/README
@@ -226,7 +226,12 @@ When `morph` runs build commands, it clears the environment of all
variables and creates new ones. This is so that the build will run
more consistently across machines and developers.
-See the `morphlib/builder.py` file, method `setup_env` for details.
+See the `morphlib/buildenvironment.py` file for details on what
+environment variables are set.
+
+Morph also constructs a staging area for every build, composed of its
+build-dependencies, so everything that is used for a build is traceable
+and reproducible.
Hacking morph
--
1.7.10.4
11:32 a.m.
On Thu, Jun 27, 2013 at 03:10:11PM +0100, Richard Maw wrote:
Repo: git://git.baserock.org/baserock/baserock/morph.git
Ref: baserock/richardmaw/S8041/update-README
Sha1: 0b9b85619fefe0d2718f43afe6a588fa7e1b483a
Land: master
This is entirely corrections, where we may want to also change the scope
of the README.
These looked fine to me, please merge.
--
http://www.codethink.co.uk/ http://wiki.baserock.org/ http://www.baserock.com/
3627
days inactive
3627
days old
9 comments
2 participants
participants (2)
-
Lars Wirzenius -
Richard Maw