summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--strata/apache-httpd-server.morph2
-rw-r--r--strata/bsp-armv5l-openbmc-aspeed.morph2
-rw-r--r--strata/chef.morph4
-rw-r--r--strata/chef/ipaddress-0.8.0.morph (renamed from strata/chef/ipaddress-master.morph)0
-rw-r--r--strata/enlightenment/bullet3.morph2
-rw-r--r--strata/genivi/DLT-daemon.morph2
-rw-r--r--strata/java/java-ant.morph2
-rw-r--r--strata/lorry.morph2
-rw-r--r--strata/networking-utils.morph2
-rw-r--r--strata/test-tools/subunit.morph2
-rw-r--r--strata/unionfs-fuse-group.morph2
11 files changed, 11 insertions, 11 deletions
diff --git a/strata/apache-httpd-server.morph b/strata/apache-httpd-server.morph
index 7a403535..20510091 100644
--- a/strata/apache-httpd-server.morph
+++ b/strata/apache-httpd-server.morph
@@ -11,7 +11,7 @@ chunks:
repo: upstream:apache/apr
ref: 3c818c6d7351f0130282d212a69035642f5fecad
unpetrify-ref: trunk
-- name: httpd
+- name: httpd-server
morph: strata/apache-httpd-server/httpd-server.morph
repo: upstream:apache/httpd
ref: 6d8e0b2fd95268fcba96326ba9dce7bb8f712c19
diff --git a/strata/bsp-armv5l-openbmc-aspeed.morph b/strata/bsp-armv5l-openbmc-aspeed.morph
index 83bb74ef..7b36ffbb 100644
--- a/strata/bsp-armv5l-openbmc-aspeed.morph
+++ b/strata/bsp-armv5l-openbmc-aspeed.morph
@@ -7,7 +7,7 @@ description:
build-depends:
- morph: strata/core.morph
chunks:
-- name: linux-armv5l-openbmc-aspeed-wedge
+- name: linux-armv5l-openbmc-aspeed
morph: strata/bsp-armv5l-openbmc-aspeed/linux-armv5l-openbmc-aspeed.morph
repo: upstream:linux-stable
ref: 5cbce86c2115075b8054e4dba8cdf328aa6fa5b6
diff --git a/strata/chef.morph b/strata/chef.morph
index 69b495aa..b28298e0 100644
--- a/strata/chef.morph
+++ b/strata/chef.morph
@@ -71,8 +71,8 @@ chunks:
unpetrify-ref: v1.2.5
build-depends:
- hoe-master
-- name: ipaddress-master
- morph: strata/chef/ipaddress-master.morph
+- name: ipaddress-0.8.0
+ morph: strata/chef/ipaddress-0.8.0.morph
repo: upstream:ruby-gems/ipaddress
ref: dae93ad0e4fb9a5d547a15dae0c3f2417078c845
unpetrify-ref: master
diff --git a/strata/chef/ipaddress-master.morph b/strata/chef/ipaddress-0.8.0.morph
index fdaa5de6..fdaa5de6 100644
--- a/strata/chef/ipaddress-master.morph
+++ b/strata/chef/ipaddress-0.8.0.morph
diff --git a/strata/enlightenment/bullet3.morph b/strata/enlightenment/bullet3.morph
index 74cb097a..357e1f67 100644
--- a/strata/enlightenment/bullet3.morph
+++ b/strata/enlightenment/bullet3.morph
@@ -1,4 +1,4 @@
-name: bullet
+name: bullet3
kind: chunk
configure-commands:
- cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=ON
diff --git a/strata/genivi/DLT-daemon.morph b/strata/genivi/DLT-daemon.morph
index e22e31e3..d16c42ea 100644
--- a/strata/genivi/DLT-daemon.morph
+++ b/strata/genivi/DLT-daemon.morph
@@ -1,4 +1,4 @@
-name: DLT-deamon
+name: DLT-daemon
kind: chunk
build-system: cmake
configure-commands:
diff --git a/strata/java/java-ant.morph b/strata/java/java-ant.morph
index 172483ab..13c490d4 100644
--- a/strata/java/java-ant.morph
+++ b/strata/java/java-ant.morph
@@ -1,4 +1,4 @@
-name: ant
+name: java-ant
kind: chunk
build-commands:
- |
diff --git a/strata/lorry.morph b/strata/lorry.morph
index b3a0c779..0c5f2c11 100644
--- a/strata/lorry.morph
+++ b/strata/lorry.morph
@@ -56,7 +56,7 @@ chunks:
unpetrify-ref: baserock/morph
build-depends:
- perl-dbi-tarball
-- name: libserf-tarball
+- name: libserf
morph: strata/lorry/libserf.morph
repo: upstream:libserf-tarball
ref: 6f61a1acd01dc2ad1d2f5c1f7458702c77c69f9c
diff --git a/strata/networking-utils.morph b/strata/networking-utils.morph
index 445df46d..13a8c72f 100644
--- a/strata/networking-utils.morph
+++ b/strata/networking-utils.morph
@@ -47,7 +47,7 @@ chunks:
repo: upstream:libnet
ref: 05df365769597e1d64d02af931d6127762ff2658
unpetrify-ref: libnet-1.2
-- name: arping
+- name: iputils
morph: strata/networking-utils/iputils.morph
repo: upstream:iputils
ref: d25e54e25107bc7c5d14737ed65f5f52b54f1472
diff --git a/strata/test-tools/subunit.morph b/strata/test-tools/subunit.morph
index b7b43a39..0d3819ed 100644
--- a/strata/test-tools/subunit.morph
+++ b/strata/test-tools/subunit.morph
@@ -1,3 +1,3 @@
-name: python-subunit
+name: subunit
kind: chunk
build-system: autotools
diff --git a/strata/unionfs-fuse-group.morph b/strata/unionfs-fuse-group.morph
index 914b18e0..2db03d87 100644
--- a/strata/unionfs-fuse-group.morph
+++ b/strata/unionfs-fuse-group.morph
@@ -14,7 +14,7 @@ build-depends:
- morph: strata/foundation.morph
chunks:
- - name: unionfs.fuse
+ - name: unionfs-fuse
morph: strata/unionfs-fuse-group/unionfs-fuse.morph
repo: upstream:unionfs-fuse
ref: efac5b7aa91ec860f8f430a8d21060fe53a07002