diff options
| -rw-r--r-- | clusters/release.morph | 7 | ||||
| -rw-r--r-- | strata/bsp-jetson-devel.morph | 4 | ||||
| -rw-r--r-- | strata/morph-utils.morph | 2 | ||||
| -rw-r--r-- | strata/ruby.morph | 22 | ||||
| -rw-r--r-- | strata/ruby/hoe.morph | 16 | ||||
| -rw-r--r-- | strata/ruby/rake-compiler.morph | 15 | ||||
| -rw-r--r-- | strata/trove.morph | 4 |
7 files changed, 62 insertions, 8 deletions
diff --git a/clusters/release.morph b/clusters/release.morph index a21a2690..5466df22 100644 --- a/clusters/release.morph +++ b/clusters/release.morph @@ -31,12 +31,15 @@ systems: DISK_SIZE: 4G - morph: systems/build-system-armv7lhf-jetson.morph deploy: - release: + devel-system-armv7lhf-jetson: type: rawdisk location: build-system-armv7lhf-jetson.img DISK_SIZE: 4G ROOT_DEVICE: "/dev/mmcblk0p1" - KERNEL_ARGS: cma=256M console=ttyS0,115200n8 no_console_suspend=1 lp0_vec=2064@0xf46ff000 video=tegrafb mem=1862M@2048M memtype=255 ddr_die=2048M@2048M section=256M pmuboard=0x0177:0x0000:0x02:0x43:0x00 vpr=151M@3945M tsec=32M@3913M otf_key=c75e5bb91eb3bd94560357b64422f85 usbcore.old_scheme_first=1 core_edp_mv=1150 core_edp_ma=4000 tegraid=40.1.1.0.0 debug_uartport=lsport,3 power_supply=Adapter audio_codec=rt5640 modem_id=0 android.kerneltype=normal usb_port_owner_info=0 fbcon=map:1 commchip_id=0 usb_port_owner_info=0 lane_owner_info=6 emc_max_dvfs=0 touch_id=0@0 tegra_fbmem=32899072@0xad012000 board_info=0x0177:0x0000:0x02:0x43:0x00 tegraboot=sdmmc gpt + DTB_PATH: "boot/tegra124-pm375.dtb" + BOOTLOADER_CONFIG_FORMAT: "extlinux" + BOOTLOADER_INSTALL: "none" + KERNEL_ARGS: console=ttyS0,115200n8 no_console_suspend=1 lp0_vec=2064@0xf46ff000 video=tegrafb mem=1862M@2048M memtype=255 ddr_die=2048M@2048M section=256M pmuboard=0x0177:0x0000:0x02:0x43:0x00 vpr=151M@3945M tsec=32M@3913M otf_key=c75e5bb91eb3bd94560357b64422f85 usbcore.old_scheme_first=1 core_edp_mv=1150 core_edp_ma=4000 tegraid=40.1.1.0.0 debug_uartport=lsport,3 power_supply=Adapter audio_codec=rt5640 modem_id=0 android.kerneltype=normal usb_port_owner_info=0 fbcon=map:1 commchip_id=0 usb_port_owner_info=0 lane_owner_info=6 emc_max_dvfs=0 touch_id=0@0 tegra_fbmem=32899072@0xad012000 board_info=0x0177:0x0000:0x02:0x43:0x00 tegraboot=sdmmc gpt - morph: systems/genivi-baseline-system-x86_64-generic.morph deploy: genivi-baseline-system-x86_64-generic: 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 |