From 4566a87bd955d4cabf5d0363d075ed35f959258a Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Mon, 15 Jan 2007 20:56:11 +0000
Subject: busybox: Remove superflous patch

---
 .../busybox/busybox-1.3.1/wget-long-options.patch    | 20 --------------------
 packages/busybox/busybox_1.3.1.bb                    |  4 ++--
 2 files changed, 2 insertions(+), 22 deletions(-)
 delete mode 100644 packages/busybox/busybox-1.3.1/wget-long-options.patch

(limited to 'packages/busybox')

diff --git a/packages/busybox/busybox-1.3.1/wget-long-options.patch b/packages/busybox/busybox-1.3.1/wget-long-options.patch
deleted file mode 100644
index 3c5920a3cb..0000000000
--- a/packages/busybox/busybox-1.3.1/wget-long-options.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- busybox-1.2.1.orig/networking/wget.c
-+++ busybox-1.2.1/networking/wget.c
-@@ -136,7 +136,7 @@
- #define WGET_OPT_PREFIX	32
- #define WGET_OPT_PROXY	64
- 
--#if ENABLE_WGET_LONG_OPTIONS
-+#if CONFIG_FEATURE_WGET_LONG_OPTIONS
- static const struct option wget_long_options[] = {
- 	{ "continue",        0, NULL, 'c' },
- 	{ "quiet",           0, NULL, 'q' },
-@@ -180,7 +180,7 @@
- 	 * Crack command line.
- 	 */
- 	bb_opt_complementally = "-1:\203::";
--#if ENABLE_WGET_LONG_OPTIONS
-+#if CONFIG_FEATURE_WGET_LONG_OPTIONS
- 	bb_applet_long_options = wget_long_options;
- #endif
- 	opt = bb_getopt_ulflags(argc, argv, "cq\213O:\203:P:Y:",
diff --git a/packages/busybox/busybox_1.3.1.bb b/packages/busybox/busybox_1.3.1.bb
index 59aa5f07fc..b04cd86677 100644
--- a/packages/busybox/busybox_1.3.1.bb
+++ b/packages/busybox/busybox_1.3.1.bb
@@ -1,9 +1,9 @@
 require busybox.inc
 
 DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_slugos = "1"
 
-SRC_URI = "file://wget-long-options.patch;patch=1 \
-           file://defconfig"
+SRC_URI = "file://defconfig"
 
 do_configure () {
 	install -m 0644 ${WORKDIR}/defconfig ${S}/.config.oe
-- 
cgit v1.2.3