diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-01-15 22:24:10 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-01-15 22:24:10 +0000 |
| commit | 3064fa28c3b275d5f2bce72ff1083222f53194d1 (patch) | |
| tree | d6adec7d5edc716909b487425e805a3baa529c7e /packages | |
| parent | 127b5109e790172290734d282ed6b00f1e9a559c (diff) | |
| parent | 4566a87bd955d4cabf5d0363d075ed35f959258a (diff) | |
merge of '0289d89398deea4654115c70fb33322c5aea435e'
and 'bb36d08ccdb518fc32365dbed19d9d236d737b5f'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/busybox/busybox-1.3.1/wget-long-options.patch | 20 | ||||
| -rw-r--r-- | packages/busybox/busybox_1.3.1.bb | 4 |
2 files changed, 2 insertions, 22 deletions
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 |