[PATCH 0/4] Solve 'ref' conflicts automatically
by Sam Thursfield
Repository: git://git.baserock.org/baserock/morph
Branch: samthursfield/S4912-morph-merge-driver
Sha1: d3685248fb69ff134ce1fceacd801ef78c146bee
We now have a git merge driver for morphologies. All it currently does
is resolve the 'ref' field, but this is quite important because this
one almost always conflicts when merging.
Possibly requires merging after the merge-misc-1 branch
Sam Thursfield (4):
Remove dead code from the end of test
Save __file__ so we can recursively run morph later on
morph merge: Use a special git merge driver for morphology files
Remove obsolete merging hack from merge conflict test
morph | 5 +-
morphlib/plugins/branch_and_merge_plugin.py | 128 +++++++++++++++++++++++--
tests.branching/merge-conflict-chunks.script | 12 ---
tests.branching/merge-conflict-chunks.stdout | 4 +-
tests.branching/merge-conflict-stratum.script | 21 +---
tests.branching/merge-conflict-stratum.stdout | 3 +-
tests.branching/merge.script | 4 +-
7 files changed, 132 insertions(+), 45 deletions(-)
--
1.7.10.4
10 years, 8 months
[PATCH 0/3] Misc merge fixes
by Sam Thursfield
Repository: git://git.baserock.org/baserock/morph
Branch: samthursfield/merge-misc-1
Sha1: 12abc0e760f7cf8905a72bd6b5d1d566889e022d
Sam Thursfield (3):
Fix merge tests on Squeeze, by disabling them correctly
morph merge: Error message wrangling
morph merge: Set status on success
morphlib/plugins/branch_and_merge_plugin.py | 13 ++++++++-----
tests.branching/merge-conflict-chunks.script | 2 ++
tests.branching/merge-conflict-chunks.stderr | 2 +-
tests.branching/merge-conflict-stratum.script | 4 +++-
tests.branching/merge-conflict-stratum.stderr | 2 +-
tests.branching/merge-with-chunk-renamed.script | 6 ++++++
tests.branching/merge-with-chunk-repo-moved.script | 7 +++++++
7 files changed, 28 insertions(+), 8 deletions(-)
--
1.7.10.4
10 years, 8 months
[PATCH] Enable xz support in systemd
by James Thomas
Repository: git://git.baserock.org/delta/systemd
Branch: baserock/radiofree/enable_xz
SHA1: e56ea98072587f7364b49757f7efb94c556ba7a9
After checking the ./configure output of systemd in its chroot, it appears
just "--enable-xd" will suffice.
If someone can think of a more strenuous test the please reply and I'll
resubmit after checking
James Thomas (1):
Enable xz support in morph file
systemd.morph | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
--
1.7.6.5
10 years, 8 months
Removing gtk-doc from bootstrap
by Sam Thursfield
Since https://bugzilla.gnome.org/show_bug.cgi?id=674314 was closed, we
don't need gtk-doc or gtk-doc-stub to compile GLib, so I had a go at
bootstrapping without it.
However, gobject-introspection fails because it still needs gtk-doc to
build (and systemd needs gobject-introspection). So we need to have the
gtk-doc-stub in foundation, if not bootstrap. It's currently in devel.
Presumably it's a compile-time dep only of G-I.
Any thoughts on what to do here? Ignore the slight wrinkle for now
(which allows us to bootstrap with GLib < 2.24 still, although I'm not
sure why we'd want to). Keep gtk-doc-stub in bootstrap but remove it as
a dependency of GLib, so foundation builds from the bootstrapped devel
system?
I presume the best plan is forget about this for now, but I thought I'd
write this down so I don't forget.
Sam
10 years, 8 months
[PATCH] Rename arm to armv7
by Richard Maw
Morph changes
- Repo: git://git.baserock.org/baserock/morph
- Ref: richardmaw/S4750-arm-to-armv7
- Sha1: b01cff3d2af3b9a3fb410a18bdc2478a33360fac
- Tested by: ./check
Morphs changes
- Repo: git://git.baserock.org/baserock/morphs
- Ref: baserock/richardmaw/S4750-arm-to-armv7
- Sha1: aa85c53644dbd01bf63e346556bdda7b5aa7fc62
Since armv7 is incompatible with armv5, specify which subarchitecture
we're actually supporting.
This has been tested only with ./check, I haven't tried an arm build yet.
The morphs changes are also listed, but not sent to the list.
Richard Maw (1):
Rename arm to armv7 and be consistent
morphlib/artifactresolver_tests.py | 2 +-
morphlib/cachedir_tests.py | 6 +++---
morphlib/morphologyfactory.py | 2 +-
morphlib/morphologyfactory_tests.py | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
--
1.7.5.4
10 years, 8 months
[PATCH 0/6] Merge conflicts
by Sam Thursfield
Repository: git://git.baserock.org/baserock/morph
Branch: samthursfield/merge-conflicts
Sha1: 11863d70955c86664466c03c1d194e6f56645050
Main changes are rollbacks on exceptions, and carrying on until the
end in the case of a merge conflict and reporting all the errors then
(but avoiding trying to parse morphologies in repos where a merge
conflict failed, so if the root repo doesn't merge it will give up
immediately).
Sam Thursfield (6):
morph merge: Better errors from checkout_repository()
morph merge: Always pull --no-commit, so we can roll back more easily
morph merge: Consolidate more functionality in merge_repo()
morph merge: Handle merge conflicts more helpfully
morph merge: Clean up on failure
Add merge conflict tests
morphlib/plugins/branch_and_merge_plugin.py | 189 ++++++++++++++++---------
tests.branching/merge-conflict-chunks.script | 95 +++++++++++++
tests.branching/merge-conflict-chunks.stderr | 6 +
tests.branching/merge-conflict-chunks.stdout | 10 ++
tests.branching/merge-conflict-stratum.exit | 1 +
tests.branching/merge-conflict-stratum.script | 117 +++++++++++++++
tests.branching/merge-conflict-stratum.stderr | 1 +
tests.branching/merge-conflict-stratum.stdout | 7 +
tests.branching/setup-3rd-party-strata | 2 +
9 files changed, 363 insertions(+), 65 deletions(-)
create mode 100755 tests.branching/merge-conflict-chunks.script
create mode 100644 tests.branching/merge-conflict-chunks.stderr
create mode 100644 tests.branching/merge-conflict-chunks.stdout
create mode 100644 tests.branching/merge-conflict-stratum.exit
create mode 100755 tests.branching/merge-conflict-stratum.script
create mode 100644 tests.branching/merge-conflict-stratum.stderr
create mode 100644 tests.branching/merge-conflict-stratum.stdout
--
1.7.10.4
10 years, 8 months
[PATCH] Update morph to use tarballs instead of bundles
by Daniel Silverstone
Repo: baserock:morph
Ref : danielsilverstone/tarballs-instead-of-bundles
SHA1: ebed9ace77eed4b8e40675cff40a96f61ae291e2
This updates morph to use tarballs instead of bundles when preparing local git
caches. Current Lorry generates both tarballs and bundles although tarballs
are way more efficient for both ends of the process. The only issue is that
git.baserock.org's Lorry does not currently have tarballs generated for
everything. (I will fix that up as and when we merge this to master)
Daniel Silverstone (1):
Use tarballs instead of bundles
README | 8 +--
baserock-bootstrap | 10 ++--
morphlib/app.py | 10 ++--
morphlib/localrepocache.py | 64 ++++++++++++++++----------
morphlib/localrepocache_tests.py | 35 +++++++++++---
morphlib/plugins/show_dependencies_plugin.py | 4 +-
morphlib/plugins/update_gits_plugin.py | 4 +-
morphlib/util.py | 4 +-
scripts/clean-git-cache | 2 +-
scripts/test-morph | 1 +
10 files changed, 88 insertions(+), 54 deletions(-)
--
1.7.5.4
10 years, 8 months
[PATCH] 'morph edit' should take chunk morphology name, not artifact name
by Sam Thursfield
Repository: git://git.baserock.org/baserock/morph
Branch: samthursfield/S4905-edit-chunk-morphology-not-artifact
Sha1: b9c461638aecbee9ac568d089eba3c92d4c9910f
'morph edit' should operate on source, not built artifacts,
so the 'chunk' parameter should specify a morph name and not
a chunk artifact name.
Sam Thursfield (1):
Lookup chunks within strata by 'morph' field, not 'name'
morphlib/morph2.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
1.7.10.4
10 years, 8 months
[PATCH] Kernel morphologies
by Richard Maw
The various kernel morphologies were missing CGROUPS and AUTOFS4_FS,
these are claimed to be needed for systemd, and I assume we didn't
find this out earlier, because they are in the x86 defconfig.
Multiple branches have changes, the Sha1s are abbreviated, and
potentially incorrect, because my mouse stopped working.
Repo: git://git.baserock.org/delta/linux
For: baserock/morph
Ref: baserock/S4530/morph
Sha1: c0a080ed799
For: baserock/arm/versatile
Ref: baserock/S4530/arm/versatile
Sha1: 155e36d
For: baserock/arm/csb1724
Ref: baserock/S4530/arm/csb1724
Sha1: 9249688f3
For: baserock/arm/csb1724_mgmt-release
Ref: baserock/S4530/arm/csb1724_mgmt-release
Sha1: 8cad6f741
For: baserock/arm/csb1726
Ref: baserock/S4530/arm/csb1726
Sha1: 7dc8b9602
10 years, 8 months
