summaryrefslogtreecommitdiff
path: root/strata/foundation
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2015-07-16 11:09:21 +0100
committerBaserock Gerrit <gerrit@baserock.org>2015-07-19 20:20:21 +0000
commit2b9a378e7024dae98d16ce2de1468f65a095f309 (patch)
treeba118fba9a32ccdc7c3df67dde80d8c4b0373d83 /strata/foundation
parent7d3a901a14c1b3d6f636af9e60a5f84f5ad0777c (diff)
downloaddefinitions-2b9a378e7024dae98d16ce2de1468f65a095f309.tar.gz
Reformat all definitions according to a consistent style
This was done using the 'indent' tool, which uses a fork of PyYAML named 'ruamel.yaml' to rewrite YAML files without losing comments, ordering, or certain elements of formatting. My aim with doing this is to open the door to automated editing of the reference system definitions using the 'ruamel.yaml' library. This can be used to implement automated migration when we want to make changes to the YAML format that we use to represent Baserock system definitions. Although this looks drastic, remember that it's actually only altered 65 out of 608 .morph files -- the vast majority already pass unchanged through my version of ruamel.yaml. Change-Id: I95ec978714b5bd1c02c90183336a9fbb846cb692
Diffstat (limited to 'strata/foundation')
-rw-r--r--strata/foundation/btrfs-progs.morph3
-rw-r--r--strata/foundation/time-zone-database.morph3
2 files changed, 3 insertions, 3 deletions
diff --git a/strata/foundation/btrfs-progs.morph b/strata/foundation/btrfs-progs.morph
index 4e724dc9..807a115f 100644
--- a/strata/foundation/btrfs-progs.morph
+++ b/strata/foundation/btrfs-progs.morph
@@ -5,5 +5,4 @@ pre-configure-commands:
- ./autogen.sh
configure-commands:
# The change in the CFLAGS is needed to make the compilation succeed in armv5l
-- export CFLAGS="-O2 $CFLAGS";
- ./configure --prefix="$PREFIX" --disable-documentation
+- export CFLAGS="-O2 $CFLAGS"; ./configure --prefix="$PREFIX" --disable-documentation
diff --git a/strata/foundation/time-zone-database.morph b/strata/foundation/time-zone-database.morph
index c3c89bcf..701d781a 100644
--- a/strata/foundation/time-zone-database.morph
+++ b/strata/foundation/time-zone-database.morph
@@ -7,4 +7,5 @@ install-commands:
# ETCDIR is actually where the 'tzselect', 'zdump' and 'zic' commands get
# installed. Note that tzselect from this chunk will overlap with and override
# the tzselect binary from GLIBC.
-- make TOPDIR="$PREFIX" ETCDIR="$PREFIX/bin" TZDIR="$PREFIX/share/zoneinfo" DESTDIR="$DESTDIR" install
+- make TOPDIR="$PREFIX" ETCDIR="$PREFIX/bin" TZDIR="$PREFIX/share/zoneinfo" DESTDIR="$DESTDIR"
+ install