diff options
-rw-r--r-- | rules/connman.in | 55 | ||||
-rw-r--r-- | rules/connman.make | 6 |
2 files changed, 31 insertions, 30 deletions
diff --git a/rules/connman.in b/rules/connman.in index b779504ec..6c3b05421 100644 --- a/rules/connman.in +++ b/rules/connman.in @@ -19,41 +19,54 @@ if CONNMAN menu "plugins" - config CONNMAN_LOOPBACK + config CONNMAN_BLUETOOTH bool - prompt "loopback support" + prompt "bluetooth support" + + config CONNMAN_DHCLIENT + bool + prompt "dhclient support" + + config CONNMAN_DNSPROXY + bool + prompt "dnsproxy support" config CONNMAN_ETHERNET bool prompt "ethernet support" - config CONNMAN_WIFI + config CONNMAN_FAKE bool - prompt "wifi support" + prompt "fake support" - config CONNMAN_WIMAX + config CONNMAN_HSO bool - prompt "wimax support" + prompt "hso support" - config CONNMAN_BLUETOOTH + config CONNMAN_LOOPBACK bool - prompt "bluetooth support" + prompt "loopback support" + + config CONNMAN_POLKIT + bool + prompt "polkit support" + + config CONNMAN_RESOLVCONF + bool + prompt "resolvconf support" config CONNMAN_UDHCP bool prompt "udhcp support" - config CONNMAN_DHCLIENT + config CONNMAN_WIFI bool - prompt "dhclient support" + prompt "wifi support" - config CONNMAN_RESOLVCONF + config CONNMAN_WIMAX bool - prompt "resolvconf support" + prompt "wimax support" - config CONNMAN_DNSPROXY - bool - prompt "dnsproxy support" config CONNMAN_NOVATEL bool @@ -67,10 +80,6 @@ menu "plugins" depends on BROKEN prompt "huawei support" - config CONNMAN_HSO - bool - prompt "hso support" - config CONNMAN_PPP bool # FIXME needs ppp headers @@ -82,14 +91,6 @@ menu "plugins" select UDEV__LIBUDEV prompt "udev support" - config CONNMAN_POLKIT - bool - prompt "polkit support" - - config CONNMAN_FAKE - bool - prompt "fake support" - endmenu config CONNMAN_CLIENT diff --git a/rules/connman.make b/rules/connman.make index ce73d0d2a..b277dce43 100644 --- a/rules/connman.make +++ b/rules/connman.make @@ -185,9 +185,6 @@ endif # # # # plugins # # -ifdef PTXCONF_CONNMAN_ETHERNET - @$(call install_copy, connman, 0, 0, 0644, -, /usr/lib/connman/plugins/ethernet.so) -endif ifdef PTXCONF_CONNMAN_BLUETOOTH @$(call install_copy, connman, 0, 0, 0644, -, /usr/lib/connman/plugins/bluetooth.so) endif @@ -199,6 +196,9 @@ endif ifdef PTXCONF_CONNMAN_DNSPROXY @$(call install_copy, connman, 0, 0, 0644, -, /usr/lib/connman/plugins/dnsproxy.so) endif +ifdef PTXCONF_CONNMAN_ETHERNET + @$(call install_copy, connman, 0, 0, 0644, -, /usr/lib/connman/plugins/ethernet.so) +endif ifdef PTXCONF_CONNMAN_FAKE @$(call install_copy, connman, 0, 0, 0644, -, /usr/lib/connman/plugins/fake.so) endif |