busybox: Ensure that diff is available for ipkg upgrade requirements

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7954 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 044eae2..9cad7e5 100644 (file)
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=busybox
 PKG_VERSION:=1.4.2
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.busybox.net/downloads \

diff --git a/package/busybox/config/archival/Config.in b/package/busybox/config/archival/Config.in
index ed5b0c5..989d8d5 100644 (file)
--- a/package/busybox/config/archival/Config.in
+++ b/package/busybox/config/archival/Config.in
@@ -126,6 +126,7 @@ config BUSYBOX_CONFIG_IPKG
        default y
        select BUSYBOX_CONFIG_MD5SUM
        select BUSYBOX_CONFIG_WGET
+       select BUSYBOX_CONFIG_DIFF
        help
          ipkg is the itsy package management system.