rfkill: use new-style config/kbuild/applet

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/include/applets.src.h b/include/applets.src.h
index 2ceba53bddda066fbb73f01ad5a31675181f1991..7dbd4c7f3f036c1509f7efde29765ace3c5486d3 100644 (file)
--- a/include/applets.src.h
+++ b/include/applets.src.h
@@ -288,7 +288,6 @@ IF_RENICE(APPLET(renice, BB_DIR_USR_BIN, BB_SUID_DROP))
 IF_RESET(APPLET(reset, BB_DIR_USR_BIN, BB_SUID_DROP))
 IF_RESIZE(APPLET(resize, BB_DIR_USR_BIN, BB_SUID_DROP))
 IF_RESTORECON(APPLET_ODDNAME(restorecon, setfiles, BB_DIR_SBIN, BB_SUID_DROP, restorecon))
-IF_RFKILL(APPLET(rfkill, BB_DIR_USR_SBIN, BB_SUID_DROP))
 IF_RM(APPLET_NOFORK(rm, rm, BB_DIR_BIN, BB_SUID_DROP, rm))
 IF_RMDIR(APPLET_NOFORK(rmdir, rmdir, BB_DIR_BIN, BB_SUID_DROP, rmdir))
 IF_ROUTE(APPLET(route, BB_DIR_SBIN, BB_SUID_DROP))

diff --git a/miscutils/Config.src b/miscutils/Config.src
index 117ec77397460935ad36894dc6fe3410fe467267..1da9800bd88adecccde7b67319ac14524db99282 100644 (file)
--- a/miscutils/Config.src
+++ b/miscutils/Config.src
@@ -503,18 +503,6 @@ config READAHEAD
          As readahead(2) blocks until each file has been read, it is best to
          run this applet as a background job.
 
-config RFKILL
-       bool "rfkill"
-       default n  # doesn't build on Ubuntu 9.04
-       select PLATFORM_LINUX
-       help
-         Enable/disable wireless devices.
-
-         rfkill list : list all wireless devices
-         rfkill list bluetooth : list all bluetooth devices
-         rfkill list 1 : list device corresponding to the given index
-         rfkill block|unblock wlan : block/unblock all wlan(wifi) devices
-
 config RUNLEVEL
        bool "runlevel"
        default y

diff --git a/miscutils/Kbuild.src b/miscutils/Kbuild.src
index f3954f407fe2d5c28035e893cb788d2714d581ff..9e164f16ef3ebc9c5516c04dcee5cbe171c69b97 100644 (file)
--- a/miscutils/Kbuild.src
+++ b/miscutils/Kbuild.src
@@ -36,7 +36,6 @@ lib-$(CONFIG_MOUNTPOINT)  += mountpoint.o
 lib-$(CONFIG_MT)          += mt.o
 lib-$(CONFIG_RAIDAUTORUN) += raidautorun.o
 lib-$(CONFIG_READAHEAD)   += readahead.o
-lib-$(CONFIG_RFKILL)      += rfkill.o
 lib-$(CONFIG_RUNLEVEL)    += runlevel.o
 lib-$(CONFIG_RX)          += rx.o
 lib-$(CONFIG_SETSID)      += setsid.o

diff --git a/miscutils/rfkill.c b/miscutils/rfkill.c
index 4671973713761bbc3f53462aae4bacdf596ca8ed..7411b6fc390d0916668055f966fd2ab5cf90a5bc 100644 (file)
--- a/miscutils/rfkill.c
+++ b/miscutils/rfkill.c
@@ -7,6 +7,23 @@
 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
 */
 
+//config:config RFKILL
+//config:      bool "rfkill"
+//config:      default n # doesn't build on Ubuntu 9.04
+//config:      select PLATFORM_LINUX
+//config:      help
+//config:        Enable/disable wireless devices.
+//config:
+//config:        rfkill list : list all wireless devices
+//config:        rfkill list bluetooth : list all bluetooth devices
+//config:        rfkill list 1 : list device corresponding to the given index
+//config:        rfkill block|unblock wlan : block/unblock all wlan(wifi) devices
+//config:
+
+//applet:IF_RFKILL(APPLET(rfkill, BB_DIR_USR_SBIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_RFKILL) += rfkill.o
+
 //usage:#define rfkill_trivial_usage
 //usage:       "COMMAND [INDEX|TYPE]"
 //usage:#define rfkill_full_usage "\n\n"