Also move the mount via label (and mount via UUID) support into its
own config fragment and disable volume ID support for less common
filesystem formats exFAT and NILFS.
Following this commit, mount via label is supported for btrfs, ext, f2fs,
fat and squashfs.
(From OE-Core rev: b5e91f26b2779178765b62df36421d97caa4cdd7)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The fatattr applet (to display or change file attributes on a fat file
system) doesn't seem to be core functionality, so disable by default.
(From OE-Core rev: ab6b5bc7cfa1e6160919f7aea2671ad79af64507)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The sha1sum, sha256sum and sha512sum applets have not historically
been enabled by default, so don't enable sha3sum either.
(From OE-Core rev: fd095486e24ef2d40bc9b61af66fffb0d6578156)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The current oe-core busybox defconfig dates back to busybox v1.20.2,
so configure options introduced in busybox v1.21.x, v1.22.x and
v1.23.x take on default values when the oe-core defconfig is run
through 'make oldconfig'.
(From OE-Core rev: f3a95b6e00482de10f4698a3ab8cead336d11e9e)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
No functional changes, simply re-order lines in defconfig so that
the existing options don't move elsewhere in the file when run
though busybox 1.23.2 'make oldconfig'.
(From OE-Core rev: ee80d8bfe0a6f4ad8c5de38eac20319760c0fe8f)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
CONFIG_FEATURE_VI_OPTIMIZE_CURSOR is obsolete and removed
from busybox v1.21.0 onwards:
http://git.busybox.net/busybox/commit/?id=04b52892ed5d9d8a4cf5d887c221a8b50c71274e
(From OE-Core rev: 83231083c0c6e1ffdcf6239b85e0058232a92be0)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Enabled MOUNT_LABEL and VOLUMEID* features for busybox
mount to understand 'UUID=' syntax in fstab.
(From OE-Core rev: f1a4b8e0b3fb065e3b63185f1b98481d4078a851)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Only when DESKTOP is enabled, chown has -L, -H and -P options.
Backport a commit from upstream to fix it:
http://git.busybox.net/busybox/commit/?id=d291c2fdd5cb8616605c67ecbfb04274fa094242.
(From OE-Core rev: 6ec65eedb63a82159dde8f2b2825ba7d5e6ae81d)
Signed-off-by: Junling Zheng <zhengjunling@huawei.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This patch backports a commit from upstream to fix a potential double
free error when executing ifconfig circularly:
http://git.busybox.net/busybox/commit/?id=a97777889328157bb7d06ec618bad16712a9c345.
Thanks to Chen Gang for reporting and analyzing this bug.
(From OE-Core rev: 66ec540dad77052bc2c1da3a87f875547600efad)
Signed-off-by: Junling Zheng <zhengjunling@huawei.com>
Signed-off-by: Chen Gang <cg.chen@huawei.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Synchronize the patches for busybox_git with busybox_1.23.2.
(From OE-Core rev: 5252ab5910aa8fecaf988f43f882e2c4db30056d)
Signed-off-by: Junling Zheng <zhengjunling@huawei.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When using iproute2 to remove the route all default rules
will be removed. Scope the removal by interface like it is
done with ifconfig.
(From OE-Core rev: 2127a57cb1b3d83f9f7640051403e47e485b132c)
Signed-off-by: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Linux allows to install multiple default routes with
different metrics. Start with a metric above 0 to
allow other parts of the system to install routes
with a lower metric.
(From OE-Core rev: 566441f58d398d93f948067cf399d00cf3b37eba)
Signed-off-by: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The 'dot.profile' supplied by base-files calls 'mesg'. For simple
images using busybox e.g. core-image-minimal, this utility should be
available to avoid errors on login:
-sh: mesg: command not found
Provide mesg with busybox.
(From OE-Core rev: 7ec6f8290910c242d6e58110c30b3ffbdff274e4)
Signed-off-by: Ash Charles <ashcharles@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Upon inserting a USB stick or similar device, mdev will run
an automounter script that mounts valid partitions on
/media/<device>. The script first checks /etc/fstab entries
so that mounting on UUID or LABEL or using custom mount options
is still possible. If /etc/fstab does not contain particular
mount options, the script will create (and remove) the mountpoint
automatically.
The script also supports full disk partitions (devices without
partition table).
The following environments can be set in /etc/default/mdev:
MDEV_AUTOMOUNT=n (Disables automounting completely)
MDEV_AUTOMOUNT_ROOT=/media (Change the mount root location)
Automatic mounting for a particular device can be disabled by
creating a file "/dev/<device>.nomount". This is helpful in
scripts that create partitions for example, and want to perform
specific actions which require the device to remain unmounted.
A more complex variation (using LABEL based mounts) on this script
has been in use in OpenPLi for many years now, and I've used this
one on many projects already, so it's about time to push this to
mainline.
(From OE-Core rev: 19073fb991b3e2d2304e55f94e30674adf375197)
Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add a line to mdev.conf that tells mdev to load kernel modules when
required.
For example, if you built wifi support as an external module, inserting
a wifi stick into a USB port will now automatically load that module
into the kernel and the wlan device will be ready for configuration.
Without this patch, you have to load required modules manually or force
them to load at system startup.
(From OE-Core rev: 11420b0566a6a085c6cb78f3f1495ed9c599e6fd)
Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Simplify the grep expression, use the more common "grep" command instead
of "egrep", avoid forking extra processes, join multiple invokations into
a single combined expression.
Change the touchscreen regex so that it also recognizes various USB
touchscreen controllers and the ad7879 i2c device.
Based on code used in OpenPLi and meta-topic.
(From OE-Core rev: e82353eb9f76b582122fda27c93339eac5553eb2)
Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
mdev.conf references the find-touchscreen.sh script, but this file
was not being installed. Add the script to the busybox-mdev package.
(From OE-Core rev: 44f6df0dfac54845ef5c3ab1af5663d1b6c1d64b)
Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Since the gcc has resolved this, so we revert the workaround patch.
This reverts commit f026b7a211.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Previously there was a change to the ncurses compile to make it more
like the typical way it was compiled on a host system. This fixed a
whole class of host machines, but masked the real underlying problem
with the display corruption issues and menuconfig.
The corner case that led to the discovery that the wrong curses.h file
was getting used was when there was no curses libraries at all on one
of the development hosts. What had happened before was that
/usr/include/curses.h on the host system had to match closely enough
to the curses.h in the sysroot and then linking against the sysroot
version of curses.so was ok (meaning no display corruption). But on
some systems with ncurses.h vs curses.h such as SuSE hosts, there were
still issues.
If we fix the root of the problem and force the mconf and lxdialog to
use the correct headers and libraries from the sysroot there is no
further issues and the menuconfig target works properly. It also
means we can back out the custom compilation flags to the ncurses
recipe because they are no longer needed.
For the kernel part of the menuconfig / nconfig changes it will be
merged separately and this is all based on:
https://lkml.org/lkml/2013/3/3/103
(From OE-Core rev: 889e02659dd396feba24f0b0ee6b4043c3f3735a)
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When using udhcpc along with ip command(/sbin/ip), broadcast address is not
assigned. Broadcast address is successfully assigned when using udhcpc without
ip command existence.
with ip command:
$ifconfig eth0|grep Bcast
inet addr:128.224.162.141 Bcast:0.0.0.0 Mask:255.255.254.0
$
without ip command:
$ifconfig eth0|grep Bcast
inet addr:128.224.162.141 Bcast:128.224.163.255 Mask:255.255.254.0
$
/etc/udhcp.d/50default[simple.script] is called to set ip address by dhcp
client, In case of ifconfig, it doesn't care of it's existence because it
will automatically calculate broadcast address then assign it if there is
no broadcast option. However in case of ip command, it requires broadcast
address statically.
(From OE-Core rev: 666c6a126cd12d2555361f5b573b6a26437df780)
Signed-off-by: Hu <yadi.hu@windriver.com>
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This fix allows the correct appending of -L to syslogd arguments when both file and remote logging are selected.
(From OE-Core rev: ca68019760de6c5d5401be8eae7e65e7e6ca9021)
Signed-off-by: Michael Gloff <mgloff@emacinc.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Build busybox on mips with -g -O, there is a ice failure:
...
shell/ash.c:8758:1: internal compiler error: in dwarf2out_var_location, at dwarf2out.c:21264
...
Please submit a full bug report,
with preprocessed source if appropriate.
See <http://gcc.gnu.org/bugs.html> for instructions.
{standard input}: Assembler messages:
{standard input}: Warning: missing .end at end of assembly
{standard input}: Error: open CFI at the end of file; missing .cfi_endproc directive
...
The following line caused the ice failure on mips:
...
void evaltreenr(union node *, int) __attribute__ ((alias("evaltree"),__noreturn__));
...
So remove evaltreenr which was a alias of evaltree, and use evaltree
to instead.
[YOCTO #6625]
(From OE-Core rev: e9e2884a29e95703c5b1a2fffe5e6febfa77b5cd)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y is needed for the commit
"udev-cache: strip timestamps on extract". Enabling this flag increases
the size of busybox by 0 bytes on x86.
(From OE-Core rev: 11a772b3297ef36f3ebc4b67c9477022352d1c55)
Signed-off-by: Richard Tollerton <rich.tollerton@ni.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This change makes busybox aware of both connman and the standard dhcp
client, while there is a caveat about using busybox's ifup/ifdown, this
change will make the 3 possibly dhcp clients behave better when busybox
is used.
Enable the CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP feature to busybox will
search for various external clients and then add connman as an external
client.
[YOCTO #6521]
(From OE-Core rev: 06bdccb5c4df44745863a2290cbb83fd190f66df)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
During boot, there is a brief window during which /dev/initctl is
missing, which breaks initscripts that would need to access it. This
occurs because /etc/init.d/mountall.sh (rcS.d/S02...) attempts to ensure
/dev/initctl is present, but /etc/init.d/mdev (rcS.d/S06...) mounts over
/dev and clobbers the work done by mountall, and then does not wait
synchronously until initctl is ready before continuing.
To close this window, in /etc/init.d/mdev, we check whether /dev/initctl
is present, and if not, we remove it and recreate it. This is the same
thing that is done by /etc/init.d/mountall.sh, and we have verified that
any writers of /dev/initctl will wait synchronously until sysvinit
notices the change in fd and does the read, so no race exists.
(From OE-Core rev: 53543363a8ab4424c17ed7aec0e8aefc4df86b3d)
Signed-off-by: Richard Tollerton <rich.tollerton@ni.com>
Signed-off-by: Ben Shelton <ben.shelton@ni.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
/dev/mdev.seq exists to synchronize concurrently running instances of
mdev and to ensure that they execute in the proper order. Without this
synchronization, it is possible to have inconsistent mount points, to
leak device nodes, or to have a node erroneously removed in rapid
hotplug scenarios.
Enable the use of mdev.seq by creating an empty /dev/mdev.seq at boot.
(From OE-Core rev: 3b256653ae9ab2cf56b21cb82a8bd2a562397b27)
Signed-off-by: Richard Tollerton <rich.tollerton@ni.com>
Signed-off-by: Ben Shelton <ben.shelton@ni.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Otherwise, users cannot use named semaphores or shared memory.
(From OE-Core rev: a8f35be467836d8fa0bc8f8e85eba6f89a13f087)
Signed-off-by: Richard Tollerton <rich.tollerton@ni.com>
Signed-off-by: Ben Shelton <ben.shelton@ni.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
It was required by tzselect which is provided by eglibc utils.
The eglibc is a fundamental package, so enable math functions
of awk is reasonable.
Here is the error if we not enable that:
...
root@qemuarm:~# tzselect -c +4852+00220
awk: cmd. line:39: Math support is not compiled in
...
[YOCTO #6544]
(From OE-Core rev: 52a3df6a57c22df9da5ce05134395cf0756c63c6)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If CONFIG_SYSLOGD is not enabled, then the related service file should
not be installed as it will always fail at system start-up. The error
message is as following.
[FAILED] Failed to start System Logging Service.
The same logic applies to CONFIG_KLOGD.
So we should first check the configuration before we install these
service files.
[YOCTO #5302]
(From OE-Core rev: b44e291a87539fbb8e6da1a16c56f425a417e7bd)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If the interface is slow to come up udhcpc will continue in the background
[YOCTO #6339]
(From OE-Core rev: 45af0ba08dbc676be41fd29e9877fe820b531f7c)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The base_contains is kept as a compatibility method and we ought to
not use it in OE-Core so we can remove it from base metadata in
future.
(From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Resolves warnings of this kind in the OpenPLi layer:
WARNING: Use of PRINC * was detected in the recipe *
(From OE-Core rev: 5ffb38d6ace7faae839c8cac7327b5b1c2daae1a)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When both bash and busybox be installed, without ash support
in busybox,if bash is installed before busybox in the final stage,
even if ALTERNATIVE_PRIORITY of bash > ALTERNATIVE_PRIORITY of busybox,
the symlink from /bin/sh to bash can be yet overwritten by busybox.
(From OE-Core rev: 6ef650359cc2a49376eb5ca92bc97b34cdd82862)
Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Ensure that linking to the built-in.a file uses the 'nostlib'
option. Submitted to busybox mailing list here:
http://lists.busybox.net/pipermail/busybox/2014-March/080730.html
This has been accepted into upstream busybox so it will not be needed
for future versions.
(From OE-Core rev: fdfff57304e6641ef5a8db0fb456bfd46bf1e2dd)
Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Use the CCLD variable to ensure proper tuning parameters.
Notably when building on a x86-64 host with an i686 toolchain
there is an error building built-in.o because it is trying to
link 32-bit and 64-bit object files:
i686-pc-linux-gnu-ld --sysroot=/work/dmoseley/Mentor/amd-2014.05/build.genericx86-64-external/tmp/sysroots/genericx86-64 -r -o applets/built-in.o applets/ap
i686-pc-linux-gnu-ld: Relocatable linking with relocations from format elf64-x86-64 (applets/applets.o) to format elf32-i386 (applets/built-in.o) is not support
make[1]: *** [applets/built-in.o] Error 1
(From OE-Core rev: 088d2f0185da6648305b4719ee9cb0d2f2b37c6f)
Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The MINIX and MINIX 2 filesystems are not really used anymore.
(From OE-Core rev: 4a47c943a76e79af82d47d8fa83c6687e0d915a0)
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Completes previous commit b5292d4115a4555a66b5e35acdc67dd71fb8577f.
Updates SUMMARY[doc] (meta/conf/documentation.conf).
Changes:
- rename DESCRIPTION with length < 80 to (non present tag) SUMMARY
- drop final point character at the end of SUMMARY string
- remove trailing whitespace of SUMMARY line
Note: don't bump PR
(From OE-Core rev: ad17dfd31a2b97b3e610a0ea0889f5ecb2a63b97)
Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add more comments to the systemd configuration file for busybox's
syslogd utility. The purpose is to easy the life of system administrators.
These comments are mostly derived from the comments in syslogd.c in
busybox.
[YOCTO #5722]
(From OE-Core rev: eba4f2bd2a0becc086f107dbd0d3ec5222c5eed2)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Upgrade busybox to the stable release 1.22.1.
During this upgrade, 9 patches are removed. Reasons are detailed below.
The following 6 patches are removed as they have been merged.
meta/recipes-core/busybox/busybox/busybox-lineedit-initialize-delptr.patch
meta/recipes-core/busybox/busybox/busybox-list-suid-and-non-suid-app-configs.patch
meta/recipes-core/busybox/busybox/busybox-sed-fix-sed-clusternewline-testcase.patch
meta/recipes-core/busybox/busybox/busybox-sulogin-empty-root-password.patch
meta/recipes-core/busybox/busybox/find-get-rid-of-nested-functions.patch
meta/recipes-core/busybox/busybox/testsuite-du-du-k-works-fix-false-positive.patch
The following three patches are removed because they are mainly about moving
binaries from /bin to /usr/bin to make the update-alternative work correctly
at rootfs time. We can easily solve this problem by changing recipes. There's
no compelling reason why such patches are needed.
meta/recipes-core/busybox/busybox/run-parts.in.usr-bin.patch
meta/recipes-core/busybox/busybox/stat-usr-bin.patch
meta/recipes-core/busybox/busybox/watch.in.usr-bin.patch
(From OE-Core rev: fa282186d82e8fe3c590d4ea79e464116e5ceea2)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
In vi mode, the 'p' and 'P' commands caused a segfault when nothing had
been put in the buffer yet because the delptr was not initialized.
(From OE-Core rev: 21ba0297409bfc6e0fb89f45c9bfed8981c7df5b)
Signed-off-by: Ming Liu <ming.liu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We have enabled SEAMLESS_GZ and SEAMLESS_BZ2 in defconfig, it's
reasonable for us to enable SEAMLESS_XZ as well. Otherwise, we
couldn't extract tar.xz file while we could extract tar.gz file.
Such situation would be somewhat confusing.
(From OE-Core rev: 6482a43211a3a4858030ae3c59f5726c0ccba261)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This allows us to compile busybox using clang. Nested functions is
a gcc extension not supported by clang.
(From OE-Core rev: d2bf599f36ed1a04c661fc0a71e664e219532cbc)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Using the contains function results in more optimal sstate checksums
resulting in better cache reuse as we as more consistent code.
(From OE-Core rev: 9c93526756e7cbbff027c88eb972f877bcb1f057)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Andre McCurdy
Ed Bartosh
Junling Zheng
Chen Qi
Holger Hans Peter Freyther
Fathi Boudra
Ash Charles
Armin Kuster
mike.looijmans@topic.nl
Hongxu Jia
Jason Wessel
yadi.hu@windriver.com
Michael Gloff
Richard Purdie
Richard Tollerton
Saul Wold
Ben Shelton
Bill Pittman
Gratian Crisan
Otavio Salvador
Mike Looijmans
Wenlin Kang
Drew Moseley
Jonathan Liu
Matthieu Crapet
Ming Liu
Muhammad Tauqir Ahmad