From 9c6e5307ad6a7ffb8b8258def90a7e0f154a13bf Mon Sep 17 00:00:00 2001
From: Richard Dale <richard.dale@codethink.co.uk>
Date: Wed, 10 Jun 2015 16:20:19 +0100
Subject: Fix rpcd sym link and install more rpcd config files

---
 strata/cpe-wrt/base-files.morph |  1 +
 strata/cpe-wrt/rpcd.morph       |  6 ++++++
 strata/cpe-wrt/uhttpd.morph     | 17 -----------------
 strata/cpe-wrt/uhttpd2.morph    | 17 +++++++++++++++++
 4 files changed, 24 insertions(+), 17 deletions(-)
 delete mode 100644 strata/cpe-wrt/uhttpd.morph
 create mode 100644 strata/cpe-wrt/uhttpd2.morph

(limited to 'strata/cpe-wrt')

diff --git a/strata/cpe-wrt/base-files.morph b/strata/cpe-wrt/base-files.morph
index eb9f66cf..a91db95a 100644
--- a/strata/cpe-wrt/base-files.morph
+++ b/strata/cpe-wrt/base-files.morph
@@ -33,3 +33,4 @@ install-commands:
 - install package/network/services/dropbear/files/dropbear.config "$DESTDIR"/etc/config/dropbear
 - install package/network/config/firewall/files/firewall.config "$DESTDIR"/etc/config/firewall
 - install package/network/services/uhttpd/files/uhttpd.config "$DESTDIR"/etc/config/uhttpd
+- install package/system/rpcd/files/rpcd.config "$DESTDIR"/etc/config/rpcd
diff --git a/strata/cpe-wrt/rpcd.morph b/strata/cpe-wrt/rpcd.morph
index 0d8d7479..999f27ec 100644
--- a/strata/cpe-wrt/rpcd.morph
+++ b/strata/cpe-wrt/rpcd.morph
@@ -14,3 +14,9 @@ install-commands:
 - make install
 - install -d $DESTDIR$PREFIX/include/rpcd
 - cd include/rpcd ; install * $DESTDIR$PREFIX/include/rpcd
+- install -d "$DESTDIR$PREFIX"/share/rpcd/acl.d
+- install unauthenticated.json "$DESTDIR$PREFIX"/share/rpcd/acl.d
+
+post-install-commands:
+- install -d "$DESTDIR/sbin" && cd "$DESTDIR/sbin" && ln -s ..$PREFIX/sbin/rpcd rpcd
+
diff --git a/strata/cpe-wrt/uhttpd.morph b/strata/cpe-wrt/uhttpd.morph
deleted file mode 100644
index cefcc91f..00000000
--- a/strata/cpe-wrt/uhttpd.morph
+++ /dev/null
@@ -1,17 +0,0 @@
-name: uhttp
-kind: chunk
-
-pre-configure-commands:
-- sed -i 's/-Werror//' CMakeLists.txt
-
-configure-commands:
-- cmake -DCMAKE_INSTALL_PREFIX=$PREFIX
-
-build-commands:
-- make
-
-install-commands:
-- make install
-
-post-install-commands:
-- install -d "$DESTDIR$PREFIX/sbin" && cd "$DESTDIR$PREFIX/sbin" && ln -s ../.."$PREFIX"/bin/uhttpd
diff --git a/strata/cpe-wrt/uhttpd2.morph b/strata/cpe-wrt/uhttpd2.morph
new file mode 100644
index 00000000..f7106582
--- /dev/null
+++ b/strata/cpe-wrt/uhttpd2.morph
@@ -0,0 +1,17 @@
+name: uhttp2
+kind: chunk
+
+pre-configure-commands:
+- sed -i 's/-Werror//' CMakeLists.txt
+
+configure-commands:
+- cmake -DCMAKE_INSTALL_PREFIX=$PREFIX
+
+build-commands:
+- make
+
+install-commands:
+- make install
+
+post-install-commands:
+- install -d "$DESTDIR$PREFIX/sbin" && cd "$DESTDIR$PREFIX/sbin" && ln -s ../.."$PREFIX"/bin/uhttpd
-- 
cgit v1.2.1