From 86127adbc4fcab2f3c50158c0c6ede9dfc6b3d0c Mon Sep 17 00:00:00 2001
From: Richard Dale <richard.dale@codethink.co.uk>
Date: Tue, 23 Jun 2015 17:07:24 +0100
Subject: Build the cpe-wrt stratum without lua

---
 strata/cpe-wrt.morph         |  8 +-------
 strata/cpe-wrt/iwinfo.morph  |  3 +--
 strata/cpe-wrt/libubox.morph | 11 +++++++++++
 strata/cpe-wrt/ubus.morph    |  2 +-
 strata/cpe-wrt/uci.morph     |  2 +-
 strata/cpe-wrt/uhttpd2.morph |  2 +-
 6 files changed, 16 insertions(+), 12 deletions(-)
 create mode 100644 strata/cpe-wrt/libubox.morph

diff --git a/strata/cpe-wrt.morph b/strata/cpe-wrt.morph
index 720d60c5..226fe456 100644
--- a/strata/cpe-wrt.morph
+++ b/strata/cpe-wrt.morph
@@ -9,11 +9,6 @@ chunks:
   repo: upstream:lzo
   ref: 5cca83e4d1b0be5825a597ab24ffa6126dc0bc95
   unpetrify-ref: lzo-2.08
-- name: lua
-  repo: upstream:lua
-  ref: 5.1.5
-  unpetrify-ref: baserock/morph
-  build-depends: []
 - name: json-c
   repo: upstream:json-c
   ref: ec4879ac5b502ae81f6b73450b960ede11ad2560
@@ -25,12 +20,12 @@ chunks:
   ref: 91420e5fbbe932f93d55f0581bf43256a3dae8dc
   unpetrify-ref: master
 - name: libubox
+  morph: strata/cpe-wrt/libubox.morph
   repo: upstream:openwrt/libubox
   ref: 791a361ad1b08fa56e554654109122b828657a2b
   unpetrify-ref:
   build-depends:
   - json-c
-  - lua
 - name: ubus
   morph: strata/cpe-wrt/ubus.morph
   repo: upstream:openwrt/ubus
@@ -38,7 +33,6 @@ chunks:
   unpetrify-ref:
   build-depends:
   - libubox
-  - lua
 - name: hostapd
   morph: strata/cpe-wrt/hostapd.morph
   repo: upstream:hostap
diff --git a/strata/cpe-wrt/iwinfo.morph b/strata/cpe-wrt/iwinfo.morph
index 8fcb1ebd..8508d3b1 100644
--- a/strata/cpe-wrt/iwinfo.morph
+++ b/strata/cpe-wrt/iwinfo.morph
@@ -2,6 +2,7 @@ name: iwinfo
 kind: chunk
 
 build-commands:
+- sed -i -e 's/\$(IWINFO_LUA_OBJ)//' -e '/IWINFO_LUA/d' Makefile
 - make CFLAGS=-fPIC
 
 install-commands:
@@ -10,7 +11,5 @@ install-commands:
 - cd include/iwinfo ; install * $DESTDIR$PREFIX/include/iwinfo
 - install -d $DESTDIR$PREFIX/lib
 - install libiwinfo.so $DESTDIR$PREFIX/lib/libiwinfo.so
-- install -d $DESTDIR$PREFIX/lib/lua
-- install iwinfo.so $DESTDIR$PREFIX/lib/lua/iwinfo.so
 - install -d $DESTDIR$PREFIX/bin
 - install iwinfo $DESTDIR$PREFIX/bin/iwinfo
diff --git a/strata/cpe-wrt/libubox.morph b/strata/cpe-wrt/libubox.morph
new file mode 100644
index 00000000..d0636ebe
--- /dev/null
+++ b/strata/cpe-wrt/libubox.morph
@@ -0,0 +1,11 @@
+name: libubox
+kind: chunk
+
+configure-commands:
+- cmake -DCMAKE_INSTALL_PREFIX=$PREFIX -DBUILD_LUA=FALSE
+
+build-commands:
+- make
+
+install-commands:
+- make install
diff --git a/strata/cpe-wrt/ubus.morph b/strata/cpe-wrt/ubus.morph
index 393be175..71e3c3cc 100644
--- a/strata/cpe-wrt/ubus.morph
+++ b/strata/cpe-wrt/ubus.morph
@@ -2,7 +2,7 @@ name: ubus
 kind: chunk
 
 build-commands:
-- cmake -DCMAKE_INSTALL_PREFIX=$PREFIX
+- cmake -DCMAKE_INSTALL_PREFIX=$PREFIX -DBUILD_LUA=FALSE
 - make
 
 install-commands:
diff --git a/strata/cpe-wrt/uci.morph b/strata/cpe-wrt/uci.morph
index 8d75793b..1360bc8c 100644
--- a/strata/cpe-wrt/uci.morph
+++ b/strata/cpe-wrt/uci.morph
@@ -2,7 +2,7 @@ name: uci
 kind: chunk
 
 configure-commands:
-- cmake -DCMAKE_INSTALL_PREFIX=$PREFIX
+- cmake -DCMAKE_INSTALL_PREFIX=$PREFIX -DBUILD_LUA=FALSE
 
 build-commands:
 - make
diff --git a/strata/cpe-wrt/uhttpd2.morph b/strata/cpe-wrt/uhttpd2.morph
index 26246117..22590300 100644
--- a/strata/cpe-wrt/uhttpd2.morph
+++ b/strata/cpe-wrt/uhttpd2.morph
@@ -5,7 +5,7 @@ pre-configure-commands:
 - sed -i 's/-Werror//' CMakeLists.txt
 
 configure-commands:
-- cmake -DCMAKE_INSTALL_PREFIX=$PREFIX
+- cmake -DCMAKE_INSTALL_PREFIX=$PREFIX -DLUA_SUPPORT=FALSE
 
 build-commands:
 - make
-- 
cgit v1.2.1