[PATCH] Change baserock: repo URLs
by Lars Wirzenius
We're going to move git.baserock.org to a new host, and also running
on a new software stack. Because of the new software stack, the repo
URLs that currently are of the form "baserock:foo" will need to change
to the form "baserock:baserock/foo". I have added a compatibility
symlink so that the new form works on the old git.baserock.org server,
so changing morphologies now is harmless.
I've done test builds to make sure these work.
Lars Wirzenius (1):
Change baserock: URLs to have baserock/ project dir in path
base-system-armv7-versatile.morph | 4 ++--
base-system-x86_64-generic.morph | 4 ++--
bootstrap-pass2.morph | 2 +-
bootstrap-pass3-imx53.morph | 6 +++---
bootstrap-pass3-x86_64-generic.morph | 6 +++---
devel-system-armv7-versatile.morph | 6 +++---
devel-system-x86_64-generic.morph | 6 +++---
devel.morph | 2 +-
foundation.morph | 4 ++--
9 files changed, 20 insertions(+), 20 deletions(-)
--
1.7.10.4
10 years, 10 months
[PATCH 0/4] V1: build without push
by Sam Thursfield
Repository: git://git.baserock.org/baserock/morph
Branch: samthursfield/build-without-push
Sha1: 96ed824b21ba5cdef6050f8d1eedabb7c51f3c4e
With these patches, 'morph build' will build from repos in the user's
local system branch workspace where available, instead of always using
the remote repos. There's an option to reenable pushing build branches
(--push-build-branches) when required.
There are a couple of issues remaining:
1. the repos that are checked out in the user's workspace get cached in
the local repository cache, needlessly: it's not hard to pass through
file:// URL's but this would require rewriting all the tests for
'morph update-gits', so I haven't done so yet (and it's not clear how
those tests would look if file:// URL's were never cached). I wonder
if it would be better to set up a magic repo-alias prefix for
the repos in the local workspace instead, so that only those could
pass through the cache.
2. the code for 'morph build' grows ever more complex; it would be nice
to refactor it a bit so that there is one loop inside the build()
function instead of 3 or 4 spread across different functions
3. a temporary build branch is created in the user's repository even if
they always commit their changes. I think it would be nicer to avoid
creating the build branch in a repo until it was actually required
(to always use one once it had been created).
Sam Thursfield (4):
Add docstrings for some build functions
morph build: Use the user's own repos when building
Add 'morph build' test with strata outside the root repo
morph build: Allow forcing build branches to be pushed
morphlib/app.py | 4 ++
morphlib/buildcommand.py | 1 +
morphlib/plugins/branch_and_merge_plugin.py | 43 ++++++++++----
tests.as-root/build-with-external-strata.script | 62 ++++++++++++++++++++
tests.as-root/build-with-push.script | 39 ++++++++++++
...iple-times-doesnt-generate-new-artifacts.script | 6 +-
...iple-times-doesnt-generate-new-artifacts.stdout | 30 ----------
...stem-branch-picks-up-uncommitted-changes.script | 34 ++---------
...stem-branch-picks-up-uncommitted-changes.stdout | 9 ---
.../building-a-system-branch-works-anywhere.script | 7 +--
.../building-a-system-branch-works-anywhere.stdout | 10 ----
11 files changed, 148 insertions(+), 97 deletions(-)
create mode 100755 tests.as-root/build-with-external-strata.script
create mode 100755 tests.as-root/build-with-push.script
delete mode 100644 tests.as-root/building-a-system-branch-multiple-times-doesnt-generate-new-artifacts.stdout
delete mode 100644 tests.as-root/building-a-system-branch-picks-up-uncommitted-changes.stdout
delete mode 100644 tests.as-root/building-a-system-branch-works-anywhere.stdout
--
1.7.10.4
10 years, 10 months
[PATCH 0/3] Test tidying (prerequisite for build-without-push)
by Sam Thursfield
Repository: git://git.baserock.org/baserock/morph
Branch: samthursfield/test-tidying
Sha1: b1e912c2791e3e328c73252f87624ec2296a7b77
Tidying up some tests, mainly so that scripts/setup-3rd-party-strata
can be shared between them all.
Sam Thursfield (3):
Factor out setup code from 'morph build' tests into separate file
tests: Use test: URL prefix instead of baserock: throughout
tests: Always use test:morphs for morphs repo
scripts/setup-3rd-party-strata | 20 ++---
tests.as-root/archless-system-fails.script | 6 +-
...iple-times-doesnt-generate-new-artifacts.script | 23 +-----
...stem-branch-picks-up-uncommitted-changes.script | 6 +-
.../building-a-system-branch-works-anywhere.script | 26 +------
.../building-creates-correct-temporary-refs.script | 24 +-----
tests.as-root/disk-builds-rootfs-and-kernel.script | 6 +-
tests.as-root/make-patch.script | 20 ++---
.../rootfs-tarball-builds-rootfs-and-kernel.script | 6 +-
tests.as-root/setup | 6 +-
tests.as-root/setup-build | 33 ++++++++
.../syslinux-disk-builds-rootfs-and-kernel.script | 6 +-
.../syslinux-fails-if-no-mbr-found.script | 6 +-
tests.as-root/system-overlap.script | 8 +-
tests.as-root/tarball-image-is-sensible.script | 2 +-
tests.as-root/tarball-image-is-sensible.setup | 8 +-
tests.branching/ambiguous-refs.script | 6 +-
tests.branching/branch-cleans-up-on-failure.script | 2 +-
...reates-new-system-branch-not-from-master.script | 6 +-
...reates-new-system-branch-not-from-master.stdout | 10 +--
.../branch-creates-new-system-branch.script | 6 +-
.../branch-creates-new-system-branch.stdout | 8 +-
.../branch-fails-if-branch-exists.script | 4 +-
.../branch-fails-if-branch-exists.stderr | 2 +-
.../branch-when-branchdir-exists-locally.script | 2 +-
tests.branching/branch-works-anywhere.script | 10 +--
tests.branching/branch-works-anywhere.stdout | 80 ++++++++++----------
.../checkout-cleans-up-on-failure.script | 2 +-
tests.branching/checkout-existing-branch.script | 6 +-
tests.branching/checkout-existing-branch.stdout | 8 +-
tests.branching/checkout-works-anywhere.script | 8 +-
tests.branching/checkout-works-anywhere.stdout | 24 +++---
.../edit-checkouts-existing-chunk.script | 4 +-
.../edit-checkouts-existing-chunk.stdout | 4 +-
tests.branching/edit-clones-chunk.script | 2 +-
tests.branching/edit-clones-chunk.stdout | 8 +-
tests.branching/edit-handles-submodules.script | 4 +-
tests.branching/edit-handles-submodules.setup | 4 +-
tests.branching/edit-updates-stratum.script | 4 +-
tests.branching/edit-updates-stratum.stdout | 8 +-
tests.branching/edit-uses-ref-from-stratum.script | 4 +-
...edit-works-after-branch-root-was-renamed.script | 4 +-
...edit-works-after-branch-root-was-renamed.stdout | 6 +-
.../foreach-handles-command-failure.script | 2 +-
.../foreach-handles-command-failure.stderr | 2 +-
.../foreach-handles-command-failure.stdout | 2 +-
...repository-stored-in-cloned-repositories.script | 10 +--
...repository-stored-in-cloned-repositories.stdout | 6 +-
tests.branching/petrify-no-double-petrify.script | 4 +-
tests.branching/petrify-no-double-petrify.stdout | 2 +-
tests.branching/petrify.script | 4 +-
tests.branching/petrify.stdout | 8 +-
tests.branching/setup | 6 +-
tests.branching/setup-second-chunk | 4 +-
.../show-branch-root-in-branched-branch.script | 2 +-
.../show-branch-root-in-branched-branch.stdout | 2 +-
.../show-branch-root-in-checked-out-branch.script | 2 +-
.../show-branch-root-in-checked-out-branch.stdout | 2 +-
...ow-system-branch-fails-outside-workspace.script | 2 +-
...em-branch-fails-when-branch-is-ambiguous.script | 4 +-
...anch-works-anywhere-with-a-single-branch.script | 2 +-
...rks-in-different-directories-in-a-branch.script | 4 +-
tests.branching/status-in-clean-branch.script | 2 +-
tests.branching/status-in-clean-branch.stdout | 2 +-
tests.branching/status-in-dirty-branch.script | 6 +-
tests.branching/status-in-dirty-branch.stdout | 10 +--
tests.branching/status-in-workspace.script | 6 +-
tests.branching/workflow-petrify.script | 28 +++----
tests.branching/workflow-petrify.stdout | 30 ++++----
.../workflow-separate-stratum-repos.script | 16 ++--
tests.branching/workflow.script | 8 +-
tests.merging/basic.script | 20 ++---
tests.merging/basic.stdout | 4 +-
tests.merging/conflict-chunks.script | 26 +++----
tests.merging/conflict-chunks.stdout | 4 +-
tests.merging/conflict-morphology-kind.script | 8 +-
.../conflict-stratum-field-ordering.script | 18 ++---
.../conflict-stratum-field-ordering.stdout | 2 +-
tests.merging/from-branch-not-checked-out.script | 2 +-
tests.merging/move-chunk-repo.script | 12 +--
tests.merging/rename-chunk.script | 10 +--
tests.merging/rename-stratum.script | 6 +-
tests.merging/rename-stratum.stderr | 2 +-
tests.merging/setup | 6 +-
.../warn-if-merging-petrified-morphologies.script | 8 +-
85 files changed, 361 insertions(+), 387 deletions(-)
create mode 100644 tests.as-root/setup-build
--
1.7.10.4
10 years, 10 months
[PATCH] Fix spelling mistakes in soure code
by Sam Thursfield
Repository: git://git.baserock.org/baserock/morph
Branch: samthursfield/spelling-fixes
Sha1: f4894d37cd96953707635ea1902a0a115741f4e3
Sam Thursfield (1):
Fix spelling mistakes
morphlib/buildsystem_tests.py | 2 +-
morphlib/plugins/branch_and_merge_plugin.py | 6 +++---
morphlib/plugins/trebuchet_plugin.py | 2 +-
tests.branching/ambiguous-refs.script | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
--
1.7.10.4
10 years, 10 months
[PATCH] Add e2fsprogs
by Lars Wirzenius
* repo: git://git.baserock.org/baserock/morphs
* branch: liw/e2fsprogs
* ref: 94aa94fe1a3f60e8827bd57506ffbfeb91bf1383
We should add e2fsprogs to devel so that we can have a /boot as ext2
in the release after the next one.
Lars Wirzenius (1):
Add e2fsprogs to devel stratum
devel.morph | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
--
1.7.10.4
10 years, 10 months
[PATCH] "morph expand-repo" subcommand
by Lars Wirzenius
* repo: git://git.baserock.org/baserock/morph
* branch: liw/expand-repo-plugin
* commit: 0e0ee4b7c1a9d9bb25707635818c6b8b37768d5f
Lars Wirzenius (1):
Add a morph helper subcommand for expanding aliased repos
morphlib/plugins/expand_repo_plugin.py | 53 ++++++++++++++++++++++++++++++++
1 file changed, 53 insertions(+)
create mode 100644 morphlib/plugins/expand_repo_plugin.py
--
1.7.10.4
10 years, 10 months
[PATCH] Make rename-statum test fail predictably
by Sam Thursfield
Repository: git://git.baserock.org/baserock/morph
Branch: samthursfield/stable-merge
Sha1: 8ae31e6c92fc29e73cfce996ebaeb154d3b8ce61
Fix the bug Richard found last week where this test gave different
errors depending on the location of TMPDIR.
The underlying issue can only be fixed by doing a proper 3-way merge.
Sam Thursfield (1):
Process systems for merging in a fixed order
morphlib/plugins/branch_and_merge_plugin.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
1.7.10.4
10 years, 10 months
[PATCH] Fix use of variable before assignment
by Sam Thursfield
Repository: git://git.baserock.org/baserock/morph
Branch: samthursfield/fix-load-morphology-bug
Sha1: d7424a866d7662facf3768750fcd29db8f6315a9
The sooner we can get this out of branch-and-merge-plugin.py and into
the core morphlib, with unit tests, the better.
Sam Thursfield (1):
Fix use of variable before assignment
morphlib/plugins/branch_and_merge_plugin.py | 1 +
1 file changed, 1 insertion(+)
--
1.7.10.4
10 years, 10 months
