diff options
author | Javier Jardón <jjardon@gnome.org> | 2015-02-06 18:01:40 +0000 |
---|---|---|
committer | Javier Jardón <jjardon@gnome.org> | 2015-02-06 18:02:09 +0000 |
commit | 72d295c7a74b378441b4524e347bb244c11af213 (patch) | |
tree | 3fb2abd6f4bc71484734294a92e231002551d3ba | |
parent | f4df0940f4f83be797a8d8cde7fef407fbb20b2c (diff) | |
parent | cc1f652d7587b0df059920fe3df2690839677430 (diff) | |
download | definitions-72d295c7a74b378441b4524e347bb244c11af213.tar.gz |
Merge branch 'baserock/jjardon/more_updates'
Reviewed-by: Sam Thursfield <sam.thursfield@codethink.co.uk>
Reviewed-By: Francisco Redondo Marchena <francisco.marchena@codethink.co.uk>
-rw-r--r-- | strata/foundation.morph | 4 | ||||
-rw-r--r-- | strata/tools.morph | 10 | ||||
-rw-r--r-- | strata/tools/vala-bootstrap.morph (renamed from strata/tools/vala.morph) | 2 |
3 files changed, 11 insertions, 5 deletions
diff --git a/strata/foundation.morph b/strata/foundation.morph index e5a0cc6e..9738938b 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -99,8 +99,8 @@ chunks: - name: fuse morph: strata/foundation/fuse.morph repo: upstream:fuse - ref: 13ee8f62d4aa3360adb6956fb30da0c858928fa2 - unpetrify-ref: baserock/genivi/morph + ref: 4163109fd5bfe67973262610dd95ae60888c92e9 + unpetrify-ref: fuse_2_9_bugfix build-depends: [] - name: btrfs-progs morph: strata/foundation/btrfs-progs.morph diff --git a/strata/tools.morph b/strata/tools.morph index fea33132..4d8c3f44 100644 --- a/strata/tools.morph +++ b/strata/tools.morph @@ -49,12 +49,18 @@ chunks: ref: ad232c6aa0c2a07830d61dc4b9912478634b23b5 unpetrify-ref: baserock/morph build-depends: [] -- name: vala - morph: strata/tools/vala.morph +- name: vala-bootstrap + morph: strata/tools/vala-bootstrap.morph repo: upstream:vala ref: 4e4a02c03445336237b36723b23a91670ef7621b unpetrify-ref: baserock/bootstrap build-depends: [] +- name: vala + repo: upstream:vala + ref: 682eba5880fbd76402dec10118883da913a7b255 + unpetrify-ref: 0.26.2 + build-depends: + - vala-bootstrap - name: u-boot morph: strata/tools/u-boot.morph repo: upstream:u-boot diff --git a/strata/tools/vala.morph b/strata/tools/vala-bootstrap.morph index dcac5d49..c09299f6 100644 --- a/strata/tools/vala.morph +++ b/strata/tools/vala-bootstrap.morph @@ -1,4 +1,4 @@ -name: vala +name: vala-bootstrap kind: chunk build-system: autotools configure-commands: |