[PATCH 0/7] Refactor morph status
by Richard Maw
Repo: git://git.baserock.org/baserock/baserock/morph.git
Ref: baserock/richardmaw/S8511/refactor-status-v2
SHA1: 601f39bca09fa52acadec3b908f29aecc241e868
Land: origin/master
Previous tests pass and there are new unit tests.
The test suite has passed in every commit.
morph status when not in a system branch (i.e. workspace status) is
now faster.
Broadly the same operations are performed when status is run in a system
branch, so there is no performance improvement there.
The amount of code sharing has increased, this makes me happy.
Richard Maw (7):
util: add find_leaves() supplimenting find_leaf()
workspace: add method for listing system branches
b&m: Add new-status subcommand
gitdir: add HEAD property to find the current branch
gitdir: Add method for getting uncommitted changes
b&m: morph new-status provides per-branch status
b&m: Use new-status as the default
morphlib/gitdir.py | 37 ++++++++++++
morphlib/gitdir_tests.py | 15 +++++
morphlib/plugins/branch_and_merge_new_plugin.py | 70 +++++++++++++++++++++++
morphlib/plugins/branch_and_merge_plugin.py | 2 +-
morphlib/sysbranchdir.py | 10 +---
morphlib/sysbranchdir_tests.py | 2 +-
morphlib/util.py | 35 +++++++-----
morphlib/workspace.py | 5 ++
morphlib/workspace_tests.py | 10 ++++
9 files changed, 164 insertions(+), 22 deletions(-)
--
1.7.10.4
9 years, 6 months
[PATCH] force Linux make to notice $MAKEFLAGS
by Paul Sherwood
From 278a406ff09f52679ae9a7d4126344ddc7a83d3a Mon Sep 17 00:00:00 2001
From: Paul Sherwood <paul.sherwood(a)codethink.co.uk>
Date: Thu, 12 Sep 2013 16:02:21 +0000
Subject: [PATCH] force make to notice $MAKEFLAGS
We noticed that kernels have not been building on all cores, even
though we're setting MAKE FLAGS. This fixes that.
---
linux.morph | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/linux.morph b/linux.morph
index e11a50a..5278f8e 100644
--- a/linux.morph
+++ b/linux.morph
@@ -55,7 +55,7 @@
"yes '' | make oldconfig"
],
"build-commands": [
- "make"
+ "make $MAKEFLAGS"
],
"install-commands": [
"mkdir -p \"$DESTDIR\"/boot",
--
1.7.9-rc0
9 years, 6 months
[PATCHv2 0/8] Refactor morph petrify and unpetrify
by Richard Maw
Repo: git://git.baserock.org/baserock/baserock/morph.git
Ref: baserock/richardmaw/S8717/refactor-petrify-v4
SHA1: 1bedfa7749300da167808b837d2a8968df43eeb3
Land: origin/master
This version has factored the morphology location code that was previously
in gitdir into the MorphologyFinder class.
This way the algorithm for finding morphologies is kept in one place.
Lars Wirzenius (1):
Fix MorphologySet bug: right Morphology object changed
Richard Maw (7):
sysbranchdir: simplify prefix / strip
morphlib.git: Refactor is_valid_sha1
MorphSet: keep old ref as unpetrify-ref
gitdir: Add methods to inspect contents
morphlib: Add MorphologyFinder class
b&m: Re-implement morph petrify
b&m: re-implement morph unpetrify
morphlib/__init__.py | 1 +
morphlib/git.py | 4 +-
morphlib/gitdir.py | 69 ++++++++++
morphlib/gitdir_tests.py | 73 +++++++++++
morphlib/morphologyfinder.py | 71 ++++++++++
morphlib/morphologyfinder_tests.py | 111 ++++++++++++++++
morphlib/morphset.py | 9 +-
morphlib/morphset_tests.py | 8 +-
morphlib/plugins/branch_and_merge_new_plugin.py | 137 ++++++++++++++++++++
morphlib/plugins/branch_and_merge_plugin.py | 4 +-
morphlib/sysbranchdir.py | 3 +-
.../edit-updates-stratum-build-depends.stdout | 16 ++-
tests.branching/edit-updates-stratum.stdout | 10 +-
tests.branching/workflow.stdout | 1 +
14 files changed, 495 insertions(+), 22 deletions(-)
create mode 100644 morphlib/morphologyfinder.py
create mode 100644 morphlib/morphologyfinder_tests.py
create mode 100644 tests.branching/workflow.stdout
--
1.7.10.4
9 years, 6 months
[PATCH 0/2] Fix morph test suite
by Richard Maw
Repo: git://git.baserock.org/baserock/baserock/morph.git
Ref: baserock/richardmaw/S8740/fix-tests-with-tmpfs
SHA1: dea5d6f8cbd86916ec5373fb704c67e1a33e29a8
Land: master
This fixes running tests when your TMPDIR is a tmpfs instead of on btrfs.
This slipped past me because I was testing on btrfs, which returns
directories in insertion order, while on a tmpfs it returns them in a
different order.
Now directories are returned in asciibetical order.
Richard Maw (2):
exts: Remove tab from vdaboot.configure
foreach: sort repositories asciibetically
morphlib/exts/vdaboot.configure | 2 +-
morphlib/plugins/branch_and_merge_new_plugin.py | 2 +-
.../edit-checkouts-existing-chunk.stdout | 6 ++---
tests.branching/edit-clones-chunk.stdout | 24 ++++++++++----------
.../foreach-handles-command-failure.stderr | 2 +-
.../foreach-handles-command-failure.stdout | 2 +-
6 files changed, 19 insertions(+), 19 deletions(-)
--
1.7.10.4
9 years, 6 months
[PATCHv2] Add glanceclient stratum.
by Pedro Alvarez
Repo: git://git.baserock.org/baserock/baserock/morphs.git
Branch: baserock/pedroalvarez/openstack
Sha1: 9855521a14a74350a29742be887cc75f43a53e38
This patch adds glanceclient in the development baserock images.
Glanceclient is needed to add the capability of deploy images into an
OpenStack system. With glanceclient the development system may communicate
with the OpenStack server.
Pedro Alvarez (1):
Add glanceclient Stratum morphology.
devel-system-x86_32-generic.morph | 3 ++
devel-system-x86_64-generic.morph | 3 ++
glanceclient.morph | 101 +++++++++++++++++++++++++++++++++++++
3 files changed, 107 insertions(+)
create mode 100644 glanceclient.morph
--
1.7.10.4
9 years, 6 months
Use flup as the backend server for bottle
by Tiago Gomes
This branch should be merged at the same time than other
S8725 patches.
repo: ssh://git@git.codethink.co.uk/ct098/morph-cache-server
branch: baserock/tiagogomes/lighttpd
commit: cb14bd79a9f36d1532a43efd8aca3ad8c3bc7920
card: S8725
Tiago Gomes (1):
Use flup as the backend server for bottle.
morph-cache-server | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
1.7.10.4
9 years, 6 months
Re: Fwd: [PATCH 2/2] Add a lighttpd and flup to the trove morphology.
by Pedro Alvarez
On 10/09/13 16:56, Tiago Gomes wrote:
> diff --git a/trove.configure b/trove.configure
> +ExecStart=/bin/mkdir -p /var/run/lighttpd/
> +ExecStart=/bin/chown cache:cache /var/run/lighttpd/
The file looks only if the user "cache" is created before. (I really
don't know if it happened)
> diff --git a/trove.morph b/trove.morph
Ok as well, +1 if there is no problem with the user "cache".
9 years, 6 months
Re: Fwd: [PATCH 1/2] Yay to YAML
by Pedro Alvarez
On 10/09/13 16:56, Tiago Gomes wrote:
> diff --git a/trove-system-x86_64.morph b/trove-system-x86_64.morph
> +strata:
> +- morph: build-essential
> + repo: baserock:baserock/morphs
> + ref: baserock/release/baserock-8
> +- morph: bsp-x86_64-generic
> + repo: baserock:baserock/morphs
> + ref: baserock/release/baserock-8
The conversion to YAML looks fine, but should we continue referencing
baserock-8? There are more references to baserock-8 in this file.
> diff --git a/trove.morph b/trove.morph
> +build-depends:
> +- repo: baserock:baserock/morphs
> + ref: baserock/release/baserock-8
> + morph: foundation
> +- repo: baserock:baserock/morphs
> + ref: baserock/release/baserock-8
> + morph: core
> +- repo: baserock:baserock/morphs
> + ref: baserock/release/baserock-8
> + morph: tools
The same in this file, is more a doubt than a correction. Why we cannot
reference baserock-10, or baserock-9 at least?
9 years, 6 months
