[PATCH] Fix bad symlinks in bzip2 chunk
by Richard Maw
Repo: git://git.baserock.org/delta/bzip2
Ref-from: baserock/richardmaw/bzip2-symlink-fix
Ref-to: baserock/morph
Sha1: 2df3d891926b785d1abd590eb8bc233913fed992
bzip2 would have symlinks which include where it was built.
This was because bzip2's makefile doesn't understand DESTDIR,
PREFIX was used instead, which worked for everything except
symlinks, as they were created as absolute paths, including
PREFIX.
This patch extends the alterations to the makefile with sed, so that
DESTDIR works.
Richard Maw (1):
Fix up makefile to allow DESTDIR
bzip2.morph | 4 ++--
bzip2.morph-makefix.sed | 10 ++++++++++
2 files changed, 12 insertions(+), 2 deletions(-)
create mode 100644 bzip2.morph-makefix.sed
--
1.7.5.4
10 years, 11 months
[PATCH 0/4] Tidy up --help
by Sam Thursfield
Repository: git://git.baserock.org/baserock/morph
Branch: samthursfield/update-help
Sha1: 17bd68f0dc622d3c6c508d366c8fa5fc00b9790b
Length of morph --help reduced from 183 lines to 143 lines.
There's still a lot more to do to improve --help, but most of that
requires deeper work in cliapp first.
Sam Thursfield (4):
Reorder settings by broad category
Reduce some option descriptions
Remove hello-plugin
Improve command descriptions in --help
morphlib/app.py | 147 ++++++++++++--------------
morphlib/plugins/branch_and_merge_plugin.py | 56 +++++-----
morphlib/plugins/build_plugin.py | 11 +-
morphlib/plugins/graphing_plugin.py | 1 +
morphlib/plugins/hello_plugin.py | 29 -----
morphlib/plugins/show_dependencies_plugin.py | 2 +-
morphlib/plugins/update_gits_plugin.py | 8 +-
7 files changed, 98 insertions(+), 156 deletions(-)
delete mode 100644 morphlib/plugins/hello_plugin.py
--
1.7.10.4
10 years, 11 months
[PATCH] Write /etc/os-release in system images
by Sam Thursfield
Repository: git://git.baserock.org/baserock/morph
Branch: samthursfield/write-etc-os-release
Sha1: 9a41a8ce1cf95e1daf5aa0bdbea2a16cabac7cda
Sam Thursfield (1):
Write /etc/os-release in system images
morphlib/builder2.py | 15 ++++++++++++++-
tests.as-root/disk-builds-rootfs-and-kernel.script | 1 +
tests.as-root/disk-builds-rootfs-and-kernel.stdout | 3 +++
.../syslinux-disk-builds-rootfs-and-kernel.script | 1 +
.../syslinux-disk-builds-rootfs-and-kernel.stdout | 3 +++
tests.as-root/tarball-image-is-sensible.script | 1 +
tests.as-root/tarball-image-is-sensible.stdout | 2 ++
7 files changed, 25 insertions(+), 1 deletion(-)
--
1.7.10.4
10 years, 11 months
[PATCH] Write metadata for the rootfs itself into the rootfs
by Sam Thursfield
Repository: git://git.baserock.org/baserock/morph
Branch: samthursfield/write-metadata-for-system
Sha1: da7d5efb5bf3b93642dcb79d8ae24521f93975d0
This makes it much easier to identify what version of a system you
are running.
Tests improved as part of this to actually test the generated disk
images a bit.
Does anyone have any view on whether we should also set /etc/os-release
at this point? Something like "Baserock system xxx built from ref xxx
at xxx" ?
Sam Thursfield (1):
Write metadata for the rootfs itself into the rootfs
morphlib/builder2.py | 5 +--
morphlib/plugins/tarball-systembuilder_plugin.py | 1 +
tests.as-root/disk-builds-rootfs-and-kernel.script | 15 ++++++--
tests.as-root/disk-builds-rootfs-and-kernel.stdout | 30 ++++++++++++++++
tests.as-root/lib | 37 ++++++++++++++++++++
.../rootfs-tarball-builds-rootfs-and-kernel.script | 1 -
.../syslinux-disk-builds-rootfs-and-kernel.script | 14 ++++++++
tests.as-root/tarball-image-is-sensible.stdout | 1 +
8 files changed, 99 insertions(+), 5 deletions(-)
create mode 100644 tests.as-root/disk-builds-rootfs-and-kernel.stdout
create mode 100644 tests.as-root/lib
create mode 100644 tests.as-root/syslinux-disk-builds-rootfs-and-kernel.stdout
--
1.7.10.4
10 years, 11 months
[PATCH] morph status: Sort list of system branches in a workspace
by Sam Thursfield
Repository: git://git.baserock.org/baserock/morph
Branch: samthursfield/morph-status-in-workspace-sorted
Sha1: 11eac473248addfb4327ad9a94150433883ebb2f
Thanks to Richard for pointing out the test failure (helpfully, it
didn't ever fail when I ran it)
Sam Thursfield (1):
morph status: Sort list of system branches in a workspace
morphlib/plugins/branch_and_merge_plugin.py | 6 ++++--
tests.branching/status-in-workspace.stdout | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
--
1.7.10.4
10 years, 11 months
[PATCH] morph petrify: Avoid petrifying chunks that have already been edited
by Sam Thursfield
Repository: git://git.baserock.org/baserock/morph
Branch: samthursfield/petrify-avoid-edited-chunks
Sha1: 0d745b6f488f552a93b5f8b4beba4b0a261bcc7e
Fix required for the tutorial.
Sam Thursfield (1):
morph petrify: Avoid petrifying chunks that have already been edited
morphlib/plugins/branch_and_merge_plugin.py | 57 +++++++++++++++-------
tests.branching/petrify.script | 11 +++--
tests.branching/petrify.stdout | 12 +++++
tests.branching/setup-second-chunk | 69 +++++++++++++++++++++++++++
4 files changed, 128 insertions(+), 21 deletions(-)
create mode 100755 tests.branching/setup-second-chunk
--
1.7.10.4
10 years, 11 months
[PATCH] Fix argument synopses
by Sam Thursfield
Repository: git://git.baserock.org/baserock/morph
Branch: samthursfield/fix-arg-synopses
Sha1: 47dbc022e096f6832b724e5fb7859a0da48dbb64
Sam Thursfield (1):
morph petrify, unpetrify, status: Add argument synopses
morphlib/plugins/branch_and_merge_plugin.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
--
1.7.10.4
10 years, 11 months
[PATCH] Clean up devel.morph
by Sam Thursfield
Repository: git://git.baserock.org/baserock/morphs
Branch: samthursfield/clean-up-devel
Sha1: fcb2e43f8886fc813cde016acadb74b977fe9a5a
Further reformatting
Sam Thursfield (1):
Clean up devel.morph
devel.morph | 180 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 file changed, 138 insertions(+), 42 deletions(-)
--
1.7.10.4
10 years, 11 months
[PATCH] Clean up foundation.morph
by Sam Thursfield
Repository: git://git.baserock.org/baserock/morphs
Branch: samthursfield/clean-up-foundation
Sha1: d7ad6a1b878814fb167a1e6069eae529dc461e80
Noticed this while writing the tutorial; we should ensure that all our
morphologies don't get reformatted by 'morph edit' at some point.
Sam Thursfield (1):
Clean up foundation.morph
foundation.morph | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--
1.7.10.4
10 years, 11 months
