summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Brown <ben.brown@codethink.co.uk>2013-12-16 13:40:53 +0000
committerBen Brown <ben.brown@codethink.co.uk>2013-12-18 09:48:26 +0000
commite414a599cbe2309f92c07707142518e662c8b0d2 (patch)
tree0230c8541dc686829fbf1e0f544da376f12ed63e
parent4ca0acbf07873bc12d840f8cc1b716a2b21e6ec4 (diff)
downloaddefinitions-e414a599cbe2309f92c07707142518e662c8b0d2.tar.gz
Move sqlite3 into foundation
-rw-r--r--ceph-service.morph7
-rw-r--r--foundation.morph4
-rw-r--r--genivi.morph5
-rw-r--r--nfs.morph7
-rw-r--r--qt4-tools.morph5
-rw-r--r--qt5-tools.morph6
-rw-r--r--trove.morph6
7 files changed, 6 insertions, 34 deletions
diff --git a/ceph-service.morph b/ceph-service.morph
index 734b6ad7..ee67cc44 100644
--- a/ceph-service.morph
+++ b/ceph-service.morph
@@ -1,14 +1,10 @@
name: ceph-service
kind: stratum
build-depends:
-- morph: core
+- morph: foundation
repo: baserock:baserock/morphs
ref: master
chunks:
-- name: sqlite3
- repo: upstream:sqlite3
- ref: baserock/morph
- build-depends: []
- name: nspr
repo: upstream:nspr-hg
ref: baserock/morph
@@ -18,7 +14,6 @@ chunks:
ref: baserock/morph
build-depends:
- nspr
- - sqlite3
- name: libaio
repo: upstream:libaio
ref: baserock/morph
diff --git a/foundation.morph b/foundation.morph
index 143670b8..60224263 100644
--- a/foundation.morph
+++ b/foundation.morph
@@ -25,6 +25,10 @@ chunks:
ref: baserock/morph
repo: upstream:libffi
- build-depends: []
+ name: sqlite3
+ ref: baserock/morph
+ repo: upstream:sqlite3
+- build-depends: []
name: libusbx
ref: baserock/morph
repo: upstream:libusbx
diff --git a/genivi.morph b/genivi.morph
index b360e90c..6cc2c6b3 100644
--- a/genivi.morph
+++ b/genivi.morph
@@ -7,10 +7,6 @@ chunks:
name: DLT-daemon
ref: v2.9.1
repo: upstream:DLT-daemon
-- build-depends: []
- name: sqlite3
- ref: baserock/morph
- repo: upstream:sqlite3
- build-depends:
- DLT-daemon
name: node-startup-controller
@@ -36,7 +32,6 @@ chunks:
repo: upstream:genivi-common-api-dbus-runtime
- build-depends:
- DLT-daemon
- - sqlite3
- googletest
- googlemock
- genivi-common-api-runtime
diff --git a/nfs.morph b/nfs.morph
index fe14b2f1..03fd2b6c 100644
--- a/nfs.morph
+++ b/nfs.morph
@@ -1,5 +1,5 @@
build-depends:
-- morph: core
+- morph: foundation
ref: master
repo: baserock:baserock/morphs
chunks:
@@ -8,10 +8,6 @@ chunks:
ref: release-2.0.20-stable
repo: upstream:libevent
- build-depends: []
- name: sqlite3
- ref: baserock/morph
- repo: upstream:sqlite3
-- build-depends: []
name: tcp-wrappers
ref: baserock/fedora-patches
repo: upstream:tcp-wrappers
@@ -27,7 +23,6 @@ chunks:
repo: upstream:rpcbind
- build-depends:
- libevent
- - sqlite3
- tcp-wrappers
- ti-rpc
name: nfs-utils
diff --git a/qt4-tools.morph b/qt4-tools.morph
index c40d3c53..2928fa00 100644
--- a/qt4-tools.morph
+++ b/qt4-tools.morph
@@ -14,10 +14,6 @@ chunks:
ref: baserock/morph
repo: upstream:icu
- build-depends: []
- name: sqlite3
- ref: baserock/morph
- repo: upstream:sqlite3
-- build-depends: []
name: ruby-1.8
ref: baserock/morph/ruby_1_8_7
repo: upstream:ruby
@@ -29,7 +25,6 @@ chunks:
- build-depends:
- icu
- ruby-1.9
- - sqlite3
name: qt4-tools
ref: baserock/morph
repo: upstream:qt4-tools
diff --git a/qt5-tools.morph b/qt5-tools.morph
index 866e9fe8..a5f6378d 100644
--- a/qt5-tools.morph
+++ b/qt5-tools.morph
@@ -14,10 +14,6 @@ chunks:
ref: baserock/morph
repo: upstream:icu
- build-depends: []
- name: sqlite3
- ref: baserock/morph
- repo: upstream:sqlite3
-- build-depends: []
name: ruby-1.8
ref: baserock/morph/ruby_1_8_7
repo: upstream:ruby
@@ -28,7 +24,6 @@ chunks:
repo: upstream:ruby
- build-depends:
- icu
- - sqlite3
name: qtbase
ref: baserock/morph
repo: upstream:qt5/qtbase
@@ -94,7 +89,6 @@ chunks:
repo: upstream:qt5/qtx11extras
- build-depends:
- qtbase
- - sqlite3
- icu
- ruby-1.9
- qtjsbackend
diff --git a/trove.morph b/trove.morph
index 9304816b..1f154c9d 100644
--- a/trove.morph
+++ b/trove.morph
@@ -91,10 +91,6 @@ chunks:
ref: baserock/morph
build-depends:
- libapr-tarball
-- name: sqlite3
- repo: upstream:sqlite3
- ref: baserock/morph
- build-depends: []
- name: perl-dbi-tarball
repo: upstream:perl-dbi-tarball
ref: baserock/morph
@@ -104,7 +100,6 @@ chunks:
ref: baserock/morph
build-depends:
- perl-dbi-tarball
- - sqlite3
- name: libserf-tarball
repo: upstream:libserf-tarball
ref: baserock/morph
@@ -127,7 +122,6 @@ chunks:
- libapr-tarball
- libapr-util-tarball
- libserf-tarball
- - sqlite3
- neon
- name: mercurial-tarball
repo: upstream:mercurial-tarball