Changeset 1796

Show
Ignore:
Timestamp:
16/11/10 15:57:18 (3 years ago)
Author:
matthijs
Message:

busybox: Fix the target-specific busybox configuration.

This file contained a bunch of changes in the default busybox
configuration that depended on the TARGET_fonera value, which doesn't
exist (anymore?). This commit makes these changes depend on

TARGET_fonera2 TARGET_fonera2n.

On the longer term, these configuration values should probably be moved
somewhere into target/, but let's leave them here for now.

This change effectively disables the following features (again):

  • inetd
  • hwclock
  • hexdump
  • telnet
  • crond
  • crontab

The start-stop-daemon command was also disabled before, but this commit
leaves it enabled because OpenVPN uses it.

This change shrinks the busybox binary by around 28K.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/openwrt/package/busybox/target-config.in

    r1028 r1796  
    1212 
    1313config BUSYBOX_CONFIG_INETD  
    14         default n if TARGET_fonera 
     14        default n if TARGET_fonera2 || TARGET_fonera2n 
    1515 
    1616config  BUSYBOX_CONFIG_HEXDUMP 
    17         default n if TARGET_fonera 
     17        default n if TARGET_fonera2 || TARGET_fonera2n 
    1818 
    1919config BUSYBOX_CONFIG_HWCLOCK 
    20         default n if TARGET_fonera 
    21  
    22 config BUSYBOX_CONFIG_START_STOP_DAEMON 
    23         default n if TARGET_fonera 
     20        default n if TARGET_fonera2 || TARGET_fonera2n 
    2421 
    2522config BUSYBOX_CONFIG_STRINGS 
    26         default n if TARGET_fonera 
     23        default n if TARGET_fonera2 || TARGET_fonera2n 
    2724 
    2825config BUSYBOX_CONFIG_TELNET 
    29         default n if TARGET_fonera 
     26        default n if TARGET_fonera2 || TARGET_fonera2n 
    3027 
    3128config BUSYBOX_CONFIG_TIME 
    32         default n if TARGET_fonera 
     29        default n if TARGET_fonera2 || TARGET_fonera2n 
    3330 
    3431config BUSYBOX_CONFIG_CROND 
    35         default n if TARGET_fonera 
     32        default n if TARGET_fonera2 || TARGET_fonera2n 
    3633 
    3734config BUSYBOX_CONFIG_CRONTAB 
    38         default n if TARGET_fonera 
     35        default n if TARGET_fonera2 || TARGET_fonera2n 
    3936 
    4037config BUSYBOX_CONFIG_SWAPONOFF 
    41         default y 
     38        default y if TARGET_fonera2 || TARGET_fonera2n 
    4239 
    4340config BUSYBOX_CONFIG_MKSWAP 
    44         default y 
     41        default y if TARGET_fonera2 || TARGET_fonera2n