summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKevin Tian <kevin.tian@intel.com>2010-07-06 15:33:31 +0800
committerJoshua Lock <josh@linux.intel.com>2010-07-07 17:12:11 +0100
commitb56df3f573bdd5b5aebb5bdf565e8d9be1aa098d (patch)
treee3ad39ad14f6eb1f941445d35e7650113808e1bc /meta
parent330e32da127715341f49780b1f88120a31411739 (diff)
downloadpoky-b56df3f573bdd5b5aebb5bdf565e8d9be1aa098d.tar.gz
busybox: upgrade to 1.16.2
[Patches] (add comments for kept patches) REMOVE _0000-wget-no-check-certificate.patch_: in 1.16.2 now KEEP _B921600.patch_: add 921600 speed serial line REMOVE _ash_fix_redirection_of_fd_0.patch_: in 1.16.2 REMOVE _fdisk_lineedit_segfault.patch_: not used even in 1.15.3 REMOVE _fix_: not used even in 1.15.3 KEEP _get_header_tar.patch_: fix tar problem with exact 100 bytes filename REMOVE _r24785.patch_: not used even in 1.15.3 KEEP _run-parts.in.usr-bin.patch_: solve confliction with debianutils. Though the later is not in poky, keep it for safety KEEP _udhcpscript.patch_: fix warning message REMOVE _xargs-double-size.patch_: not used even in 1.15.3 KEEP _busybox-appletlib-dependency.patch_: solve paralle make issue. Move away from files/. KEEP _udhcpc-fix-nfsroot.patch_: support nfsroot [Files] UPDATE _defconfig_: adapt to new 1.16.2 config options [Recipe] - adapt to new 1.16.2 config option - remove old OEMAKE_apend on "CROSS" which has been replaced by "CROSS_COMPILE" since 2006 Signed-off-by Kevin Tian <kevin.tian@intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/busybox/busybox-1.15.3/0000-wget-no-check-certificate.patch12
-rw-r--r--meta/packages/busybox/busybox-1.15.3/ash_fix_redirection_of_fd_0.patch21
-rw-r--r--meta/packages/busybox/busybox-1.15.3/fdisk_lineedit_segfault.patch12
-rw-r--r--meta/packages/busybox/busybox-1.15.3/fix31
-rw-r--r--meta/packages/busybox/busybox-1.15.3/r24785.patch14
-rw-r--r--meta/packages/busybox/busybox-1.15.3/xargs-double-size.patch13
-rw-r--r--meta/packages/busybox/busybox-1.16.2/B921600.patch (renamed from meta/packages/busybox/busybox-1.15.3/B921600.patch)9
-rw-r--r--meta/packages/busybox/busybox-1.16.2/busybox-appletlib-dependency.patch35
-rw-r--r--meta/packages/busybox/busybox-1.16.2/defconfig (renamed from meta/packages/busybox/busybox-1.15.3/defconfig)45
-rw-r--r--meta/packages/busybox/busybox-1.16.2/get_header_tar.patch (renamed from meta/packages/busybox/busybox-1.15.3/get_header_tar.patch)9
-rw-r--r--meta/packages/busybox/busybox-1.16.2/run-parts.in.usr-bin.patch (renamed from meta/packages/busybox/busybox-1.15.3/run-parts.in.usr-bin.patch)15
-rw-r--r--meta/packages/busybox/busybox-1.16.2/udhcpc-fix-nfsroot.patch (renamed from meta/packages/busybox/busybox-1.15.3/udhcpc-fix-nfsroot.patch)8
-rw-r--r--meta/packages/busybox/busybox-1.16.2/udhcpscript.patch (renamed from meta/packages/busybox/busybox-1.15.3/udhcpscript.patch)9
-rw-r--r--meta/packages/busybox/busybox.inc5
-rw-r--r--meta/packages/busybox/busybox_1.15.3.bb28
-rw-r--r--meta/packages/busybox/busybox_1.16.2.bb24
-rw-r--r--meta/packages/busybox/files/busybox-appletlib-dependency.patch15
17 files changed, 144 insertions, 161 deletions
diff --git a/meta/packages/busybox/busybox-1.15.3/0000-wget-no-check-certificate.patch b/meta/packages/busybox/busybox-1.15.3/0000-wget-no-check-certificate.patch
deleted file mode 100644
index c737f172b1..0000000000
--- a/meta/packages/busybox/busybox-1.15.3/0000-wget-no-check-certificate.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1diff --git a/networking/wget.c b/networking/wget.c
2index 9d813dc..09edd67 100644
3--- a/networking/wget.c
4+++ b/networking/wget.c
5@@ -546,6 +546,7 @@ int wget_main(int argc UNUSED_PARAM, char **argv)
6 "passive-ftp\0" No_argument "\xff"
7 "header\0" Required_argument "\xfe"
8 "post-data\0" Required_argument "\xfd"
9+ "no-check-certificate\0" No_argument "\xfc"
10 ;
11 #endif
12
diff --git a/meta/packages/busybox/busybox-1.15.3/ash_fix_redirection_of_fd_0.patch b/meta/packages/busybox/busybox-1.15.3/ash_fix_redirection_of_fd_0.patch
deleted file mode 100644
index 5c791271e5..0000000000
--- a/meta/packages/busybox/busybox-1.15.3/ash_fix_redirection_of_fd_0.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1Fix redirection of fd 0 in scripts sourced from interactive ash
2
3Based on Busybox git 08d8b3cee1329d390f91bce419e2b4dadf484952 by
4Denys Vlasenko <vda.linux@googlemail.com>.
5
6Can be removed when we bump to 1.16.1 + patches or later
7
8JL 03/06/10
9Index: busybox-1.15.3/shell/ash.c
10===================================================================
11--- busybox-1.15.3.orig/shell/ash.c 2009-12-12 21:16:38.000000000 +0000
12+++ busybox-1.15.3/shell/ash.c 2010-06-03 09:44:59.484647637 +0100
13@@ -5071,7 +5071,7 @@
14 return 0;
15 pf = g_parsefile;
16 while (pf) {
17- if (fd == pf->fd) {
18+ if (pf->fd > 0 && fd == pf->fd) {
19 return 1;
20 }
21 pf = pf->prev;
diff --git a/meta/packages/busybox/busybox-1.15.3/fdisk_lineedit_segfault.patch b/meta/packages/busybox/busybox-1.15.3/fdisk_lineedit_segfault.patch
deleted file mode 100644
index 633153f1ce..0000000000
--- a/meta/packages/busybox/busybox-1.15.3/fdisk_lineedit_segfault.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1--- old/libbb/lineedit.c 2008/09/27 01:28:56 23530
2+++ new/libbb/lineedit.c 2008/11/02 00:41:05 23898
3@@ -1412,7 +1412,8 @@
4 if ((state->flags & SAVE_HISTORY) && state->hist_file)
5 load_history(state->hist_file);
6 #endif
7- state->cur_history = state->cnt_history;
8+ if (state->flags & DO_HISTORY)
9+ state->cur_history = state->cnt_history;
10
11 /* prepare before init handlers */
12 cmdedit_y = 0; /* quasireal y, not true if line > xt*yt */
diff --git a/meta/packages/busybox/busybox-1.15.3/fix b/meta/packages/busybox/busybox-1.15.3/fix
deleted file mode 100644
index 544f41b256..0000000000
--- a/meta/packages/busybox/busybox-1.15.3/fix
+++ /dev/null
@@ -1,31 +0,0 @@
1---
2 util-linux/mdev.c | 3 ++-
3 1 file changed, 2 insertions(+), 1 deletion(-)
4
5--- busybox-1.13.2.orig/util-linux/mdev.c
6+++ busybox-1.13.2/util-linux/mdev.c
7@@ -107,11 +107,11 @@ static void make_device(char *path, int
8
9 #if ENABLE_FEATURE_MDEV_CONF
10 parser = config_open2("/etc/mdev.conf", fopen_for_read);
11
12 /* If we have config file, look up user settings */
13- while (config_read(parser, tokens, 4, 3, "# \t", PARSE_NORMAL)) {
14+ while (config_read(parser, tokens, 5, 3, "# \t", PARSE_NORMAL)) {
15 regmatch_t off[1 + 9*ENABLE_FEATURE_MDEV_RENAME_REGEXP];
16 char *val;
17
18 /* Fields: regex uid:gid mode [alias] [cmd] */
19
20@@ -211,10 +211,11 @@ static void make_device(char *path, int
21 }
22 #endif /* ENABLE_FEATURE_MDEV_RENAME */
23
24 #if ENABLE_FEATURE_MDEV_EXEC
25 /* The rest (opt): command to run */
26+ val = tokens[4];
27 if (!val)
28 break;
29 {
30 const char *s = "@$*";
31 const char *s2 = strchr(s, *val);
diff --git a/meta/packages/busybox/busybox-1.15.3/r24785.patch b/meta/packages/busybox/busybox-1.15.3/r24785.patch
deleted file mode 100644
index e3e80befcd..0000000000
--- a/meta/packages/busybox/busybox-1.15.3/r24785.patch
+++ /dev/null
@@ -1,14 +0,0 @@
1--- busybox/util-linux/mdev.c 2009/01/08 17:19:01 24725
2+++ busybox/util-linux/mdev.c 2009/01/12 07:57:52 24785
3@@ -179,8 +179,9 @@
4 unsigned i, n;
5 #endif
6 char *a = val;
7- s = strchr(val, ' ');
8- val = (s && s[1]) ? s+1 : NULL;
9+ s = strchrnul(val, ' ');
10+ val = (s[0] && s[1]) ? s+1 : NULL;
11+ s[0] = '\0';
12 #if ENABLE_FEATURE_MDEV_RENAME_REGEXP
13 /* substitute %1..9 with off[1..9], if any */
14 n = 0;
diff --git a/meta/packages/busybox/busybox-1.15.3/xargs-double-size.patch b/meta/packages/busybox/busybox-1.15.3/xargs-double-size.patch
deleted file mode 100644
index df64554ffc..0000000000
--- a/meta/packages/busybox/busybox-1.15.3/xargs-double-size.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1--- busybox-1.2.1/findutils/xargs.c.org 2006-09-19 18:18:17.084592997 +0200
2+++ busybox-1.2.1/findutils/xargs.c 2006-09-19 18:18:09.820275793 +0200
3@@ -466,8 +466,8 @@
4 have it at 1 meg). Things will work fine with a large ARG_MAX but it
5 will probably hurt the system more than it needs to; an array of this
6 size is allocated. */
7- if (orig_arg_max > 20 * 1024)
8- orig_arg_max = 20 * 1024;
9+ if (orig_arg_max > 40 * 1024)
10+ orig_arg_max = 40 * 1024;
11 n_max_chars = orig_arg_max;
12 }
13 max_chars = xmalloc(n_max_chars);
diff --git a/meta/packages/busybox/busybox-1.15.3/B921600.patch b/meta/packages/busybox/busybox-1.16.2/B921600.patch
index 61cc32b0e5..803dc411d8 100644
--- a/meta/packages/busybox/busybox-1.15.3/B921600.patch
+++ b/meta/packages/busybox/busybox-1.16.2/B921600.patch
@@ -1,3 +1,12 @@
1# copy commit message from OE as the patch comment:
2# commit 5b1ed09b1ab1a60a28a76e4658bc9957cd361b5d
3# Author: Valentin Longchamp <valentin.longchamp@epfl.ch>
4# Date: Mon Dec 8 14:43:23 2008 +0100
5
6# busybox: added support for 921600 speed of serial line
7#
8# above comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06
9
1diff -upNr busybox-1.7.2/libbb/speed_table.c busybox-1.7.2-921600/libbb/speed_table.c 10diff -upNr busybox-1.7.2/libbb/speed_table.c busybox-1.7.2-921600/libbb/speed_table.c
2--- busybox-1.7.2/libbb/speed_table.c 2007-09-03 13:48:41.000000000 +0200 11--- busybox-1.7.2/libbb/speed_table.c 2007-09-03 13:48:41.000000000 +0200
3+++ busybox-1.7.2-921600/libbb/speed_table.c 2008-10-09 16:23:26.269592899 +0200 12+++ busybox-1.7.2-921600/libbb/speed_table.c 2008-10-09 16:23:26.269592899 +0200
diff --git a/meta/packages/busybox/busybox-1.16.2/busybox-appletlib-dependency.patch b/meta/packages/busybox/busybox-1.16.2/busybox-appletlib-dependency.patch
new file mode 100644
index 0000000000..041aa6c54c
--- /dev/null
+++ b/meta/packages/busybox/busybox-1.16.2/busybox-appletlib-dependency.patch
@@ -0,0 +1,35 @@
1# copy commit message from OE as the patch comment:
2# commit 98c24291aa165f53423c27ae033831ce0b3bb676
3# Author: Roman I Khimov <khimov@altell.ru>
4# Date: Thu Mar 26 23:03:58 2009 +0000
5#
6# busybox: update appletlib dependency patch
7#
8# Previous version still failed from time to time on clean-start builds
9# with 4 bitbake threads and '-j16'. Building busybox as sole target worked
10# well.
11#
12# The reason is that previous version introduced a race between applets make
13# processes spawned from top-level Makefile and from libbb Makefile.
14#
15# Fix it with high-level dependency that doesn't create races.
16#
17# Signed-off-by: Koen Kooi <koen@openembedded.org>
18#
19# above comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06
20
21Index: busybox-1.13.2/Makefile
22===================================================================
23--- busybox-1.13.2.orig/Makefile 2009-03-19 15:44:37.419270265 +0300
24+++ busybox-1.13.2/Makefile 2009-03-19 15:45:57.737521296 +0300
25@@ -471,6 +471,10 @@
26 util-linux/ \
27 util-linux/volume_id/ \
28
29+# Lib interdeps
30+# libbb uses headers generated in applets
31+libbb: applets
32+
33 endif # KBUILD_EXTMOD
34
35 ifeq ($(dot-config),1)
diff --git a/meta/packages/busybox/busybox-1.15.3/defconfig b/meta/packages/busybox/busybox-1.16.2/defconfig
index c347c80d5b..431da94dd2 100644
--- a/meta/packages/busybox/busybox-1.15.3/defconfig
+++ b/meta/packages/busybox/busybox-1.16.2/defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Busybox version: 1.15.3 3# Busybox version: 1.16.2
4# Tue Jun 1 14:34:32 2010 4# Tue Jul 6 14:52:48 2010
5# 5#
6CONFIG_HAVE_DOT_CONFIG=y 6CONFIG_HAVE_DOT_CONFIG=y
7 7
@@ -14,6 +14,8 @@ CONFIG_HAVE_DOT_CONFIG=y
14# 14#
15# CONFIG_DESKTOP is not set 15# CONFIG_DESKTOP is not set
16# CONFIG_EXTRA_COMPAT is not set 16# CONFIG_EXTRA_COMPAT is not set
17# CONFIG_INCLUDE_SUSv2 is not set
18# CONFIG_USE_PORTABLE_CODE is not set
17CONFIG_FEATURE_BUFFERS_USE_MALLOC=y 19CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
18# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set 20# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
19# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set 21# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
@@ -59,7 +61,6 @@ CONFIG_EXTRA_CFLAGS=""
59CONFIG_NO_DEBUG_LIB=y 61CONFIG_NO_DEBUG_LIB=y
60# CONFIG_DMALLOC is not set 62# CONFIG_DMALLOC is not set
61# CONFIG_EFENCE is not set 63# CONFIG_EFENCE is not set
62# CONFIG_INCLUDE_SUSv2 is not set
63 64
64# 65#
65# Installation Options 66# Installation Options
@@ -120,6 +121,7 @@ CONFIG_CPIO=y
120# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set 121# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
121CONFIG_GUNZIP=y 122CONFIG_GUNZIP=y
122CONFIG_GZIP=y 123CONFIG_GZIP=y
124# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set
123# CONFIG_LZOP is not set 125# CONFIG_LZOP is not set
124# CONFIG_LZOP_COMPR_HIGH is not set 126# CONFIG_LZOP_COMPR_HIGH is not set
125# CONFIG_RPM2CPIO is not set 127# CONFIG_RPM2CPIO is not set
@@ -133,6 +135,7 @@ CONFIG_FEATURE_TAR_FROM=y
133CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y 135CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
134# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set 136# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
135# CONFIG_FEATURE_TAR_UNAME_GNAME is not set 137# CONFIG_FEATURE_TAR_UNAME_GNAME is not set
138# CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set
136# CONFIG_UNCOMPRESS is not set 139# CONFIG_UNCOMPRESS is not set
137# CONFIG_UNLZMA is not set 140# CONFIG_UNLZMA is not set
138# CONFIG_FEATURE_LZMA_FAST is not set 141# CONFIG_FEATURE_LZMA_FAST is not set
@@ -148,15 +151,19 @@ CONFIG_CAT=y
148CONFIG_CHGRP=y 151CONFIG_CHGRP=y
149CONFIG_CHMOD=y 152CONFIG_CHMOD=y
150CONFIG_CHOWN=y 153CONFIG_CHOWN=y
154# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set
151CONFIG_CHROOT=y 155CONFIG_CHROOT=y
152# CONFIG_CKSUM is not set 156# CONFIG_CKSUM is not set
153# CONFIG_COMM is not set 157# CONFIG_COMM is not set
154CONFIG_CP=y 158CONFIG_CP=y
159# CONFIG_FEATURE_CP_LONG_OPTIONS is not set
155CONFIG_CUT=y 160CONFIG_CUT=y
156CONFIG_DATE=y 161CONFIG_DATE=y
157# CONFIG_FEATURE_DATE_ISOFMT is not set 162# CONFIG_FEATURE_DATE_ISOFMT is not set
163CONFIG_FEATURE_DATE_COMPAT=y
158CONFIG_DD=y 164CONFIG_DD=y
159CONFIG_FEATURE_DD_SIGNAL_HANDLING=y 165CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
166# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set
160# CONFIG_FEATURE_DD_IBS_OBS is not set 167# CONFIG_FEATURE_DD_IBS_OBS is not set
161CONFIG_DF=y 168CONFIG_DF=y
162# CONFIG_FEATURE_DF_FANCY is not set 169# CONFIG_FEATURE_DF_FANCY is not set
@@ -271,7 +278,7 @@ CONFIG_FEATURE_AUTOWIDTH=y
271CONFIG_FEATURE_HUMAN_READABLE=y 278CONFIG_FEATURE_HUMAN_READABLE=y
272 279
273# 280#
274# Common options for md5sum, sha1sum 281# Common options for md5sum, sha1sum, sha256sum, sha512sum
275# 282#
276CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y 283CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
277 284
@@ -318,9 +325,8 @@ CONFIG_AWK=y
318# CONFIG_FEATURE_AWK_LIBM is not set 325# CONFIG_FEATURE_AWK_LIBM is not set
319CONFIG_CMP=y 326CONFIG_CMP=y
320CONFIG_DIFF=y 327CONFIG_DIFF=y
321CONFIG_FEATURE_DIFF_BINARY=y 328# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
322CONFIG_FEATURE_DIFF_DIR=y 329CONFIG_FEATURE_DIFF_DIR=y
323# CONFIG_FEATURE_DIFF_MINIMAL is not set
324# CONFIG_ED is not set 330# CONFIG_ED is not set
325CONFIG_PATCH=y 331CONFIG_PATCH=y
326CONFIG_SED=y 332CONFIG_SED=y
@@ -364,6 +370,7 @@ CONFIG_FEATURE_FIND_PRUNE=y
364CONFIG_FEATURE_FIND_PATH=y 370CONFIG_FEATURE_FIND_PATH=y
365CONFIG_FEATURE_FIND_REGEX=y 371CONFIG_FEATURE_FIND_REGEX=y
366# CONFIG_FEATURE_FIND_CONTEXT is not set 372# CONFIG_FEATURE_FIND_CONTEXT is not set
373# CONFIG_FEATURE_FIND_LINKS is not set
367CONFIG_GREP=y 374CONFIG_GREP=y
368CONFIG_FEATURE_GREP_EGREP_ALIAS=y 375CONFIG_FEATURE_GREP_EGREP_ALIAS=y
369CONFIG_FEATURE_GREP_FGREP_ALIAS=y 376CONFIG_FEATURE_GREP_FGREP_ALIAS=y
@@ -453,6 +460,7 @@ CONFIG_MODPROBE=y
453# Options common to multiple modutils 460# Options common to multiple modutils
454# 461#
455# CONFIG_FEATURE_2_4_MODULES is not set 462# CONFIG_FEATURE_2_4_MODULES is not set
463# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
456# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set 464# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
457# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set 465# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
458# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set 466# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
@@ -488,12 +496,14 @@ CONFIG_FEATURE_FDISK_WRITABLE=y
488# CONFIG_FINDFS is not set 496# CONFIG_FINDFS is not set
489# CONFIG_FREERAMDISK is not set 497# CONFIG_FREERAMDISK is not set
490CONFIG_FSCK_MINIX=y 498CONFIG_FSCK_MINIX=y
499# CONFIG_MKFS_EXT2 is not set
491CONFIG_MKFS_MINIX=y 500CONFIG_MKFS_MINIX=y
492 501
493# 502#
494# Minix filesystem support 503# Minix filesystem support
495# 504#
496CONFIG_FEATURE_MINIX2=y 505CONFIG_FEATURE_MINIX2=y
506# CONFIG_MKFS_REISER is not set
497# CONFIG_MKFS_VFAT is not set 507# CONFIG_MKFS_VFAT is not set
498# CONFIG_GETOPT is not set 508# CONFIG_GETOPT is not set
499# CONFIG_FEATURE_GETOPT_LONG is not set 509# CONFIG_FEATURE_GETOPT_LONG is not set
@@ -506,6 +516,8 @@ CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
506# CONFIG_IPCRM is not set 516# CONFIG_IPCRM is not set
507# CONFIG_IPCS is not set 517# CONFIG_IPCS is not set
508CONFIG_LOSETUP=y 518CONFIG_LOSETUP=y
519# CONFIG_LSPCI is not set
520# CONFIG_LSUSB is not set
509# CONFIG_MDEV is not set 521# CONFIG_MDEV is not set
510# CONFIG_FEATURE_MDEV_CONF is not set 522# CONFIG_FEATURE_MDEV_CONF is not set
511# CONFIG_FEATURE_MDEV_RENAME is not set 523# CONFIG_FEATURE_MDEV_RENAME is not set
@@ -518,6 +530,7 @@ CONFIG_MORE=y
518CONFIG_FEATURE_USE_TERMIOS=y 530CONFIG_FEATURE_USE_TERMIOS=y
519# CONFIG_VOLUMEID is not set 531# CONFIG_VOLUMEID is not set
520# CONFIG_FEATURE_VOLUMEID_EXT is not set 532# CONFIG_FEATURE_VOLUMEID_EXT is not set
533# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
521# CONFIG_FEATURE_VOLUMEID_REISERFS is not set 534# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
522# CONFIG_FEATURE_VOLUMEID_FAT is not set 535# CONFIG_FEATURE_VOLUMEID_FAT is not set
523# CONFIG_FEATURE_VOLUMEID_HFS is not set 536# CONFIG_FEATURE_VOLUMEID_HFS is not set
@@ -595,6 +608,7 @@ CONFIG_DC=y
595# CONFIG_EJECT is not set 608# CONFIG_EJECT is not set
596# CONFIG_FEATURE_EJECT_SCSI is not set 609# CONFIG_FEATURE_EJECT_SCSI is not set
597# CONFIG_FBSPLASH is not set 610# CONFIG_FBSPLASH is not set
611# CONFIG_FLASHCP is not set
598# CONFIG_FLASH_LOCK is not set 612# CONFIG_FLASH_LOCK is not set
599# CONFIG_FLASH_UNLOCK is not set 613# CONFIG_FLASH_UNLOCK is not set
600# CONFIG_FLASH_ERASEALL is not set 614# CONFIG_FLASH_ERASEALL is not set
@@ -638,6 +652,7 @@ CONFIG_TIME=y
638# CONFIG_TIMEOUT is not set 652# CONFIG_TIMEOUT is not set
639# CONFIG_TTYSIZE is not set 653# CONFIG_TTYSIZE is not set
640# CONFIG_VOLNAME is not set 654# CONFIG_VOLNAME is not set
655# CONFIG_WALL is not set
641# CONFIG_WATCHDOG is not set 656# CONFIG_WATCHDOG is not set
642 657
643# 658#
@@ -657,6 +672,7 @@ CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
657# CONFIG_FAKEIDENTD is not set 672# CONFIG_FAKEIDENTD is not set
658# CONFIG_FTPD is not set 673# CONFIG_FTPD is not set
659# CONFIG_FEATURE_FTP_WRITE is not set 674# CONFIG_FEATURE_FTP_WRITE is not set
675# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set
660# CONFIG_FTPGET is not set 676# CONFIG_FTPGET is not set
661# CONFIG_FTPPUT is not set 677# CONFIG_FTPPUT is not set
662# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set 678# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
@@ -722,6 +738,8 @@ CONFIG_NETSTAT=y
722# CONFIG_FEATURE_NETSTAT_WIDE is not set 738# CONFIG_FEATURE_NETSTAT_WIDE is not set
723# CONFIG_FEATURE_NETSTAT_PRG is not set 739# CONFIG_FEATURE_NETSTAT_PRG is not set
724CONFIG_NSLOOKUP=y 740CONFIG_NSLOOKUP=y
741# CONFIG_NTPD is not set
742# CONFIG_FEATURE_NTPD_SERVER is not set
725CONFIG_PING=y 743CONFIG_PING=y
726CONFIG_PING6=y 744CONFIG_PING6=y
727CONFIG_FEATURE_FANCY_PING=y 745CONFIG_FEATURE_FANCY_PING=y
@@ -733,22 +751,25 @@ CONFIG_TELNET=y
733CONFIG_FEATURE_TELNET_AUTOLOGIN=y 751CONFIG_FEATURE_TELNET_AUTOLOGIN=y
734# CONFIG_TELNETD is not set 752# CONFIG_TELNETD is not set
735# CONFIG_FEATURE_TELNETD_STANDALONE is not set 753# CONFIG_FEATURE_TELNETD_STANDALONE is not set
754# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
736CONFIG_TFTP=y 755CONFIG_TFTP=y
737# CONFIG_TFTPD is not set 756# CONFIG_TFTPD is not set
738CONFIG_FEATURE_TFTP_GET=y 757CONFIG_FEATURE_TFTP_GET=y
739CONFIG_FEATURE_TFTP_PUT=y 758CONFIG_FEATURE_TFTP_PUT=y
740# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set 759# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
760# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
741# CONFIG_TFTP_DEBUG is not set 761# CONFIG_TFTP_DEBUG is not set
742CONFIG_TRACEROUTE=y 762CONFIG_TRACEROUTE=y
763# CONFIG_TRACEROUTE6 is not set
743# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set 764# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
744# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set 765# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
745# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set 766# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
746CONFIG_APP_UDHCPD=y 767CONFIG_UDHCPD=y
747# CONFIG_APP_DHCPRELAY is not set 768# CONFIG_DHCPRELAY is not set
748CONFIG_APP_DUMPLEASES=y 769CONFIG_DUMPLEASES=y
749# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set 770# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
750CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases" 771CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases"
751CONFIG_APP_UDHCPC=y 772CONFIG_UDHCPC=y
752CONFIG_FEATURE_UDHCPC_ARPING=y 773CONFIG_FEATURE_UDHCPC_ARPING=y
753# CONFIG_FEATURE_UDHCP_PORT is not set 774# CONFIG_FEATURE_UDHCP_PORT is not set
754CONFIG_UDHCP_DEBUG=0 775CONFIG_UDHCP_DEBUG=0
@@ -813,6 +834,7 @@ CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
813# CONFIG_FEATURE_TOP_DECIMALS is not set 834# CONFIG_FEATURE_TOP_DECIMALS is not set
814# CONFIG_FEATURE_TOP_SMP_PROCESS is not set 835# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
815# CONFIG_FEATURE_TOPMEM is not set 836# CONFIG_FEATURE_TOPMEM is not set
837# CONFIG_FEATURE_SHOW_THREADS is not set
816CONFIG_UPTIME=y 838CONFIG_UPTIME=y
817CONFIG_WATCH=y 839CONFIG_WATCH=y
818 840
@@ -855,8 +877,6 @@ CONFIG_FEATURE_SH_IS_ASH=y
855CONFIG_ASH=y 877CONFIG_ASH=y
856CONFIG_ASH_BASH_COMPAT=y 878CONFIG_ASH_BASH_COMPAT=y
857CONFIG_ASH_JOB_CONTROL=y 879CONFIG_ASH_JOB_CONTROL=y
858CONFIG_ASH_READ_NCHARS=y
859CONFIG_ASH_READ_TIMEOUT=y
860CONFIG_ASH_ALIAS=y 880CONFIG_ASH_ALIAS=y
861CONFIG_ASH_GETOPTS=y 881CONFIG_ASH_GETOPTS=y
862CONFIG_ASH_BUILTIN_ECHO=y 882CONFIG_ASH_BUILTIN_ECHO=y
@@ -879,6 +899,7 @@ CONFIG_ASH_EXPAND_PRMT=y
879# CONFIG_HUSH_FUNCTIONS is not set 899# CONFIG_HUSH_FUNCTIONS is not set
880# CONFIG_HUSH_LOCAL is not set 900# CONFIG_HUSH_LOCAL is not set
881# CONFIG_HUSH_EXPORT_N is not set 901# CONFIG_HUSH_EXPORT_N is not set
902# CONFIG_HUSH_RANDOM_SUPPORT is not set
882# CONFIG_LASH is not set 903# CONFIG_LASH is not set
883# CONFIG_MSH is not set 904# CONFIG_MSH is not set
884CONFIG_SH_MATH_SUPPORT=y 905CONFIG_SH_MATH_SUPPORT=y
diff --git a/meta/packages/busybox/busybox-1.15.3/get_header_tar.patch b/meta/packages/busybox/busybox-1.16.2/get_header_tar.patch
index 0121cd1b61..bc9b427ea9 100644
--- a/meta/packages/busybox/busybox-1.15.3/get_header_tar.patch
+++ b/meta/packages/busybox/busybox-1.16.2/get_header_tar.patch
@@ -1,3 +1,12 @@
1# copy commit message from OE as the patch comment:
2# commit 5a0e1d473ca7aca5ffefffe9a2ec44ae7a1f35bc
3# Author: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
4# Date: Wed Feb 11 22:40:21 2009 +0100
5#
6# busybox: fix tar problem with filenames that are exactly 100 bytes
7#
8# above comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06
9
1--- busybox-1.13.2/archival/libunarchive/get_header_tar.c.orig 2008-11-09 18:28:02.000000000 +0100 10--- busybox-1.13.2/archival/libunarchive/get_header_tar.c.orig 2008-11-09 18:28:02.000000000 +0100
2+++ busybox-1.13.2/archival/libunarchive/get_header_tar.c 2009-02-11 22:34:52.000000000 +0100 11+++ busybox-1.13.2/archival/libunarchive/get_header_tar.c 2009-02-11 22:34:52.000000000 +0100
3@@ -252,6 +252,8 @@ 12@@ -252,6 +252,8 @@
diff --git a/meta/packages/busybox/busybox-1.15.3/run-parts.in.usr-bin.patch b/meta/packages/busybox/busybox-1.16.2/run-parts.in.usr-bin.patch
index 6f209ce571..bedb974432 100644
--- a/meta/packages/busybox/busybox-1.15.3/run-parts.in.usr-bin.patch
+++ b/meta/packages/busybox/busybox-1.16.2/run-parts.in.usr-bin.patch
@@ -1,3 +1,18 @@
1# copy commit message from OE as the patch comment:
2# commit f1b326c83be0d95571b991d8d2ee239982380b6b
3# Author: Martin Jansa <Martin.Jansa@gmail.com>
4# Date: Fri Apr 30 15:37:38 2010 +0200
5#
6# busybox: add patch for installing run-parts to /usr/bin/ instead of /bin
7#
8# * otherwise debianutils install will fail with
9# update-alternatives: Error: cannot register alternative run-parts to /usr/bin/run-parts since it is
10#
11# Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12#
13# Poky doesn't have debianutils, but let's keep it for safety
14# above comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06
15
1diff -uNr busybox-1.15.3.orig//include/applets.h busybox-1.15.3/include/applets.h 16diff -uNr busybox-1.15.3.orig//include/applets.h busybox-1.15.3/include/applets.h
2--- busybox-1.15.3.orig//include/applets.h 2009-12-12 22:13:28.000000000 +0100 17--- busybox-1.15.3.orig//include/applets.h 2009-12-12 22:13:28.000000000 +0100
3+++ busybox-1.15.3/include/applets.h 2010-04-30 15:35:40.000000000 +0200 18+++ busybox-1.15.3/include/applets.h 2010-04-30 15:35:40.000000000 +0200
diff --git a/meta/packages/busybox/busybox-1.15.3/udhcpc-fix-nfsroot.patch b/meta/packages/busybox/busybox-1.16.2/udhcpc-fix-nfsroot.patch
index edea898b10..89eeb425ad 100644
--- a/meta/packages/busybox/busybox-1.15.3/udhcpc-fix-nfsroot.patch
+++ b/meta/packages/busybox/busybox-1.16.2/udhcpc-fix-nfsroot.patch
@@ -1,3 +1,11 @@
1# copy commit message from OE as the patch comment:
2# commit ec4da6df3ad5b8b03446d0dda9c50a2439ae325a
3# Author: Denys Dmytriyenko <denis@denix.org>
4# Date: Wed Feb 4 11:43:18 2009 -0500
5#
6# busybox: fix nfsroot issues with resetting IP and deleting routes
7#
8# above comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06
1Index: busybox-1.15.3/examples/udhcp/simple.script 9Index: busybox-1.15.3/examples/udhcp/simple.script
2=================================================================== 10===================================================================
3--- busybox-1.15.3.orig/examples/udhcp/simple.script 2010-06-27 12:17:14.116876946 +0200 11--- busybox-1.15.3.orig/examples/udhcp/simple.script 2010-06-27 12:17:14.116876946 +0200
diff --git a/meta/packages/busybox/busybox-1.15.3/udhcpscript.patch b/meta/packages/busybox/busybox-1.16.2/udhcpscript.patch
index 2ffba956ae..81bca634af 100644
--- a/meta/packages/busybox/busybox-1.15.3/udhcpscript.patch
+++ b/meta/packages/busybox/busybox-1.16.2/udhcpscript.patch
@@ -1,3 +1,12 @@
1# copy commit message from OE as the patch comment
2# commit c9bb6478a873d6de4c8a0e712435ac9a658a345d
3# Author: Holger Schurig <schurig@mn-solutions.de>
4# Date: Wed Sep 29 08:29:58 2004 +0000
5#
6# udhcpscript: fixes the "deleting routers" error message in case of no existing default routes
7#
8# Above comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06
9
1Index: busybox-1.15.1/examples/udhcp/simple.script 10Index: busybox-1.15.1/examples/udhcp/simple.script
2=================================================================== 11===================================================================
3--- busybox-1.15.1.orig/examples/udhcp/simple.script 2009-09-12 17:55:36.000000000 +0200 12--- busybox-1.15.1.orig/examples/udhcp/simple.script 2009-09-12 17:55:36.000000000 +0200
diff --git a/meta/packages/busybox/busybox.inc b/meta/packages/busybox/busybox.inc
index 9f450532da..8c258135c8 100644
--- a/meta/packages/busybox/busybox.inc
+++ b/meta/packages/busybox/busybox.inc
@@ -7,7 +7,6 @@ SECTION = "base"
7PRIORITY = "required" 7PRIORITY = "required"
8 8
9export EXTRA_CFLAGS = "${CFLAGS}" 9export EXTRA_CFLAGS = "${CFLAGS}"
10EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}"
11PACKAGES =+ "${PN}-httpd ${PN}-udhcpd" 10PACKAGES =+ "${PN}-httpd ${PN}-udhcpd"
12 11
13FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www" 12FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www"
@@ -70,7 +69,7 @@ do_install () {
70 install -m 0755 ${WORKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/ 69 install -m 0755 ${WORKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/
71 install -d ${D}/srv/www 70 install -d ${D}/srv/www
72 fi 71 fi
73 if grep "CONFIG_APP_UDHCPD=y" ${WORKDIR}/defconfig; then 72 if grep "CONFIG_UDHCPD=y" ${WORKDIR}/defconfig; then
74 # Move udhcpd back to /usr/sbin/udhcpd 73 # Move udhcpd back to /usr/sbin/udhcpd
75 install -d ${D}${sbindir} 74 install -d ${D}${sbindir}
76 mv ${D}/busybox${sbindir}/udhcpd ${D}${sbindir}/ 75 mv ${D}/busybox${sbindir}/udhcpd ${D}${sbindir}/
@@ -84,7 +83,7 @@ do_install () {
84 83
85 install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/ 84 install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/
86 fi 85 fi
87 if grep "CONFIG_APP_UDHCPC=y" ${WORKDIR}/defconfig; then 86 if grep "CONFIG_UDHCPC=y" ${WORKDIR}/defconfig; then
88 # Move dhcpc back to /usr/sbin/udhcpc 87 # Move dhcpc back to /usr/sbin/udhcpc
89 install -d ${D}${base_sbindir} 88 install -d ${D}${base_sbindir}
90 mv ${D}/busybox${base_sbindir}/udhcpc ${D}${base_sbindir}/ 89 mv ${D}/busybox${base_sbindir}/udhcpc ${D}${base_sbindir}/
diff --git a/meta/packages/busybox/busybox_1.15.3.bb b/meta/packages/busybox/busybox_1.15.3.bb
deleted file mode 100644
index 9be4abdb17..0000000000
--- a/meta/packages/busybox/busybox_1.15.3.bb
+++ /dev/null
@@ -1,28 +0,0 @@
1require busybox.inc
2PR = "r5"
3
4SRC_URI = "\
5 http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
6 file://udhcpscript.patch \
7 file://udhcpc-fix-nfsroot.patch \
8 file://B921600.patch \
9 file://get_header_tar.patch \
10 file://busybox-appletlib-dependency.patch \
11 file://0000-wget-no-check-certificate.patch \
12 file://run-parts.in.usr-bin.patch \
13 file://ash_fix_redirection_of_fd_0.patch \
14 file://find-touchscreen.sh \
15 file://busybox-cron \
16 file://busybox-httpd \
17 file://busybox-udhcpd \
18 file://default.script \
19 file://simple.script \
20 file://hwclock.sh \
21 file://mount.busybox \
22 file://syslog \
23 file://syslog.conf \
24 file://umount.busybox \
25 file://defconfig \
26"
27
28EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}"
diff --git a/meta/packages/busybox/busybox_1.16.2.bb b/meta/packages/busybox/busybox_1.16.2.bb
new file mode 100644
index 0000000000..0952f4ddb0
--- /dev/null
+++ b/meta/packages/busybox/busybox_1.16.2.bb
@@ -0,0 +1,24 @@
1require busybox.inc
2PR = "r0"
3
4SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
5 file://udhcpscript.patch \
6 file://udhcpc-fix-nfsroot.patch \
7 file://B921600.patch \
8 file://get_header_tar.patch \
9 file://busybox-appletlib-dependency.patch \
10 file://run-parts.in.usr-bin.patch \
11 file://find-touchscreen.sh \
12 file://busybox-cron \
13 file://busybox-httpd \
14 file://busybox-udhcpd \
15 file://default.script \
16 file://simple.script \
17 file://hwclock.sh \
18 file://mount.busybox \
19 file://syslog \
20 file://syslog.conf \
21 file://umount.busybox \
22 file://defconfig"
23
24EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}"
diff --git a/meta/packages/busybox/files/busybox-appletlib-dependency.patch b/meta/packages/busybox/files/busybox-appletlib-dependency.patch
deleted file mode 100644
index 3efd4c0882..0000000000
--- a/meta/packages/busybox/files/busybox-appletlib-dependency.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Index: busybox-1.13.2/Makefile
2===================================================================
3--- busybox-1.13.2.orig/Makefile 2009-03-19 15:44:37.419270265 +0300
4+++ busybox-1.13.2/Makefile 2009-03-19 15:45:57.737521296 +0300
5@@ -471,6 +471,10 @@
6 util-linux/ \
7 util-linux/volume_id/ \
8
9+# Lib interdeps
10+# libbb uses headers generated in applets
11+libbb: applets
12+
13 endif # KBUILD_EXTMOD
14
15 ifeq ($(dot-config),1)
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-11 20:03:32 +0000