[PATCH 0/2] Replace JSON morphologies with YAML
by Richard Maw
Repo: git://git.baserock.org/baserock/baserock/morphs.git
Ref: baserock/richardmaw/S8258/yaml-morphologies
Sha1: 1ec02fcd9546769bf120e35416950080c2d6f490
Land: master
I've stripped the diffs from the patches since they were too large
to be useful.
Richard Maw (2):
Remove bootstrap strata
Replace JSON morphologies with YAML.
audio-bluetooth.morph | 212 +++----
base-system-armv7-highbank.morph | 65 +-
base-system-armv7-versatile.morph | 65 +-
base-system-armv7b-highbank.morph | 65 +-
base-system-x86_32-generic.morph | 65 +-
base-system-x86_64-generic.morph | 65 +-
bootstrap-pass1.morph | 176 ------
bootstrap-pass2.morph | 297 ---------
bootstrap-pass3-imx53.morph | 17 -
bootstrap-pass3-x86_64-generic.morph | 17 -
bsp-armv7-highbank.morph | 32 +-
bsp-armv7-versatile.morph | 33 +-
bsp-armv7b-highbank.morph | 32 +-
bsp-imx53.morph | 33 +-
bsp-x86_32-generic.morph | 56 +-
bsp-x86_64-generic.morph | 56 +-
build-essential.morph | 584 +++++++++---------
build-essential.morph.yaml | 287 ---------
connectivity.morph | 82 +--
core.morph | 474 ++++++---------
devel-system-armv7-highbank.morph | 73 +--
devel-system-armv7-versatile.morph | 73 +--
devel-system-armv7b-highbank.morph | 73 +--
devel-system-x86_32-generic.morph | 73 +--
devel-system-x86_64-generic.morph | 73 +--
foundation.morph | 256 ++++----
genivi-baseline-system-armv7-versatile.morph | 130 ++--
genivi-baseline-system-x86_64-generic.morph | 130 ++--
genivi-devel-system-armv7-versatile.morph | 136 ++---
genivi-devel-system-x86_64-generic.morph | 136 ++---
genivi-foundation.morph | 60 +-
genivi-staging.morph | 44 +-
genivi-wayland-armv7-versatile.morph | 64 +-
genivi-wayland-x86_64-generic.morph | 64 +-
genivi-x-armv7-versatile.morph | 64 +-
genivi-x-x86_64-generic.morph | 64 +-
genivi.morph | 113 ++--
lua.morph | 32 +-
multimedia.morph | 61 +-
nfs.morph | 96 ++-
qt4-devel-system-x86_64-generic.morph | 121 ++--
qt4-sdk.morph | 32 +-
qt4-tools.morph | 98 ++-
qt5-devel-system-x86_64-generic.morph | 121 ++--
qt5-sdk.morph | 42 +-
qt5-tools.morph | 370 +++++-------
tools.morph | 291 ++++-----
wayland-armv7-versatile.morph | 81 +--
wayland-x86_64-generic.morph | 80 +--
x-armv7-versatile.morph | 411 +++++--------
x-common.morph | 833 +++++++++++---------------
x-x86_64-generic.morph | 465 ++++++--------
52 files changed, 2704 insertions(+), 4769 deletions(-)
delete mode 100644 bootstrap-pass1.morph
delete mode 100644 bootstrap-pass2.morph
delete mode 100644 bootstrap-pass3-imx53.morph
delete mode 100644 bootstrap-pass3-x86_64-generic.morph
delete mode 100644 build-essential.morph.yaml
--
1.7.10.4
9 years
- 1
- 3
[PATCH 0/4 v2] Add a test suite for baserock-system-config-sync
by Tiago Gomes
repo: ssh://git@git.baserock.org/baserock/baserock/tbdiff.git
branch: baserock/tiagogomes/bscs-test-suite
commit: 419af358bfb6d1fa0d937e1508963a92f14df0f0
Tiago Gomes (4):
Remove test mode and provide hooks to use a test suite.
Add a test suite for baserock-system-config-sync
Change the temporary directory used for tests to be based on the
current directory
Abort the build if some of the tests don't pass
Makefile.am | 2 +
.../baserock-system-config-sync | 32 ++---
.../config-sync-tests/tests.upgrades.dir.symb/vu/1 | 1 -
.../tests.upgrades.etc/v1/sshd_config | 123 --------------------
.../tests.upgrades.etc/v2/sshd_config | 123 --------------------
.../tests.upgrades.etc/vu/sshd_config | 123 --------------------
.../tests.upgrades.regular.symb/vu/1 | 1 -
.../tests.upgrades.symblinks/v1/sl1 | 1 -
.../tests.upgrades.symblinks/v1/sl2 | 1 -
.../tests.upgrades.symblinks/v1/sl3 | 1 -
.../tests.upgrades.symblinks/v2/sl1 | 1 -
.../tests.upgrades.symblinks/v2/sl3 | 1 -
.../tests.upgrades.symblinks/v2/sl4 | 1 -
.../tests.upgrades.symblinks/vu/sl1 | 1 -
.../tests.upgrades.symblinks/vu/sl2 | 1 -
.../tests.upgrades.symblinks/vu/sl4 | 1 -
.../config-sync-tests/tests.upgrades/v1/file1 | 2 -
.../config-sync-tests/tests.upgrades/v1/file4 | 2 -
.../config-sync-tests/tests.upgrades/v1/file5 | 2 -
.../config-sync-tests/tests.upgrades/v1/file7 | 2 -
.../config-sync-tests/tests.upgrades/v1/file7.1 | 8 --
.../tests.upgrades/v1/subdir1/subfile1 | 10 --
.../config-sync-tests/tests.upgrades/v2/file3 | 2 -
.../config-sync-tests/tests.upgrades/v2/file4 | 2 -
.../config-sync-tests/tests.upgrades/v2/file6 | 2 -
.../config-sync-tests/tests.upgrades/v2/file7 | 2 -
.../config-sync-tests/tests.upgrades/v2/file7.1 | 8 --
.../tests.upgrades/v2/subdir1/subfile1 | 10 --
.../config-sync-tests/tests.upgrades/vu/file2 | 2 -
.../config-sync-tests/tests.upgrades/vu/file5 | 2 -
.../config-sync-tests/tests.upgrades/vu/file6 | 2 -
.../config-sync-tests/tests.upgrades/vu/file7 | 2 -
tests/bscs-merge.fail/dir.symb.in/systems/default | 1 +
.../dir.symb.in/systems/factory/run/etc/1 | 1 +
tests/bscs-merge.fail/dir.symb.out/systems/default | 1 +
.../dir.symb.out/systems/factory/run/etc/1 | 1 +
.../bscs-merge.fail/regular.dir.in/systems/default | 1 +
.../regular.dir.out/systems/default | 1 +
.../regular.symb.in/systems/default | 1 +
.../regular.symb.in/systems/factory/run/etc/1 | 1 +
.../regular.symb.out/systems/default | 1 +
.../regular.symb.out/systems/factory/run/etc/1 | 1 +
tests/bscs-merge.pass/empty.in/systems/default | 1 +
.../empty.in/systems/factory/orig/etc/v1v2-1 | 1 +
.../empty.in/systems/factory/orig/etc/v1v2-2 | 1 +
.../empty.in/systems/factory/orig/etc/v1vu-1 | 1 +
.../empty.in/systems/factory/orig/etc/v1vuv2-1 | 1 +
.../empty.in/systems/factory/run/etc/v1vu-2 | 1 +
.../empty.in/systems/factory/run/etc/v1vuv2-1 | 1 +
.../empty.in/systems/factory/run/etc/vuv2-2 | 1 +
.../empty.in/systems/version2/orig/etc/v1v2-1 | 1 +
.../empty.in/systems/version2/orig/etc/v1vuv2-1 | 1 +
.../empty.in/systems/version2/orig/etc/vuv2-1 | 1 +
.../empty.in/systems/version2/run/etc/v1v2-1 | 1 +
.../empty.in/systems/version2/run/etc/v1vuv2-1 | 1 +
.../empty.in/systems/version2/run/etc/vuv2-1 | 1 +
tests/bscs-merge.pass/empty.out/systems/default | 1 +
.../empty.out/systems/factory/orig/etc/v1v2-1 | 1 +
.../empty.out/systems/factory/orig/etc/v1v2-2 | 1 +
.../empty.out/systems/factory/orig/etc/v1vu-1 | 1 +
.../empty.out/systems/factory/orig/etc/v1vuv2-1 | 1 +
.../empty.out/systems/factory/run/etc/v1vu-2 | 1 +
.../empty.out/systems/factory/run/etc/v1vuv2-1 | 1 +
.../empty.out/systems/factory/run/etc/vuv2-2 | 1 +
.../empty.out/systems/version2/orig/etc/v1v2-1 | 1 +
.../empty.out/systems/version2/orig/etc/v1vuv2-1 | 1 +
.../empty.out/systems/version2/orig/etc/vuv2-1 | 1 +
.../empty.out/systems/version2/run/etc/v1v2-1 | 1 +
.../empty.out/systems/version2/run/etc/v1vu-2 | 1 +
.../empty.out/systems/version2/run/etc/v1vuv2-1 | 1 +
.../empty.out/systems/version2/run/etc/vuv2-2 | 1 +
tests/bscs-merge.pass/sshconf.in/systems/default | 1 +
.../systems/factory/orig/etc/sshd_config | 123 ++++++++++++++++++++
.../sshconf.in/systems/factory/run/etc/sshd_config | 123 ++++++++++++++++++++
.../systems/version2/orig/etc/sshd_config | 123 ++++++++++++++++++++
.../systems/version2/run/etc/sshd_config | 123 ++++++++++++++++++++
tests/bscs-merge.pass/sshconf.out/systems/default | 1 +
.../systems/factory/orig/etc/sshd_config | 123 ++++++++++++++++++++
.../systems/factory/run/etc/sshd_config | 123 ++++++++++++++++++++
.../systems/version2/orig/etc/sshd_config | 123 ++++++++++++++++++++
.../systems/version2/run/etc/sshd_config | 123 ++++++++++++++++++++
tests/bscs-merge.pass/symblinks.in/systems/default | 1 +
.../symblinks.in/systems/factory/orig/etc/v1 | 1 +
.../symblinks.in/systems/factory/orig/etc/v1v2 | 1 +
.../symblinks.in/systems/factory/orig/etc/v1vu | 1 +
.../symblinks.in/systems/factory/orig/etc/v1vuv2 | 1 +
.../symblinks.in/systems/factory/run/etc/v1vu | 1 +
.../symblinks.in/systems/factory/run/etc/v1vuv2 | 1 +
.../symblinks.in/systems/factory/run/etc/vu | 1 +
.../symblinks.in/systems/factory/run/etc/vuv2 | 1 +
.../symblinks.in/systems/version2/orig/etc/v1v2 | 1 +
.../symblinks.in/systems/version2/orig/etc/v1vuv2 | 1 +
.../symblinks.in/systems/version2/orig/etc/v2 | 1 +
.../symblinks.in/systems/version2/orig/etc/vuv2 | 1 +
.../symblinks.in/systems/version2/run/etc/v1v2 | 1 +
.../symblinks.in/systems/version2/run/etc/v1vuv2 | 1 +
.../symblinks.in/systems/version2/run/etc/v2 | 1 +
.../symblinks.in/systems/version2/run/etc/vuv2 | 1 +
tests/bscs-merge.pass/symblinks.in/v1 | 1 +
tests/bscs-merge.pass/symblinks.in/v2 | 1 +
tests/bscs-merge.pass/symblinks.in/vu | 1 +
.../bscs-merge.pass/symblinks.out/systems/default | 1 +
.../symblinks.out/systems/factory/orig/etc/v1 | 1 +
.../symblinks.out/systems/factory/orig/etc/v1v2 | 1 +
.../symblinks.out/systems/factory/orig/etc/v1vu | 1 +
.../symblinks.out/systems/factory/orig/etc/v1vuv2 | 1 +
.../symblinks.out/systems/factory/run/etc/v1vu | 1 +
.../symblinks.out/systems/factory/run/etc/v1vuv2 | 1 +
.../symblinks.out/systems/factory/run/etc/vu | 1 +
.../symblinks.out/systems/factory/run/etc/vuv2 | 1 +
.../symblinks.out/systems/version2/orig/etc/v1v2 | 1 +
.../symblinks.out/systems/version2/orig/etc/v1vuv2 | 1 +
.../symblinks.out/systems/version2/orig/etc/v2 | 1 +
.../symblinks.out/systems/version2/orig/etc/vuv2 | 1 +
.../symblinks.out/systems/version2/run/etc/v1 | 1 +
.../symblinks.out/systems/version2/run/etc/v1v2 | 1 +
.../symblinks.out/systems/version2/run/etc/v1vu | 1 +
.../symblinks.out/systems/version2/run/etc/v1vuv2 | 1 +
.../symblinks.out/systems/version2/run/etc/v2 | 1 +
.../symblinks.out/systems/version2/run/etc/vu | 1 +
.../symblinks.out/systems/version2/run/etc/vuv2 | 1 +
tests/bscs-merge.pass/symblinks.out/v1 | 1 +
tests/bscs-merge.pass/symblinks.out/v2 | 1 +
tests/bscs-merge.pass/symblinks.out/vu | 1 +
tests/bscs-merge.pass/upgrades.in/systems/default | 1 +
.../upgrades.in/systems/factory/orig/etc/file1 | 2 +
.../upgrades.in/systems/factory/orig/etc/file4 | 2 +
.../upgrades.in/systems/factory/orig/etc/file5 | 2 +
.../upgrades.in/systems/factory/orig/etc/file7 | 2 +
.../upgrades.in/systems/factory/orig/etc/file7.1 | 8 ++
.../systems/factory/orig/etc/subdir1/subfile1 | 10 ++
.../upgrades.in/systems/factory/run/etc/file2 | 2 +
.../upgrades.in/systems/factory/run/etc/file5 | 2 +
.../upgrades.in/systems/factory/run/etc/file6 | 2 +
.../upgrades.in/systems/factory/run/etc/file7 | 2 +
.../upgrades.in/systems/version2/orig/etc/file3 | 2 +
.../upgrades.in/systems/version2/orig/etc/file4 | 2 +
.../upgrades.in/systems/version2/orig/etc/file6 | 2 +
.../upgrades.in/systems/version2/orig/etc/file7 | 2 +
.../upgrades.in/systems/version2/orig/etc/file7.1 | 8 ++
.../systems/version2/orig/etc/subdir1/subfile1 | 10 ++
.../upgrades.in/systems/version2/run/etc/file3 | 2 +
.../upgrades.in/systems/version2/run/etc/file4 | 2 +
.../upgrades.in/systems/version2/run/etc/file6 | 2 +
.../upgrades.in/systems/version2/run/etc/file7 | 2 +
.../upgrades.in/systems/version2/run/etc/file7.1 | 8 ++
.../systems/version2/run/etc/subdir1/subfile1 | 10 ++
tests/bscs-merge.pass/upgrades.out/systems/default | 1 +
.../upgrades.out/systems/factory/orig/etc/file1 | 2 +
.../upgrades.out/systems/factory/orig/etc/file4 | 2 +
.../upgrades.out/systems/factory/orig/etc/file5 | 2 +
.../upgrades.out/systems/factory/orig/etc/file7 | 2 +
.../upgrades.out/systems/factory/orig/etc/file7.1 | 8 ++
.../systems/factory/orig/etc/subdir1/subfile1 | 10 ++
.../upgrades.out/systems/factory/run/etc/file2 | 2 +
.../upgrades.out/systems/factory/run/etc/file5 | 2 +
.../upgrades.out/systems/factory/run/etc/file6 | 2 +
.../upgrades.out/systems/factory/run/etc/file7 | 2 +
.../upgrades.out/systems/version2/orig/etc/file3 | 2 +
.../upgrades.out/systems/version2/orig/etc/file4 | 2 +
.../upgrades.out/systems/version2/orig/etc/file6 | 2 +
.../upgrades.out/systems/version2/orig/etc/file7 | 2 +
.../upgrades.out/systems/version2/orig/etc/file7.1 | 8 ++
.../systems/version2/orig/etc/subdir1/subfile1 | 10 ++
.../upgrades.out/systems/version2/run/etc/file1 | 2 +
.../upgrades.out/systems/version2/run/etc/file2 | 2 +
.../upgrades.out/systems/version2/run/etc/file3 | 2 +
.../upgrades.out/systems/version2/run/etc/file4 | 2 +
.../upgrades.out/systems/version2/run/etc/file5 | 2 +
.../upgrades.out/systems/version2/run/etc/file6 | 2 +
.../upgrades.out/systems/version2/run/etc/file7 | 2 +
.../upgrades.out/systems/version2/run/etc/file7.1 | 8 ++
.../systems/version2/run/etc/file7.rej | 6 +
.../systems/version2/run/etc/subdir1/subfile1 | 10 ++
tests/bscs-sync.in/systems/default | 1 +
tests/bscs-sync.in/systems/factory/orig/etc/config | 1 +
.../bscs-sync.in/systems/factory/orig/etc/config1 | 2 +
.../systems/factory/orig/etc/folder1/config2 | 2 +
tests/bscs-sync.in/systems/factory/run/etc/config | 1 +
tests/bscs-sync.in/systems/factory/run/etc/config1 | 3 +
.../systems/factory/run/etc/folder1/config2 | 2 +
.../bscs-sync.in/systems/version2/orig/etc/config | 1 +
.../bscs-sync.in/systems/version2/orig/etc/config1 | 2 +
.../systems/version2/orig/etc/folder1/config2 | 2 +
tests/bscs-sync.in/systems/version2/run/etc/config | 1 +
.../bscs-sync.in/systems/version2/run/etc/config1 | 3 +
.../systems/version2/run/etc/folder1/config2 | 2 +
.../bscs-sync.in/systems/version3/orig/etc/config | 1 +
.../bscs-sync.in/systems/version3/orig/etc/config1 | 2 +
.../systems/version3/orig/etc/folder1/config2 | 2 +
tests/bscs-sync.in/systems/version3/run/etc/config | 1 +
.../bscs-sync.in/systems/version3/run/etc/config1 | 3 +
.../systems/version3/run/etc/folder1/config2 | 2 +
tests/bscs-sync.out/systems/default | 1 +
.../bscs-sync.out/systems/factory/orig/etc/config | 1 +
.../bscs-sync.out/systems/factory/orig/etc/config1 | 2 +
.../systems/factory/orig/etc/folder1/config2 | 2 +
tests/bscs-sync.out/systems/factory/run/etc/config | 1 +
.../bscs-sync.out/systems/factory/run/etc/config1 | 3 +
.../systems/factory/run/etc/folder1/config2 | 2 +
.../bscs-sync.out/systems/version2/orig/etc/config | 1 +
.../systems/version2/orig/etc/config1 | 2 +
.../systems/version2/orig/etc/folder1/config2 | 2 +
.../bscs-sync.out/systems/version2/run/etc/config | 1 +
.../bscs-sync.out/systems/version2/run/etc/config1 | 3 +
.../systems/version2/run/etc/folder1/config2 | 2 +
.../bscs-sync.out/systems/version3/orig/etc/config | 1 +
.../systems/version3/orig/etc/config1 | 2 +
.../systems/version3/orig/etc/folder1/config2 | 2 +
.../bscs-sync.out/systems/version3/run/etc/config | 1 +
.../bscs-sync.out/systems/version3/run/etc/config1 | 3 +
.../systems/version3/run/etc/folder1/config2 | 2 +
tests/fake_mounting_script.sh | 36 ++++++
tests/run_tests.sh | 70 ++++++++++-
tests/test_lib.sh | 4 +-
215 files changed, 1441 insertions(+), 465 deletions(-)
delete mode 120000 baserock-system-config-sync/config-sync-tests/tests.upgrades.dir.symb/vu/1
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades.dir.symb/vu/afile
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades.etc/v1/sshd_config
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades.etc/v2/sshd_config
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades.etc/vu/sshd_config
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.dir/v1/1
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.dir/v2/1
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/v1/1
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/v2/1
delete mode 120000 baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/vu/1
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/vu/afile
delete mode 120000 baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1/sl1
delete mode 120000 baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1/sl2
delete mode 120000 baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1/sl3
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1f
delete mode 120000 baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2/sl1
delete mode 120000 baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2/sl3
delete mode 120000 baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2/sl4
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2f
delete mode 120000 baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vu/sl1
delete mode 120000 baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vu/sl2
delete mode 120000 baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vu/sl4
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vuf
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file1
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file4
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file5
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file7
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file7.1
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/subdir1/subfile1
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/subdir1/subsubdir2/subsubfile4
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file3
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file4
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file6
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file7
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file7.1
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/subdir1/subfile1
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/subdir1/subsubdir2/subsubfile4
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file2
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file5
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file6
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file7
create mode 120000 tests/bscs-merge.fail/dir.symb.in/systems/default
create mode 120000 tests/bscs-merge.fail/dir.symb.in/systems/factory/run/etc/1
create mode 100644 tests/bscs-merge.fail/dir.symb.in/systems/factory/run/etc/afile
create mode 120000 tests/bscs-merge.fail/dir.symb.out/systems/default
create mode 120000 tests/bscs-merge.fail/dir.symb.out/systems/factory/run/etc/1
create mode 100644 tests/bscs-merge.fail/dir.symb.out/systems/factory/run/etc/afile
create mode 120000 tests/bscs-merge.fail/regular.dir.in/systems/default
create mode 100644 tests/bscs-merge.fail/regular.dir.in/systems/factory/orig/etc/1
create mode 100644 tests/bscs-merge.fail/regular.dir.in/systems/version2/orig/etc/1
create mode 100644 tests/bscs-merge.fail/regular.dir.in/systems/version2/run/etc/1
create mode 120000 tests/bscs-merge.fail/regular.dir.out/systems/default
create mode 100644 tests/bscs-merge.fail/regular.dir.out/systems/factory/orig/etc/1
create mode 100644 tests/bscs-merge.fail/regular.dir.out/systems/version2/orig/etc/1
create mode 100644 tests/bscs-merge.fail/regular.dir.out/systems/version2/run/etc/1
create mode 120000 tests/bscs-merge.fail/regular.symb.in/systems/default
create mode 100644 tests/bscs-merge.fail/regular.symb.in/systems/factory/orig/etc/1
create mode 120000 tests/bscs-merge.fail/regular.symb.in/systems/factory/run/etc/1
create mode 100644 tests/bscs-merge.fail/regular.symb.in/systems/factory/run/etc/afile
create mode 100644 tests/bscs-merge.fail/regular.symb.in/systems/version2/orig/etc/1
create mode 100644 tests/bscs-merge.fail/regular.symb.in/systems/version2/run/etc/1
create mode 120000 tests/bscs-merge.fail/regular.symb.out/systems/default
create mode 100644 tests/bscs-merge.fail/regular.symb.out/systems/factory/orig/etc/1
create mode 120000 tests/bscs-merge.fail/regular.symb.out/systems/factory/run/etc/1
create mode 100644 tests/bscs-merge.fail/regular.symb.out/systems/factory/run/etc/afile
create mode 100644 tests/bscs-merge.fail/regular.symb.out/systems/version2/orig/etc/1
create mode 100644 tests/bscs-merge.fail/regular.symb.out/systems/version2/run/etc/1
create mode 120000 tests/bscs-merge.pass/empty.in/systems/default
create mode 100644 tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1v2-1
create mode 100644 tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1v2-2
create mode 100644 tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1vu-1
create mode 100644 tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1vu-2
create mode 100644 tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.in/systems/factory/run/etc/v1vu-1
create mode 100644 tests/bscs-merge.pass/empty.in/systems/factory/run/etc/v1vu-2
create mode 100644 tests/bscs-merge.pass/empty.in/systems/factory/run/etc/v1vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.in/systems/factory/run/etc/vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.in/systems/factory/run/etc/vuv2-2
create mode 100644 tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/v1v2-1
create mode 100644 tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/v1v2-2
create mode 100644 tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/v1vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/vuv2-2
create mode 100644 tests/bscs-merge.pass/empty.in/systems/version2/run/etc/v1v2-1
create mode 100644 tests/bscs-merge.pass/empty.in/systems/version2/run/etc/v1v2-2
create mode 100644 tests/bscs-merge.pass/empty.in/systems/version2/run/etc/v1vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.in/systems/version2/run/etc/vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.in/systems/version2/run/etc/vuv2-2
create mode 120000 tests/bscs-merge.pass/empty.out/systems/default
create mode 100644 tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1v2-1
create mode 100644 tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1v2-2
create mode 100644 tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1vu-1
create mode 100644 tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1vu-2
create mode 100644 tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.out/systems/factory/run/etc/v1vu-1
create mode 100644 tests/bscs-merge.pass/empty.out/systems/factory/run/etc/v1vu-2
create mode 100644 tests/bscs-merge.pass/empty.out/systems/factory/run/etc/v1vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.out/systems/factory/run/etc/vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.out/systems/factory/run/etc/vuv2-2
create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1v2-1
create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1v2-2
create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/vuv2-2
create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1v2-1
create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1v2-2
create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vu-1
create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vu-2
create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/run/etc/vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/run/etc/vuv2-2
create mode 120000 tests/bscs-merge.pass/sshconf.in/systems/default
create mode 100644 tests/bscs-merge.pass/sshconf.in/systems/factory/orig/etc/sshd_config
create mode 100644 tests/bscs-merge.pass/sshconf.in/systems/factory/run/etc/sshd_config
create mode 100644 tests/bscs-merge.pass/sshconf.in/systems/version2/orig/etc/sshd_config
create mode 100644 tests/bscs-merge.pass/sshconf.in/systems/version2/run/etc/sshd_config
create mode 120000 tests/bscs-merge.pass/sshconf.out/systems/default
create mode 100644 tests/bscs-merge.pass/sshconf.out/systems/factory/orig/etc/sshd_config
create mode 100644 tests/bscs-merge.pass/sshconf.out/systems/factory/run/etc/sshd_config
create mode 100644 tests/bscs-merge.pass/sshconf.out/systems/version2/orig/etc/sshd_config
create mode 100644 tests/bscs-merge.pass/sshconf.out/systems/version2/run/etc/sshd_config
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/default
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/v1
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/v1v2
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/v1vu
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/v1vuv2
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/v1vu
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/v1vuv2
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/vu
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/vuv2
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/v1v2
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/v1vuv2
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/v2
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/vuv2
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/v1v2
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/v1vuv2
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/v2
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/vuv2
create mode 100644 tests/bscs-merge.pass/symblinks.in/v1
create mode 100644 tests/bscs-merge.pass/symblinks.in/v2
create mode 100644 tests/bscs-merge.pass/symblinks.in/vu
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/default
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/v1
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/v1v2
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/v1vu
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/v1vuv2
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/v1vu
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/v1vuv2
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/vu
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/vuv2
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/v1v2
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/v1vuv2
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/v2
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/vuv2
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v1
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v1v2
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v1vu
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v1vuv2
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v2
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/vu
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/vuv2
create mode 100644 tests/bscs-merge.pass/symblinks.out/v1
create mode 100644 tests/bscs-merge.pass/symblinks.out/v2
create mode 100644 tests/bscs-merge.pass/symblinks.out/vu
create mode 120000 tests/bscs-merge.pass/upgrades.in/systems/default
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file1
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file4
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file5
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file7
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file7.1
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/subdir1/subfile1
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/subdir1/subsubdir2/subsubfile4
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file2
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file5
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file6
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file7
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file3
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file4
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file6
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file7
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file7.1
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/subdir1/subfile1
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/subdir1/subsubdir2/subsubfile4
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file3
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file4
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file6
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file7
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file7.1
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/subdir1/subfile1
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/subdir1/subsubdir2/subsubfile4
create mode 120000 tests/bscs-merge.pass/upgrades.out/systems/default
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file1
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file4
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file5
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file7
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file7.1
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/subdir1/subfile1
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/subdir1/subsubdir2/subsubfile4
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file2
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file5
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file6
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file7
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file3
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file4
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file6
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file7
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file7.1
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/subdir1/subfile1
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/subdir1/subsubdir2/subsubfile4
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file1
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file2
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file3
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file4
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file5
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file6
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7.1
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7.rej
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/subdir1/subfile1
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/subdir1/subsubdir2/subsubfile4
create mode 120000 tests/bscs-sync.in/systems/default
create mode 120000 tests/bscs-sync.in/systems/factory/orig/etc/config
create mode 100644 tests/bscs-sync.in/systems/factory/orig/etc/config1
create mode 100644 tests/bscs-sync.in/systems/factory/orig/etc/folder1/config2
create mode 120000 tests/bscs-sync.in/systems/factory/run/etc/config
create mode 100644 tests/bscs-sync.in/systems/factory/run/etc/config1
create mode 100644 tests/bscs-sync.in/systems/factory/run/etc/folder1/config2
create mode 120000 tests/bscs-sync.in/systems/version2/orig/etc/config
create mode 100644 tests/bscs-sync.in/systems/version2/orig/etc/config1
create mode 100644 tests/bscs-sync.in/systems/version2/orig/etc/folder1/config2
create mode 120000 tests/bscs-sync.in/systems/version2/run/etc/config
create mode 100644 tests/bscs-sync.in/systems/version2/run/etc/config1
create mode 100644 tests/bscs-sync.in/systems/version2/run/etc/folder1/config2
create mode 100644 tests/bscs-sync.in/systems/version2/run/etc/folder2/iamgoingbeoverwritten
create mode 120000 tests/bscs-sync.in/systems/version3/orig/etc/config
create mode 100644 tests/bscs-sync.in/systems/version3/orig/etc/config1
create mode 100644 tests/bscs-sync.in/systems/version3/orig/etc/folder1/config2
create mode 120000 tests/bscs-sync.in/systems/version3/run/etc/config
create mode 100644 tests/bscs-sync.in/systems/version3/run/etc/config1
create mode 100644 tests/bscs-sync.in/systems/version3/run/etc/folder1/config2
create mode 120000 tests/bscs-sync.out/systems/default
create mode 120000 tests/bscs-sync.out/systems/factory/orig/etc/config
create mode 100644 tests/bscs-sync.out/systems/factory/orig/etc/config1
create mode 100644 tests/bscs-sync.out/systems/factory/orig/etc/folder1/config2
create mode 120000 tests/bscs-sync.out/systems/factory/run/etc/config
create mode 100644 tests/bscs-sync.out/systems/factory/run/etc/config1
create mode 100644 tests/bscs-sync.out/systems/factory/run/etc/folder1/config2
create mode 120000 tests/bscs-sync.out/systems/version2/orig/etc/config
create mode 100644 tests/bscs-sync.out/systems/version2/orig/etc/config1
create mode 100644 tests/bscs-sync.out/systems/version2/orig/etc/folder1/config2
create mode 120000 tests/bscs-sync.out/systems/version2/run/etc/config
create mode 100644 tests/bscs-sync.out/systems/version2/run/etc/config1
create mode 100644 tests/bscs-sync.out/systems/version2/run/etc/folder1/config2
create mode 120000 tests/bscs-sync.out/systems/version3/orig/etc/config
create mode 100644 tests/bscs-sync.out/systems/version3/orig/etc/config1
create mode 100644 tests/bscs-sync.out/systems/version3/orig/etc/folder1/config2
create mode 120000 tests/bscs-sync.out/systems/version3/run/etc/config
create mode 100644 tests/bscs-sync.out/systems/version3/run/etc/config1
create mode 100644 tests/bscs-sync.out/systems/version3/run/etc/folder1/config2
create mode 100755 tests/fake_mounting_script.sh
--
1.7.10.4
9 years
- 2
- 6
Verbose morph error messages
by Richard Dale
-bash-4.2# morph branch help
ERROR: morph branch needs name of branch as parameter
-bash-4.2# morph edit help
ERROR: morph edit must either get a system and a stratum or a system, a
stratum and a chunk as arguments
Why doesn't morph just give usage messages in the same format as 'morph
help' gives you?
Usage: morph [options] branch REPO NEW [OLD]
and
Usage: morph [options] edit SYSTEM STRATUM [CHUNK]
9 years
- 2
- 3
[PATCH v2] Improvements to ssh-rsync extension
by Tiago Gomes
repo: git://git.baserock.org/baserock/baserock/morph.git
branch: baserock/tiagogomes/ssh-rsync-work
commit: f39ad00ec04db0548a9b8131c0ce28b13f1add33
Tiago Gomes (1):
Improvements to ssh-rsync extension
morphlib/exts/ssh-rsync.write | 145 ++++++++++++++++++++++-------------------
1 file changed, 77 insertions(+), 68 deletions(-)
--
1.7.10.4
9 years
- 2
- 3
[PATCH] Improvements to ssh-rsync extension
by Tiago Gomes
repo: ssh://git@git.baserock.org/baserock/baserock/morph
branch: baserock/tiagogomes/ssh-rsync-work
commit: 8af8e58ae1b2c44489501c5028105a90473c6f87
Tiago Gomes (1):
Improvements to ssh-rsync extension
morphlib/exts/ssh-rsync.write | 145 ++++++++++++++++++++++-------------------
1 file changed, 77 insertions(+), 68 deletions(-)
--
1.7.10.4
9 years
- 2
- 10