uhttpd is now a submodule of rickroller (to avoid clashes with rickro…

…ller-advanced
makefu · May 19, 2013 · 616dbbb · 616dbbb
1 parent 43aba09
commit 616dbbb
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 2 deletions.
diff --git a/profiles/rickroller_bare b/profiles/rickroller_bare
@@ -1,4 +1,4 @@
 core/firstrun
 minimal/no-ppp
 network/open-wifi-ap
-special_purpose/rickroller
+special_purpose/rickroller/uhttpd
diff --git a/traits/special_purpose/rickroller/MANIFEST b/traits/special_purpose/rickroller/MANIFEST
@@ -1,2 +1 @@
-PACKAGES="uhttpd uhttpd-mod-tls"
 REQUIRE="network/open-wifi-ap"
diff --git a/traits/special_purpose/rickroller/uhttpd/MANIFEST b/traits/special_purpose/rickroller/uhttpd/MANIFEST
@@ -0,0 +1 @@
+PACKAGES="uhttpd uhttpd-mod-tls"
diff --git a/...urpose/rickroller/files/etc/config/uhttpd → ...rickroller/uhttpd/files/etc/config/uhttpd b/...urpose/rickroller/files/etc/config/uhttpd → ...rickroller/uhttpd/files/etc/config/uhttpd
diff --git a/...l_purpose/rickroller/files/etc/uhttpd.crt → ...se/rickroller/uhttpd/files/etc/uhttpd.crt b/...l_purpose/rickroller/files/etc/uhttpd.crt → ...se/rickroller/uhttpd/files/etc/uhttpd.crt
diff --git a/...l_purpose/rickroller/files/etc/uhttpd.key → ...se/rickroller/uhttpd/files/etc/uhttpd.key b/...l_purpose/rickroller/files/etc/uhttpd.key → ...se/rickroller/uhttpd/files/etc/uhttpd.key