diff options
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/apache.in | 2 | ||||
| -rw-r--r-- | rules/betaftpd.in | 2 | ||||
| -rw-r--r-- | rules/bonniexx.in | 1 | ||||
| -rw-r--r-- | rules/bridge-utils.in | 6 | ||||
| -rw-r--r-- | rules/chrony.in | 6 | ||||
| -rw-r--r-- | rules/dnsmasq.in | 7 | ||||
| -rw-r--r-- | rules/ethereal.in | 8 | ||||
| -rw-r--r-- | rules/eventlog.in | 7 | ||||
| -rw-r--r-- | rules/fbutils.in | 1 | ||||
| -rw-r--r-- | rules/fontconfig.in | 2 | ||||
| -rw-r--r-- | rules/gcclibs.in | 6 | ||||
| -rw-r--r-- | rules/hdparm.in | 2 | ||||
| -rw-r--r-- | rules/inetutils.in | 8 | ||||
| -rw-r--r-- | rules/libezv24.in | 4 | ||||
| -rw-r--r-- | rules/liblockfile.in | 5 | ||||
| -rw-r--r-- | rules/nmap.in | 10 | ||||
| -rw-r--r-- | rules/ntp.in | 20 | ||||
| -rw-r--r-- | rules/openntpd.in | 15 | ||||
| -rw-r--r-- | rules/openssh.in | 9 | ||||
| -rw-r--r-- | rules/slang.in | 4 | ||||
| -rw-r--r-- | rules/sysfsutils.in | 1 | ||||
| -rw-r--r-- | rules/tcpdump.in | 5 | ||||
| -rw-r--r-- | rules/udev.in | 5 |
23 files changed, 44 insertions, 92 deletions
diff --git a/rules/apache.in b/rules/apache.in index 8a47c880a..ad2bf406e 100644 --- a/rules/apache.in +++ b/rules/apache.in @@ -1,6 +1,6 @@ # Apache 1 configuration -menuconfig APACHE +config APACHE bool prompt "Apache 1 HTTP Server" select EXPAT diff --git a/rules/betaftpd.in b/rules/betaftpd.in index 0bd186520..87f5238dc 100644 --- a/rules/betaftpd.in +++ b/rules/betaftpd.in @@ -1,6 +1,6 @@ # betaftpd configuration -menuconfig BETAFTPD +config BETAFTPD bool prompt "betaftpd " select LIBRN diff --git a/rules/bonniexx.in b/rules/bonniexx.in index 6c578c87a..98db0b37a 100644 --- a/rules/bonniexx.in +++ b/rules/bonniexx.in @@ -1,7 +1,6 @@ config BONNIEXX bool prompt "bonnie++" - select GCCLIBS select GCCLIBS_CXX help Hard drive bottleneck testing benchmark suite diff --git a/rules/bridge-utils.in b/rules/bridge-utils.in index 9966470be..72b5adbc3 100644 --- a/rules/bridge-utils.in +++ b/rules/bridge-utils.in @@ -1,10 +1,8 @@ # Bridge Utils configuration -menu "Bridge Utils " - config BRIDGE_UTILS bool - prompt "bridgeutils" + prompt "Bridge Utils " help Utilities for configuring the Linux ethernet bridge @@ -16,5 +14,3 @@ config BRIDGE_UTILS transparent: hosts connected to one ethernet device can see all hosts connected to any of the other ethernet devices directly. - -endmenu diff --git a/rules/chrony.in b/rules/chrony.in index 5d356f1ab..8f7f8c9e5 100644 --- a/rules/chrony.in +++ b/rules/chrony.in @@ -1,9 +1,7 @@ -menu "Chrony " - config CHRONY bool select READLINE - prompt "Chrony (Alternative NTP Synchronisation Daemon)" + prompt "Chrony " help FIXME: remove READLINE select when 1.21 works again. @@ -18,5 +16,3 @@ config CHRONY various settings. See http://chrony.sunsite.dk/ for details - -endmenu diff --git a/rules/dnsmasq.in b/rules/dnsmasq.in index bc23db3d0..3571d2fb8 100644 --- a/rules/dnsmasq.in +++ b/rules/dnsmasq.in @@ -1,8 +1,6 @@ -menu "dnsmasq " - config DNSMASQ bool - prompt "dnsmasq" + prompt "dnsmasq " help A small caching DNS proxy and DHCP server. @@ -15,6 +13,3 @@ config DNSMASQ with names configured either in each host or in a central configuration file. Dnsmasq supports static and dynamic DHCP leases and BOOTP for network booting of diskless machines. - - -endmenu diff --git a/rules/ethereal.in b/rules/ethereal.in index 1c1aaf663..41bc07c23 100644 --- a/rules/ethereal.in +++ b/rules/ethereal.in @@ -1,9 +1,7 @@ -menu "ethereal " - -config ETHEREAL +menuconfig ETHEREAL bool depends on BROKEN - prompt "ethereal" + prompt "ethereal " select LIBPCAP help Ethereal is a network traffic analyzer for Unix @@ -25,7 +23,5 @@ config ETHEREAL_TETHEREAL help This is the textmode Version of ethereal. -endmenu - comment "ethereal is broken, please send a patch" depends on !BROKEN diff --git a/rules/eventlog.in b/rules/eventlog.in index d9ec65bfe..a07ce5491 100644 --- a/rules/eventlog.in +++ b/rules/eventlog.in @@ -1,8 +1,5 @@ -# eventlog configuration - -menuconfig EVENTLOG +config EVENTLOG bool prompt "eventlog " help - Part of syslog-ng. - + Part of syslog-ng. diff --git a/rules/fbutils.in b/rules/fbutils.in index 9f594dd70..bec46d458 100644 --- a/rules/fbutils.in +++ b/rules/fbutils.in @@ -1,6 +1,5 @@ menuconfig FBUTILS bool - select GCCLIBS select GCCLIBS_CXX prompt "fbutils " help diff --git a/rules/fontconfig.in b/rules/fontconfig.in index ec1a4923b..05fd3d00a 100644 --- a/rules/fontconfig.in +++ b/rules/fontconfig.in @@ -1,4 +1,4 @@ -menuconfig FONTCONFIG +config FONTCONFIG bool "Fontconfig " select FREETYPE select EXPAT diff --git a/rules/gcclibs.in b/rules/gcclibs.in index d49a87a67..d03b3e79c 100644 --- a/rules/gcclibs.in +++ b/rules/gcclibs.in @@ -2,9 +2,7 @@ # rules/gcclibs.in # -menuconfig GCCLIBS - bool - prompt "GCC Libraries " +menu "GCC Libraries " depends on BUILD_USERLAND config GCCLIBS_CXX @@ -27,3 +25,5 @@ config GCCLIBS_GCC_S_NOF depends on ARCH_PPC help FIXME: This item needs to be documented + +endmenu diff --git a/rules/hdparm.in b/rules/hdparm.in index 16ba3dc1a..9ea106fba 100644 --- a/rules/hdparm.in +++ b/rules/hdparm.in @@ -1,4 +1,4 @@ -menuconfig HDPARM +config HDPARM bool "hdparm " help hdparm - get/set ATA drive parameters under Linux diff --git a/rules/inetutils.in b/rules/inetutils.in index e68bb1f1b..1364a70c2 100644 --- a/rules/inetutils.in +++ b/rules/inetutils.in @@ -1,8 +1,6 @@ -menu "inetutils " - -config INETUTILS +menuconfig INETUTILS bool - prompt "inetutils" + prompt "inetutils " help FIXME: This item needs to be documented @@ -53,5 +51,3 @@ config INETUTILS_SYSLOGD depends on INETUTILS help FIXME: This item needs to be documented - -endmenu diff --git a/rules/libezv24.in b/rules/libezv24.in index 08b6ff24a..bd8916cf9 100644 --- a/rules/libezv24.in +++ b/rules/libezv24.in @@ -1,8 +1,8 @@ # configuration for libezv24 -menuconfig LIBEZV24 +config LIBEZV24 bool - prompt "libezv24 " + prompt "libezv24" help The goal of this library is to provide an easy to use programming interface to the serial ports of the Linux system, native on Linux and diff --git a/rules/liblockfile.in b/rules/liblockfile.in index 507862a26..d62083a5c 100644 --- a/rules/liblockfile.in +++ b/rules/liblockfile.in @@ -1,5 +1,3 @@ -menu "liblockfile " - config LIBLOCKFILE bool prompt "dotlockfile" @@ -10,5 +8,4 @@ config LIBLOCKFILE and unlock mailboxes even if the mailspool directory is only writable by group mail. However, its use is not restricted to mail - -endmenu + diff --git a/rules/nmap.in b/rules/nmap.in index ad141512c..4c1ee9911 100644 --- a/rules/nmap.in +++ b/rules/nmap.in @@ -1,9 +1,8 @@ -menu "nmap " - -config NMAP - bool "nmap" +menuconfig NMAP + bool "nmap " select OPENSSL select PCRE + select GCCLIBS_CXX help FIXME: This item needs to be documented @@ -11,7 +10,6 @@ config NMAP_SERVICES bool "Install nmap-services" default y depends on NMAP - select GCCLIBS_CXX help FIXME: This item needs to be documented -endmenu + diff --git a/rules/ntp.in b/rules/ntp.in index 7a769d31a..f7b50de9b 100644 --- a/rules/ntp.in +++ b/rules/ntp.in @@ -1,19 +1,16 @@ -# +comment "NTP conflicts with OpenNTPD" + depends on NTP && OPENNTPD -menu "NTP " - -config NTP +menuconfig NTP bool - prompt "NTP" + prompt "NTP " + select OPENSSL if NTP_CRYPTO help Build the standard NTP Daemon Process This conflicts with BSD openntpd. # ----- Compile Options -comment "Conflicts with OpenNTPd" - depends on OPENNTPD - comment "Compile Options" depends on NTP @@ -163,13 +160,10 @@ config NTP_NIST config NTP_CRYPTO bool prompt "use openssl" - depends on NTP && OPENSSL + depends on NTP help FIXME: This item needs to be documented -comment "crypto needs openssl" - depends on !(NTP && OPENSSL) && NTP - config NTP_SNTP bool prompt "Build SNTP" @@ -219,5 +213,3 @@ config NTP_NTPQ depends on NTP help FIXME: This item needs to be documented - -endmenu diff --git a/rules/openntpd.in b/rules/openntpd.in index 00c5e4866..460585d58 100644 --- a/rules/openntpd.in +++ b/rules/openntpd.in @@ -1,8 +1,9 @@ -menu "OpenNTPD " +comment "OpenNTPD conflicts with NTP" + depends on NTP && OPENNTPD -config OPENNTPD +menuconfig OPENNTPD bool - prompt "OpenNTPD (Network Time Synchronisation Daemon)" + prompt "OpenNTPD " help This will install the BSD Open NTPD Daemon OpenNTPD is a FREE, easy to use implementation of the @@ -13,12 +14,6 @@ config OPENNTPD # ----- Compile Options -comment "Conflicts with NTP" - depends on NTP - -comment "Compile Options" - depends on OPENNTPD - config OPENNTPD_ARC4RANDOM bool prompt "Use builtin arc4random rather than OpenSSL's" @@ -27,5 +22,3 @@ config OPENNTPD_ARC4RANDOM help Enabled by default - if unsure, say YES Say NO and install OpenSSL as alternative. - -endmenu diff --git a/rules/openssh.in b/rules/openssh.in index 38c98a6ad..de7e37f94 100644 --- a/rules/openssh.in +++ b/rules/openssh.in @@ -1,10 +1,8 @@ -menu "OpenSSH " - -config OPENSSH +menuconfig OPENSSH bool select ZLIB select OPENSSL - prompt "OpenSSH" + prompt "OpenSSH " help FIXME: This item needs to be documented @@ -39,6 +37,3 @@ config OPENSSH_KEYGEN depends on OPENSSH help FIXME: This item needs to be documented - -endmenu - diff --git a/rules/slang.in b/rules/slang.in index 7894b4c70..68491b756 100644 --- a/rules/slang.in +++ b/rules/slang.in @@ -1,6 +1,6 @@ -menuconfig SLANG +config SLANG bool - prompt "S-Lang " + prompt "S-Lang" help S-Lang is a C programmer's library that includes routines for the rapid development of sophisticated, user friendly, diff --git a/rules/sysfsutils.in b/rules/sysfsutils.in index fa0455af5..5752edce7 100644 --- a/rules/sysfsutils.in +++ b/rules/sysfsutils.in @@ -4,6 +4,7 @@ menuconfig SYSFSUTILS config SYSFSUTILS_LIB bool prompt "install libsysfs" + default y depends on SYSFSUTILS help Sysfs is a virtual file system in Linux kernel diff --git a/rules/tcpdump.in b/rules/tcpdump.in index aae288e51..72a0883b3 100644 --- a/rules/tcpdump.in +++ b/rules/tcpdump.in @@ -2,6 +2,7 @@ menuconfig TCPDUMP bool prompt "tcpdump " select LIBPCAP + select OPENSSL if TCPDUMP_DISABLE_CRYPTO help Tcpdump prints out the headers of packets on a network interface that match the boolean expression. It can also be run with @@ -11,9 +12,9 @@ menuconfig TCPDUMP a network interface. In all cases, only packets that match expression will be processed by tcpdump. -config TCPDUMP_DISABLE_CRYPTO +config TCPDUMP_ENABLE_CRYPTO bool - prompt "disable crypto support" + prompt "enable crypto support" depends on TCPDUMP help Select this, if you don't need support for diff --git a/rules/udev.in b/rules/udev.in index 65fc0ab68..873a20c7a 100644 --- a/rules/udev.in +++ b/rules/udev.in @@ -1,5 +1,6 @@ -config UDEV - bool "udev" +menuconfig UDEV + bool + prompt "udev " config UDEV_UDEV bool "udev" |