scrap the lua stratum - lua is best in tools. and qt5 doesn't need old gstreamerbaserock/ps/put-lua-in-tools

7 files changed, 10 insertions, 38 deletions

diff --git a/enlightenment.morph b/enlightenment.morph
index 0eb47e6..1a36a33 100644
--- a/enlightenment.morph
+++ b/enlightenment.morph
@@ -5,9 +5,6 @@ build-depends:
 - morph: x-x86_64-generic
   ref: master
   repo: baserock:baserock/morphs
-- morph: lua
-  ref: master
-  repo: baserock:baserock/morphs
 - morph: audio-bluetooth
   ref: master
   repo: baserock:baserock/morphs
diff --git a/lua.morph b/lua.morph
deleted file mode 100644
index 29321af..0000000
--- a/lua.morph
+++ /dev/null
@@ -1,12 +0,0 @@
-build-depends:
-- morph: tools
-  ref: master
-  repo: baserock:baserock/morphs
-chunks:
-- build-depends: []
-  name: lua
-  ref: baserock/5.1-morph
-  repo: upstream:lua
-description: Interpreter for the lua scripting language.
-kind: stratum
-name: lua
diff --git a/qt4-devel-system-x86_64-generic.morph b/qt4-devel-system-x86_64-generic.morph
index b70947f..5b0895e 100644
--- a/qt4-devel-system-x86_64-generic.morph
+++ b/qt4-devel-system-x86_64-generic.morph
@@ -43,9 +43,6 @@ strata:
 - morph: qt4-sdk
   ref: master
   repo: baserock:baserock/morphs
-- morph: lua
-  ref: master
-  repo: baserock:baserock/morphs
 - morph: connectivity
   ref: master
   repo: baserock:baserock/morphs
diff --git a/qt5-devel-system-x86_64-generic.morph b/qt5-devel-system-x86_64-generic.morph
index 7269c09..36f1eb9 100644
--- a/qt5-devel-system-x86_64-generic.morph
+++ b/qt5-devel-system-x86_64-generic.morph
@@ -22,7 +22,7 @@ strata:
 - morph: audio-bluetooth
   ref: master
   repo: baserock:baserock/morphs
-- morph: multimedia-gstreamer-0.10
+- morph: multimedia
   ref: master
   repo: baserock:baserock/morphs
 - morph: bsp-x86_64-generic
@@ -43,9 +43,6 @@ strata:
 - morph: qt5-sdk
   ref: master
   repo: baserock:baserock/morphs
-- morph: lua
-  ref: master
-  repo: baserock:baserock/morphs
 - morph: connectivity
   ref: master
   repo: baserock:baserock/morphs
diff --git a/qt5-tools.morph b/qt5-tools.morph
index a5f6378..146d35d 100644
--- a/qt5-tools.morph
+++ b/qt5-tools.morph
@@ -5,7 +5,7 @@ build-depends:
 - morph: x-x86_64-generic
   ref: master
   repo: baserock:baserock/morphs
-- morph: multimedia-gstreamer-0.10
+- morph: multimedia
   ref: master
   repo: baserock:baserock/morphs
 chunks:
diff --git a/tools.morph b/tools.morph
index 9f614b0..740ef4b 100644
--- a/tools.morph
+++ b/tools.morph
@@ -118,6 +118,10 @@ chunks:
   repo: upstream:kexec-tools
   ref: baserock/morph
   build-depends: []
+- build-depends: []
+  name: lua
+  ref: baserock/5.1-morph
+  repo: upstream:lua
 description: Extra development tools included in the devel system
 kind: stratum
 name: tools
diff --git a/trove.morph b/trove.morph
index 1f154c9..543b858 100644
--- a/trove.morph
+++ b/trove.morph
@@ -14,36 +14,27 @@ chunks:
   repo: baserock:baserock/morph-cache-server
   ref: master
   build-depends: []
-- name: lua
-  repo: upstream:lua
-  ref: baserock/5.1-morph
-  build-depends: []
 - name: lace
   repo: upstream:gitano/lace
   ref: baserock/morph
-  build-depends:
-  - lua
+  build-depends: []
 - name: luxio
   repo: upstream:luxio
   ref: baserock/morph
-  build-depends:
-  - lua
+  build-depends: []
 - name: supple
   repo: upstream:gitano/supple
   ref: baserock/morph
   build-depends:
-  - lua
   - luxio
 - name: clod
   repo: upstream:gitano/clod
   ref: baserock/morph
-  build-depends:
-  - lua
+  build-depends: []
 - name: gall
   repo: upstream:gitano/gall
   ref: baserock/morph
   build-depends:
-  - lua
   - luxio
 - name: pcre
   repo: upstream:pcre
@@ -54,12 +45,10 @@ chunks:
   ref: baserock/morph
   build-depends:
   - pcre
-  - lua
 - name: gitano
   repo: upstream:gitano/gitano
   ref: baserock/morph
-  build-depends:
-  - lua
+  build-depends: []
 - name: cgit
   repo: upstream:cgit
   ref: baserock/morph