Commit Graph

15 Commits

Author SHA1 Message Date
Roy.Li ba218e743b busybox: fix du-k-works test case
[YOCTO #2896]

The du-k-works test seems to assume that du -k on a directory with two files
totaling 80 kilobytes should report either 80k or 88k. In ext4 filesystm however,
both busybox' du -k and coreutils' du -k reports a size of 84k which causes the
test to fail.

Intergrate the patch from:
http://git.busybox.net/busybox/commit/?id=a5ee090e8651692545514a81a16c6cde3a2dc577

(From OE-Core rev: a022fb6b69388f28f3130e71125b64e4c154d504)

Signed-off-by: Roy.Li <rongqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-06 15:18:45 +01:00
Jesse Zhang a4b1e34848 busybox: udhcpc shouldn't be a service
udhcpc is invoked from the networking service, so it shouldn't exist
standalone. If /etc/init.d/busybox-udhcpc is present, it will cause
udhcpc to be started two times.

And since the script doesn't support the stop action, it will cause
udhcpc to be started even when system is being shutdown.

Remove /etc/init.d/busybox-udhcpc to resolve the issues.

[YOCTO #2840]

(From OE-Core rev: 8329c4679ec0ce319d2a81d755a0da5b05474688)

Signed-off-by: Jesse Zhang <sen.zhang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-02 15:35:57 +01:00
Roy.Li 2ccbf35ed1 busybox:udhcpc: fix the root_is_nfs() function
[YOCTO #2788]

The system will be hung when udhcpc starts, if nfs is mounted
at "/" directory and default route is different after starting
udhcpc.

The cause is that root_is_nfs() does not work after kernel-2.6.37,
since the device name has been changed from /dev/root to
${IPADDR}:${NFSDIR} on /proc/mounts. which leads to remove
the default routes to nfs server,

Now we use a loose match to check if rootfs is nfs.

(From OE-Core rev: 9921cb0104ea36daf909c110bb6767e5fd307da0)

Signed-off-by: Roy.Li <rongqing.li@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-26 14:40:49 +01:00
Yao Zhao 30c618a3f5 busybox: fix the problem that mkfs.minix.tests fails on big endian platform
patch mkfs.minix.tests to have correct md5sum on big endian platform.

(From OE-Core rev: b37e1ea5f29d03efbe136ee7f4fa261a1936ac8f)

Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-26 14:40:48 +01:00
Amy Fong 23df8e0a06 busybox: busybox wget -P option ignored
busybox wget testing fails

In cases where busybox wget is invoked with -P <...> and the url ends
in "/", the download directory is ignored (ie the file index.html is
implied), this change enables the -P option for those urls.

(From OE-Core rev: 95fd02de0aee0a1907b51f9ccda260d483e6e292)

Signed-off-by: Amy Fong <amy.fong@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-19 17:18:11 +01:00
Khem Raj d627534e0f busybox: Include sys/resource.h for rusage definition
Seen with eglibc 2.16

(From OE-Core rev: 077bd603040ebd16f01b4fa20999fb71a9a43695)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-17 10:53:58 +01:00
Saul Wold 6c7fccbd09 busybox: add correct ALTERNATIVE_TARGET for init.d/syslog
[YOCTO #2535]

(From OE-Core rev: 36ea756883d35f654b102f0cd6bdb2ec284753d0)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-06-28 16:26:44 +01:00
Mark Hatle c16eddd1d9 busybox: Fix syslog configuration file
When update alternatives was modified, the syslog configuration file
alternative was incorrectly defined to be "busybox".  Fix this by
enabling the proper target file.

[YOCTO #2557]

(From OE-Core rev: 935f2c02809814de2b903a704707d7bc85bbefdf)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-06-18 13:22:18 +01:00
Mark Hatle 92482cb496 busybox: use new update-alternatives
(From OE-Core rev: fbbc96aed5086f853a1179f1478ccd252af24094)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-30 12:04:41 +01:00
Andreas Oberritter f60cdd4d56 busybox: port improvements to simple.script from Debian (udhcpc)
* Support resolvconf
* Avoid bashism $((metric++))
* Use 'domain' instead of 'search' for domain parameter

(From OE-Core rev: 3d4ccf98b83fe662f375cd5b029fdd602824c0e8)

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-04 16:44:59 +01:00
Andreas Oberritter 84eb62d8b2 busybox: remove unused patches for simple.script (udhcpc)
* OE-Core provides its own copy of simple.script.

(From OE-Core rev: 3a36efc17c8504b00a7a277a67a7b10caa4d1cdc)

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-04 16:44:59 +01:00
Khem Raj 60e2345f1b busybox: Pass HOST_CC_ARCH through CONFIG_EXTRA_CFLAGS
The -mabi option is part of HOST_CC_ARCH which does not
appear in CFLAGS. This is for completeness since compiler
already defaults to n64 it wont matter that much

(From OE-Core rev: 2aa0540515efc15957101e24224b425ee00446d9)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-01 12:38:08 +01:00
Andreas Oberritter acdcb3c7e0 busybox: fix options -b, -a and -P
* busybox-udhcpc-no_deconfig.patch broke the options,
  preventing udhcpc from forking into the background
  if no lease can be obtained.

(From OE-Core rev: 24ad7ca9bd99cd6cd11f7d2d49a79fe3521cbcec)

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-11 12:08:14 +01:00
Andreas Oberritter 1b5c52f2e8 busybox: move watch to /usr/bin for compatibility with procps
Commit 68dc2a3fa30c03a196d650de34d0c657a7b85454 broke opkg upgrade:

| update-alternatives: Error: cannot register alternative watch to
| /usr/bin/watch since it is already registered to /bin/watch

(From OE-Core rev: fa8b2d2bed63fa4fc2af45f094998b0f9e69d272)

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-26 12:13:04 +01:00
Shane Wang b52bd42b63 busybox: upgrade to 1.19.4
Removing the patch busybox-1.19.3-getty.patch is because it is already in the upstream.

(From OE-Core rev: f03f8eac4c72be0f16468ebd0ee4dd1f07b0563b)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-21 13:03:44 +00:00