summaryrefslogtreecommitdiff
path: root/strata
diff options
context:
space:
mode:
Diffstat (limited to 'strata')
-rw-r--r--strata/bsp-jetson-devel.morph4
-rw-r--r--strata/morph-utils.morph2
-rw-r--r--strata/ruby.morph22
-rw-r--r--strata/ruby/hoe.morph16
-rw-r--r--strata/ruby/rake-compiler.morph15
-rw-r--r--strata/trove.morph4
6 files changed, 57 insertions, 6 deletions
diff --git a/strata/bsp-jetson-devel.morph b/strata/bsp-jetson-devel.morph
index a8fc696a..e5f52a9c 100644
--- a/strata/bsp-jetson-devel.morph
+++ b/strata/bsp-jetson-devel.morph
@@ -20,8 +20,8 @@ chunks:
- name: u-boot
morph: strata/bsp-jetson-devel/u-boot.morph
repo: upstream:u-boot
- ref: c77921345b943cdf5f2f28bbe88c6d8970620d2e
- unpetrify-ref: baserock/jetson/u-boot-tegra-next
+ ref: b15ae44ab9f085140039b09a00232d5aed6596a9
+ unpetrify-ref: baserock/arm/tegra-uboot-btrfs
build-depends:
- device-tree-compiler
- name: linux-jetson-tk1
diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph
index e053a2fd..6c3fc412 100644
--- a/strata/morph-utils.morph
+++ b/strata/morph-utils.morph
@@ -71,7 +71,7 @@ chunks:
build-depends: []
- name: morph
repo: baserock:baserock/morph
- ref: 7ec6c09f1cfe109f1a6b4a080504a2f6a1b159da
+ ref: 8036c2ddfdbf9f6b35ea76244b98a10b1d76c55b
unpetrify-ref: master
build-depends:
- cliapp
diff --git a/strata/ruby.morph b/strata/ruby.morph
index 45db406d..c5bd9993 100644
--- a/strata/ruby.morph
+++ b/strata/ruby.morph
@@ -1,6 +1,12 @@
name: ruby
kind: stratum
-description: ruby and things from ruby world
+description: |
+ Ruby and common Ruby build dependencies.
+
+ Most Gem dependencies are not required when building or installing the
+ Gem. They are needed at runtime only. Tools which extend Rake, such as
+ 'hoe' and 'rake-compiler', are exceptions to that rule, and are kept
+ in this stratum so they are always available when building other Gems.
build-depends:
- morph: strata/tools.morph
chunks:
@@ -30,3 +36,17 @@ chunks:
unpetrify-ref: baserock/v1.6.2
build-depends:
- ruby
+- name: hoe
+ morph: strata/ruby/hoe.morph
+ repo: upstream:ruby-gems/hoe
+ ref: 50a2706d0f70ece52922ddcc56630e1e0655b83e
+ unpetrify-ref: master
+ build-depends:
+ - ruby
+- name: rake-compiler
+ morph: strata/ruby/rake-compiler.morph
+ repo: upstream:ruby-gems/rake-compiler
+ ref: aaed621f6fdb0b0395775fea5464cc83e794fbdb
+ unpetrify-ref: v0.9.3
+ build-depends:
+ - ruby
diff --git a/strata/ruby/hoe.morph b/strata/ruby/hoe.morph
new file mode 100644
index 00000000..0d06a82a
--- /dev/null
+++ b/strata/ruby/hoe.morph
@@ -0,0 +1,16 @@
+name: hoe
+kind: chunk
+description: |
+ Hoe is a rake/rubygems helper for project Rakefiles. It helps you
+ manage, maintain, and release your project and includes a dynamic
+ plug-in system allowing for easy extensibility.
+products:
+- artifact: hoe-doc
+ include:
+ - usr/lib/ruby/gems/\d[\w.]*/doc/.*
+build-commands:
+- rake gem
+install-commands:
+- mkdir -p "$DESTDIR/$(gem environment home)"
+- gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin"
+ --ignore-dependencies --local ./pkg/hoe-*.gem
diff --git a/strata/ruby/rake-compiler.morph b/strata/ruby/rake-compiler.morph
new file mode 100644
index 00000000..9286f14a
--- /dev/null
+++ b/strata/ruby/rake-compiler.morph
@@ -0,0 +1,15 @@
+name: rake-compiler
+kind: chunk
+description: |
+ Provide a standard and simplified way to build and package Ruby
+ extensions (C, Java) using Rake as glue.
+products:
+- artifact: rake-compiler-doc
+ include:
+ - usr/lib/ruby/gems/\d[\w.]*/doc/.*
+build-commands:
+- rake gem
+install-commands:
+- mkdir -p "$DESTDIR/$(gem environment home)"
+- gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin"
+ --ignore-dependencies --local ./pkg/rake-compiler-*.gem
diff --git a/strata/trove.morph b/strata/trove.morph
index c3d4f069..04c2c1f6 100644
--- a/strata/trove.morph
+++ b/strata/trove.morph
@@ -189,13 +189,13 @@ chunks:
- name: trove-setup
morph: strata/trove/trove-setup.morph
repo: baserock:baserock/trove-setup
- ref: 109c02002baf3c2d8eac57027f29f6c74e5233b5
+ ref: 5f2dab59ff6e70edf6ffbcd65fe64b487c4380c2
unpetrify-ref: master
build-depends: []
- name: lorry-controller
morph: strata/trove/lorry-controller.morph
repo: baserock:baserock/lorry-controller
- ref: cc8eb995bdcfe492cde33f2dbe831810e660027a
+ ref: d7ca3f2f14ad28437f7332ca387a790fecb8b081
unpetrify-ref: master
build-depends: []
- name: lighttpd