aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2011-10-24 07:39:53 +0000
committerNicolas Thill <nico@openwrt.org>2011-10-24 07:39:53 +0000
commit9be2e59eae187a0e8079623583e17c70ce7b03fa (patch)
tree2dc0f14cb2811ad93e339d14769b754ad0fcfb2b /package
parent3b0ad33ac2a0f4ab4558796ffc1959e75ccda62e (diff)
downloadupstream-9be2e59eae187a0e8079623583e17c70ce7b03fa.tar.gz
upstream-9be2e59eae187a0e8079623583e17c70ce7b03fa.tar.bz2
upstream-9be2e59eae187a0e8079623583e17c70ce7b03fa.zip
package/busybox: revert config defaults inadvertently changed in [28513] (thanks to Liu Yu Fei, Eric), bump release number
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28547 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/busybox/Makefile4
-rw-r--r--package/busybox/config/console-tools/Config.in2
-rw-r--r--package/busybox/config/networking/Config.in2
-rw-r--r--package/busybox/config/util-linux/Config.in2
4 files changed, 5 insertions, 5 deletions
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 5559e8b82a..f2894017fb 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=busybox
PKG_VERSION:=1.19.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_FLAGS:=essential
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/package/busybox/config/console-tools/Config.in b/package/busybox/config/console-tools/Config.in
index a4007cb69a..9069b0f1a1 100644
--- a/package/busybox/config/console-tools/Config.in
+++ b/package/busybox/config/console-tools/Config.in
@@ -129,7 +129,7 @@ config BUSYBOX_CONFIG_FEATURE_SETFONT_TEXTUAL_MAP
config BUSYBOX_CONFIG_DEFAULT_SETFONT_DIR
string "Default directory for console-tools files"
- default n
+ default ""
depends on BUSYBOX_CONFIG_SETFONT
help
Directory to use if setfont's params are simple filenames
diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in
index 5cec9dc29e..ca9815757d 100644
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -82,7 +82,7 @@ config BUSYBOX_CONFIG_PING
config BUSYBOX_CONFIG_PING6
bool "ping6"
- default n
+ default y
depends on BUSYBOX_CONFIG_FEATURE_IPV6 && BUSYBOX_CONFIG_PING
help
This will give you a ping that can talk IPv6.
diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in
index 14d4777bea..56e8035865 100644
--- a/package/busybox/config/util-linux/Config.in
+++ b/package/busybox/config/util-linux/Config.in
@@ -600,7 +600,7 @@ config BUSYBOX_CONFIG_PIVOT_ROOT
config BUSYBOX_CONFIG_RDATE
bool "rdate"
- default n
+ default y
help
The rdate utility allows you to synchronize the date and time of your
system clock with the date and time of a remote networked system using