Add Wandboard/Pebble devel system
by Joe Burmeister
Repo: git://git.baserock.org/baserock/baserock/morphs
Branch: baserock/joeburmeister/wandboard-cleaned
Sha1: f2890ec4f8e4e6c173ca19c77af59592dc30791a
Land: master
card: S8664
Joe Burmeister (1):
Add Wandboard devel system.
bsp-wandboard.morph | 17 +++++++++++
deploy-pebble.morph | 12 ++++++++
devel-system-wandboard.morph | 52 ++++++++++++++++++++++++++++++++++
devel-system-wandboard/etc/morph.conf | 1 +
devel-system-wandboard/etc/resolv.conf | 1 +
devel-system-wandboard/manifest | 4 +++
src-fstab.configure | 2 ++
7 files changed, 89 insertions(+)
create mode 100644 bsp-wandboard.morph
create mode 100644 deploy-pebble.morph
create mode 100644 devel-system-wandboard.morph
create mode 120000 devel-system-wandboard/etc/morph.conf
create mode 100644 devel-system-wandboard/etc/resolv.conf
create mode 100644 devel-system-wandboard/manifest
create mode 100644 src-fstab.configure
--
1.8.1.2
9 years, 6 months
[PATCH] V2: busybix: Run NTP continuously
by Lars Wirzenius
repo: git://git.baserock.org/delta/busybox
branch: baserock/liw/S8704-always-ntpd
commit: 0cbca4c5ddd57bb6201b9547a9e1fd3cd75b2008
land: baserock/build-essential
card: S8704
(Force-pushed, sorry.)
Changed from the previous set: Use the ntpd wrapper script to parse
/etc/ntpd.conf in the systemd units. Also, install the wrapper in
/usr/sbin. Further, the script runs ntpd with exec, so the script
doesn't stay as a separate process, unnecessarily.
Lars Wirzenius (1):
Make NTP run continuously
busybox.morph | 17 +++++++++++++----
scripts/ntpd-set.sh | 31 -------------------------------
scripts/run-ntpd-with-config | 23 +++++++++++++++++++++++
systemd-units/ntpd-boot.service.in | 10 ++++++++++
systemd-units/ntpd.service.in | 10 ++++++----
5 files changed, 52 insertions(+), 39 deletions(-)
delete mode 100755 scripts/ntpd-set.sh
create mode 100755 scripts/run-ntpd-with-config
create mode 100644 systemd-units/ntpd-boot.service.in
--
1.7.10.4
9 years, 6 months
[PATCH] Ask for support in OpenStack deployment.
by Pedro Alvarez
Repo: git://git.baserock.org/baserock/baserock/morph.git
Branch: baserock/pedroalvarez/S8631/openstack-configure-write
Sha1: ce8f5fb4aace8d8e6ca5c1fd4316df680b36d81d
Pedro Alvarez (1):
exts: Add openstack configure/write exts
morphlib/exts/openstackssh.write | 169 ++++++++++++++++++++++++++++++++++++++
morphlib/exts/vdaboot.configure | 34 ++++++++
2 files changed, 203 insertions(+)
create mode 100755 morphlib/exts/openstackssh.write
create mode 100755 morphlib/exts/vdaboot.configure
--
1.7.10.4
9 years, 6 months
"ERROR: Conflicting versions of stratum 'foo' appear in build'
by Paul Sherwood
I've hit this a few times recently, and wanted to provide some thoughts:
1) you can use 'grep -C5 foo *morph' to see context and check that
all refs for foo point to the same SHA1 or branch.
2) note that if you are working in branch bar and have edited
the foo stratum, then all refs for foo will need to point to your
working bar branch.
It would be helpful if the ERROR message could be more explicit,
stating which conflicting versions it has found.
I believe branch+merge code is up for a re-write so it's probably
worth considering if this can be be fixed. for example maybe morph
should force all refs for foo to bar.
9 years, 6 months
Wandboard/Pebble boot sd image
by Joe Burmeister
Hi,
I've put the boot sd card image I'm using on fs1 at
"public/share/Wandboard_Pebble/".
I've included a README to explain it, but briefly.
The sd card image contains a u-boot in the first few "unused" meg.
This u-boot does nothing but boot run the u-boot script on the sd card's
partition.
This script, does nothing but setup some variables about the network and
tftp/nfs and boot the kernel specific script over tftp.
The idea of the two scripts is to separate out environment and kernel
boot requirements. This means if/when it's moved to device try, the sd
cards don't need touching. The sd cards environment config being a
script just makes it easier for anyone to edit it without having to boot
into u-boot.
Joe
9 years, 6 months
[PATCH 0/3] edit: Do not write default values
by Richard Maw
Repo: git://git.baserock.org/baserock/baserock/morph.git
Ref: baserock/richardmaw/S8694/edit-no-write-defaults
SHA1: de176078965265239082ce0f6860faf605f191c9
Land: master
This does not track the original input, instead it removes the keys
which are the same as the default value. Taking the approach that
having a canonical format is simpler.
Richard Maw (3):
Revert "Merge branch 'liw/restore-old-cmds'"
morphloader: Add method to unset default values
edit: Unset defaults before writing
morphlib/morphloader.py | 25 +++
morphlib/morphloader_tests.py | 108 +++++++++++++
morphlib/plugins/branch_and_merge_new_plugin.py | 3 +-
morphlib/plugins/branch_and_merge_plugin.py | 166 +-------------------
.../build-handles-stratum-build-depends.script | 2 +-
tests.as-root/build-with-external-strata.script | 2 +-
tests.branching/add-then-edit.script | 37 ++---
.../edit-checkouts-existing-chunk.script | 2 +-
tests.branching/edit-clones-chunk.script | 2 +-
tests.branching/edit-handles-submodules.script | 2 +-
.../edit-updates-stratum-build-depends.script | 2 +-
.../edit-updates-stratum-build-depends.stdout | 25 +--
tests.branching/edit-updates-stratum.script | 2 +-
tests.branching/edit-updates-stratum.stdout | 19 +--
...edit-works-after-branch-root-was-renamed.script | 2 +-
tests.branching/petrify.script | 2 +-
tests.branching/petrify.stdout | 8 -
tests.merging/move-chunk-repo.script | 4 +-
tests.merging/rename-stratum.script | 2 +-
yarns/branches-workspaces.yarn | 2 +-
yarns/implementations.yarn | 4 +-
21 files changed, 182 insertions(+), 239 deletions(-)
--
1.7.10.4
9 years, 6 months
[PATCH] busybox: Run NTP continously
by Lars Wirzenius
repo: git://git.baserock.org/delta/busybox
branch: baserock/liw/S8704-always-ntpd
commit: 23c75828310894173926c5d2b22268f57535d80f
land: baserock/build-essential
card: S7804
The way we have been starting ntpd has not worked very well. We didn't
run it as a daemon, and instead just run it on bootup. This patch
changes it that we run ntpd once at boot (to set the clock) and then
as a daemon (to keep the clock synchronised).
Lars Wirzenius (1):
Make NTP run continuously
busybox.morph | 17 +++++++++++++----
scripts/ntpd-set.sh | 31 -------------------------------
scripts/run-ntpd-with-config | 23 +++++++++++++++++++++++
systemd-units/ntpd-boot.service.in | 10 ++++++++++
systemd-units/ntpd.service.in | 10 ++++++----
5 files changed, 52 insertions(+), 39 deletions(-)
delete mode 100755 scripts/ntpd-set.sh
create mode 100755 scripts/run-ntpd-with-config
create mode 100644 systemd-units/ntpd-boot.service.in
--
1.7.10.4
9 years, 6 months
./check --full failing in morph master
by Lars Wirzenius
We currently have a situation where "./check --full" fails, at least for me,
in morph master. After some digging, and a discussion with Richard, it seems
that this is happening:
* tests.build/build-system-cmake.script is building a chunk in the "test"
build mode, which effectively mounts / as read-only (except it's somewhat
more complicated than that)
* when the test runs a build, it uses the host's toolchain, including the
host's ccache
* through various steps, this means ccache gets a $CCACHE_DIR set to
/tmp/ccache
* that directory is mounted read-only
* ccache tries to write to /tmp/ccache, and fails
* this fails the test
If the host's /tmp/ccache already has the ccache output, then the test
passes, since ccache need not write anything.
I've asked Richard to have a look at fixing this in some simple manner.
In the long run, I think we need to avoid having morph's test suite
run build commands, since they are always going to be different from
what happens on real builds: we can't afford to do real staging area
setup and bootstrapping of system branches in ./check. Instead, that
testing should be moved to a higher level of testing in the CI. That's
not a small change, though, so we need to get ./check passing first,
and Richard had an idea for how to do that fairly cleanly and quickly.
--
http://www.codethink.co.uk/ http://wiki.baserock.org/ http://www.baserock.com/
9 years, 6 months
[PATCH] Fix branching tests
by Richard Maw
Repo: git://git.baserock.org/baserock/baserock/morph.git
Ref: baserock/richardmaw/S8646/fix-tests
SHA1: e0bfd1a900fa0945a707ac219c282e95ca8527df
Land: master
The tests were broken by the increased validation done during checkout.
The test strata were minimal, but now they were minimal to the point of
being invalid.
This patch fixes the strata to have at least 1 chunk and either have
stratum build-depends or chunks with `build-mode: test`
This means that the expected output had to be amended.
Richard Maw (1):
tests: Make dummy strata pass validation
.../edit-updates-stratum-build-depends.stdout | 5 +-
tests.branching/edit-updates-stratum.stdout | 5 +-
tests.branching/petrify-no-double-petrify.stdout | 1 +
tests.branching/petrify.stdout | 4 +
tests.branching/setup | 1 +
tests.branching/setup-second-chunk | 2 +
tests.branching/tag-creates-commit-and-tag.stdout | 12 +-
tests.branching/tag-tag-works-as-expected.stdout | 12 +-
.../tag-works-with-multiple-morphs-repos.script | 59 ++++++----
.../tag-works-with-multiple-morphs-repos.stdout | 116 +++++++++++++-------
10 files changed, 139 insertions(+), 78 deletions(-)
--
1.7.10.4
9 years, 6 months
[PATCH 0/3] Protect the rootfs during bootstrap builds
by Richard Maw
Repo: git://git.baserock.org/baserock/baserock/morph.git
Ref: baserock/richardmaw/S8563/bootstrap-rootfs-protection
SHA1: 0569173401faa85d044c77ce9f8b1a247456c878
Land: master
This is required because otherwise when running a bootstrap you put your
host system at risk.
bootstrap builds are carefully crafted to work entirely in the
staging area, but it needs to read things from /, due to the nature
of bootstrapping.
Currently this means they also have full write access to your system.
This patch changes it so that it always uses linux-user-chroot, so it
chroots to / and uses the same options as staging builds to prevent
them altering the staging area.
This required a more complicated algorithm to work out which paths
needed to be made read-only to allow a set of paths to be writable,
previously it only considered a single directory.
This will break everything until the corresponding build-essential
branches are merged.
Richard Maw (3):
fsutils: add invert_paths function
stagingarea: use invert_paths to bind-mount ro
stagingarea: use linux-user-chroot in bootstraps
morphlib/fsutils.py | 82 ++++++++++++++++++++++++++++++++++++++++-----
morphlib/fsutils_tests.py | 74 ++++++++++++++++++++++++++++++++++++++++
morphlib/stagingarea.py | 58 ++++++++++++++++----------------
without-test-modules | 1 -
4 files changed, 178 insertions(+), 37 deletions(-)
create mode 100644 morphlib/fsutils_tests.py
--
1.7.10.4
9 years, 6 months
