Merge branch 'master' into develop

libremesh · Feb 4, 2018 · 5ec00f4 · 5ec00f4
2 parents 17b429a + af22c25
commit 5ec00f4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/flavors.conf b/flavors.conf
@@ -1,6 +1,6 @@
 # Flavors
 lede_vanilla="luci-ssl"
-lime_default="lime-full -dnsmasq"
+lime_default="lime-full lime-app -dnsmasq"
 lime_mini="lime-basic -opkg -wpad-mini hostapd-mini -kmod-usb-core -kmod-usb-ledtrig-usbport -kmod-usb2 -ppp -dnsmasq -ppp-mod-pppoe -6relayd -odhcp6c -odhcpd -iptables -ip6tables"
 lime_zero="lime-basic-no-ui -wpad-mini hostapd-mini -ppp -dnsmasq -ppp-mod-pppoe -6relayd -odhcp6c -odhcpd -iptables -ip6tables"
-lime_newui_test="lime-full lime-webui-ng-luci lime-app -dnsmasq"
+lime_newui_test="lime-full lime-app -dnsmasq"
diff --git a/options.conf b/options.conf
@@ -9,7 +9,7 @@ feeds_dir=feeds
 files_dir=files
 flavors_file=flavors.conf
 sdk_config=libremesh.sdk.config
-sdk_install_packages="libustream-openssl firewall"
+sdk_install_packages="libustream-openssl firewall luci-app-bmx7"
 sdk_install_repos="libremesh libremap limeui"
 remote_pkg_repos="libremesh.repositories.conf"
 default_flavor="lime_default"