summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/busybox/busybox.inc
Commit message (Collapse)AuthorAgeFilesLines
* busybox-mdev: Support automatic mounting of block devicesmike.looijmans@topic.nl2014-12-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* busybox-mdev: Install missing find-touchscreen.shmike.looijmans@topic.nl2014-12-191-1/+3
| | | | | | | | | | | | 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>
* busybox: handle syslog related files properlyChen Qi2014-06-141-11/+14
| | | | | | | | | | | | | | | | | | | | | 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>
* busybox: put udhcpc in backgroundSaul Wold2014-06-061-0/+1
| | | | | | | | | | | 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>
* Globally replace 'base_contains' calls with 'bb.utils.contains'Otavio Salvador2014-04-251-13/+13
| | | | | | | | | | | 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>
* busybox: fix a sh link wrongWenlin Kang2014-04-091-2/+6
| | | | | | | | | | | | 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>
* busybox: Use CCLDDrew Moseley2014-04-051-0/+1
| | | | | | | | | | | | | | | | 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>
* recipes: convert remaining SUMMARY/DESCRIPTION cosmetic issues (part 2)Matthieu Crapet2014-02-201-1/+1
| | | | | | | | | | | | | | | | | | 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>
* classes/recipes: More optimal DISTRO_FEATURES referencesRichard Purdie2013-12-051-12/+11
| | | | | | | | | 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>
* busybox-syslog: add configuration file /etc/syslog.confChen Qi2013-09-061-1/+5
| | | | | | | | | | | | | | | | | | | | | | | By default, busybox has CONFIG_FEATURE_SYSLOGD_CFG enabled, but it doesn't ship a configuration file. This patch adds a configuration file (/etc/syslog.conf) to the busybox-syslog package. This configuration file mainly serves as a placeholder now. The advantages of this change are: 1. Make the users aware of the fact that the /etc/syslog.conf file will actually be parsed by busybox's syslogd utility. And configuring that file will change the logging behaviour. 2. In a systemd based system, this file will prevent the same configuration file provided by the sysklogd package from messing things up. [YOCTO #5066] (From OE-Core rev: b7f6688f0700a1575037362af7a8ca94dccce471) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: enable shared memory logging for systemdPaul Eggleton2013-08-261-1/+6
| | | | | | | | | | | | | | | | | The default command-line options for launching busybox's syslogd are "-C" if using sysvinit; but because we use /etc/default/busybox-syslog when using systemd which the sysvinit initscript doesn't use, and no /etc/default/busybox-syslog is installed by default in OE-Core, the default arguments with systemd were no arguments at all with OE-Core alone. Effectively merge in the bbappend from meta-oe that adds a default file in order to set the default options to "-C" for systemd as well. (From OE-Core rev: a23aa8e7467cf2b7f4e8ff85a3aa841ff6b508e5) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox.inc: Avoid error when SYSLOG is not enabledFlorin Sarbu2013-08-221-1/+1
| | | | | | | | | | | Add -f to rm of ${D}${sysconfdir}/syslog-startup.conf.${BPN} so as to not error out when the busybox config used does not have SYSLOG enabled and DISTRO_FEATURES does not contain sysvinit. (From OE-Core rev: 4c5756149754d0b18b14595db335f8f5e14cc0a3) Signed-off-by: Florin Sarbu <florin.sarbu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: remove syslog-startup.conf if sysvinit not in DISTRO_FEATURESChen Qi2013-08-121-5/+8
| | | | | | | | | | | | | | | | | | sysvinit and systemd have different ideas about configuration files (or environment files in systemd), so basically we can't use the same one in both cases. To avoid confusion, this patch removes syslog-startup.conf if 'sysvinit' is not in DISTRO_FEATURES. [YOCTO #4837] [YOCTO #4860] (From OE-Core rev: 89f62147a61108b4be40001e1fbe3be33bacf00b) 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>
* busybox: Add syslog-init alternative only if SysV in enabledMuhammad Shakeel2013-07-311-3/+8
| | | | | | | | | | | | | | | If systemd is enabled then syslog is handled through a service file and related files in /etc/init.d are removed. This removes following warning: WARNING: busybox: NOT adding alternative provide /etc/init.d/syslog: /etc/init.d/syslog.busybox does not exist (From OE-Core rev: 29c3ecee32d9bfb03099a4f10456fd0270e107fb) Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: fix the on-target upgrade problemChen Qi2013-07-051-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | We now can have a 'one-binary' version of busybox, or 'two-binary' version of busybox, controlled by the 'BUSYBOX_SPLIT_SUID' variable. This makes on-target upgrade a problem, as we have to support the following four upgrading paths. For convenience, in the following context, A is used to denote a 'two-binary' version of busybox while B is used to denote a 'one-binary' version of busybox. A --(upgrade)--> B B --(upgrade)--> A A --(upgrade)--> A B --(upgrade)--> B This patch makes effort to support the above four situations. [YOCTO #4802] (From OE-Core rev: 4e571e97750f3ac6a62cd0d2d10c08be98230630) 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>
* busybox: Add ptestBjörn Stenberg2013-06-251-1/+1
| | | | | | | | | | | Install busybox test suite and run it as ptest. (From OE-Core rev: 0d29dc5b5f7742df60fdba90835ef77425963bde) Signed-off-by: Anders Roxell <anders.roxell@enea.com> Signed-off-by: Björn Stenberg <bjst@enea.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: add the ability to split the busybox binaryChen Qi2013-06-251-28/+68
| | | | | | | | | | | | | | | | | | | | | | | | This patch enables us to split the busybox into two binaries, one containing suid applications, and the other containing nosuid apps. Add a variable, BUSYBOX_SPLIT_SUID, to control whether to split the busybox binary into two parts. We default it to "1" to enable the splitting, but users could still override it to disable the splitting. After all, busybox has no internal support for this suid apps splitting, so there might be users out there who want just one busybox binary. The basic idea here is to build the busybox twice, each with the correct configuration items. We extract the non-app part of the original .config file, and merge this part with the suid-app part to form a .config which contains only suid apps. The same strategy applies to the non-suid apps. [YOCTO #4207] (From OE-Core rev: e5a1442819dfb74e86a6f69da008ba6908c8bbc7) 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>
* busybox: add support for CONFIG_FEATURE_INDIVIDUALChen Qi2013-06-251-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, if CONFIG_FEATURE_INDIVIDUAL was enabled for busybox, yocto-based systems could start correctly. This is because if busybox is built as individual apps, '/bin/busybox' may not be present, so setting the default ALTERNATIVE_TARGET to '/bin/busybox' is not appropriate and could lead to errors. This patch fixes this problem by checking the existence of '/bin/busybox' before setting the ALTERNATIVE_TARGET to '/bin/busybox'. After this change, if busybox is built as individual apps, we'll have links like '/bin/ls -> /bin/ls.busybox', otherwise, we'll have links like '/bin/ls -> /bin/busybox'. Note there's a grep expression change in this patch. The old expression doesn't work well, it has an unwanted underscore, so I changed it to make it work. [YOCTO #4570] (From OE-Core rev: 87efa83191f0b4f4cec3a821b6dfe425c781c077) 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>
* busybox: remove the postinst part of the recipeChen Qi2013-06-251-8/+0
| | | | | | | | | | | | Remove the pkg_postinst_${PN} from this recipe, as it's redundant. It basically wants to do the same thing as the update-alternatives does. But it doesn't do it well. (From OE-Core rev: 5b961afc784747eb8240540e542a789849118596) 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>
* busybox-mdev: Startup at level S03 instead of S06Mike Looijmans2013-05-161-1/+1
| | | | | | | | | | | | | | | The udev hotplug deamon starts at 03, so mdev should start at the same point. This fixes the bug that when modutils (runs at 04) initializes devices that the mdev hotplug will often not pick them up, resulting in missing device nodes and similar problems. (From OE-Core rev: 18d3e5eb9102a984d00837f8fec16fda522c511a) Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* class/lib: Fix up various file access methodsRichard Purdie2013-05-091-0/+1
| | | | | | | | | | | | | | There are various bits of cruft that have built up around our file accesses. This patch cleans some of them up, specifically: * Remove pointless "from __builtin__ import file" * Use open(), not file() * Wrap file usage in a with container to ensure files are closed * Add missing .close() calls in some cases (From OE-Core rev: a43e0a8ecd0441131e929daf998c3cd454d9c8f3) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: hard-code the syslog service fileRoss Burton2013-04-181-1/+1
| | | | | | | | | Previously this was using ${PN}-syslog.service, which changes with multilib. (From OE-Core rev: ee36f997e68f5a995baf361191cef7a46ff51203) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: Add inetd related filesTing Liu2013-04-151-0/+1
| | | | | | | | | | | | | | Add back inetd and inetd.conf files which are needed if CONFIG_INETD is enabled in the defconfig. Grabbed these files from oe-classic This patch is based on the previous patch for denzil: http://patches.openembedded.org/patch/33235/ (From OE-Core rev: 929c738787b6f513ce235ed5f7753408a570d632) Signed-off-by: Ting Liu <b28495@freescale.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: detects customized configs when do_installTing Liu2013-04-151-13/+13
| | | | | | | | | | | After using 'bitbake -c menuconfig busybox' to customize defconfig, do_install fail to detect the changes. Grep configs in ${B}/.config instead of ${WORKDIR}/defconfig. (From OE-Core rev: 5c088c2d3b23026752649d077ee44fe3dbe26aa4) Signed-off-by: Ting Liu <b28495@freescale.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: order and group initscript variables logicallyRoss Burton2013-03-261-2/+2
| | | | | | | (From OE-Core rev: 94acb39385a14d54503db08351a717449e2d4b50) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: enable systemd integration for syslogdRadu Moisan2013-03-261-2/+16
| | | | | | | | | | | (From OE-Core rev: cf3618f9a57e46fb78d5be35d473e2dd5290e961) Signed-off-by: Radu Moisan <radu.moisan@intel.com> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: add config fragmentsChen Qi2013-02-131-0/+13
| | | | | | | | | | | | | | | | | | | Add config fragments to busybox. The implementation makes use of merge_config.sh script in kern-tools-native. The use case is similar to the yocto kernel's configuration fragments. We also add kern-tools-native to busybox's DEPENDS variable to ensure that merge_config.sh is available when required. [YOCTO #3379] (From OE-Core rev: bbcd8b344598850ea2c8d3ad375c519713581fde) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bzip2 and busybox: Incorrect LICENSEElizabeth Flanagan2012-10-031-2/+1
| | | | | | | | | | | | | | | The license for bzip2 is not quite BSD. I have an email out to the maintainer to see if we can utilize a common BSD license (or something else) however, for now, we should revert bzip2 back to a special license. As busybox also utilizes a lightly modified bzip2, this also effects busybox. (From OE-Core rev: a0b132798d2c1adf79414787b8317327a554f852) Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: Add missing INITSCRIPT_NAME_${PN}-hwclockRichard Purdie2012-10-021-0/+1
| | | | | | | | | | | | | | | | | | | | | Fix failures like: Configuring busybox-hwclock. usage: update-rc.d [-n] [-f] [-r <root>] <basename> remove update-rc.d [-n] [-r <root>] [-s] <basename> defaults [NN | sNN kNN] update-rc.d [-n] [-r <root>] [-s] <basename> start|stop NN runlvl [runlvl] [...] . -n: not really -f: force -v: verbose -r: alternate root path (default is /) -s: invoke start methods if appropriate to current runlevel Collected errors: * pkg_run_script: package "busybox-hwclock" postinst script returned status 1. * opkg_configure: busybox-hwclock.postinst returned 1. (From OE-Core rev: 43b4ffc11874803db37c43b521ce27c51c677c8b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: Fix misplaced quoteRichard Purdie2012-09-261-1/+1
| | | | | | (From OE-Core rev: 938d07871bedd91f0d95ed6fe338ecbfafa5ebfe) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: Package hwclock.sh initscript separatelyAndrei Gherzan2012-08-171-2/+3
| | | | | | | | | | | We package this separately to be able to pull this in only if this makes sense for the MACHINE. (From OE-Core rev: b97e37e1444ef32e7837dcc79e3fad36c4284b65) Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: udhcpc shouldn't be a serviceJesse Zhang2012-08-021-4/+2
| | | | | | | | | | | | | | | | | | 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>
* Convert tab indentation in python functions into four-spaceRichard Purdie2012-07-191-13/+13
| | | | | | (From OE-Core rev: 604d46c686d06d62d5a07b9c7f4fa170f99307d8) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: add correct ALTERNATIVE_TARGET for init.d/syslogSaul Wold2012-06-281-1/+2
| | | | | | | | | [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>
* busybox: Fix syslog configuration fileMark Hatle2012-06-181-0/+1
| | | | | | | | | | | | | 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>
* busybox: Add check for wifi/bluetooth to enable rfkillSaul Wold2012-06-151-0/+2
| | | | | | | | | | | rfkill is a usefull tool when you have a device with bluetooth and wifi enabled [YOCTO #2494] (From OE-Core rev: f71258f0ef96802e714b6f12ecc8c17842d6cf87) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: use new update-alternativesMark Hatle2012-05-301-44/+22
| | | | | | | (From OE-Core rev: fbbc96aed5086f853a1179f1478ccd252af24094) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: Pass HOST_CC_ARCH through CONFIG_EXTRA_CFLAGSKhem Raj2012-05-011-1/+1
| | | | | | | | | | | 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>
* meta: Replace bb.data.expand(xxx, d) -> d.expand(xxx)Richard Purdie2012-03-051-1/+1
| | | | | | | | sed \ -e 's:bb.data.\(expand([^,()]*\), *\([^) ]*\) *):\2.\1):g' \ -i `grep -ril bb.data.expand *` Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* More quoting fixesMartin Jansa2012-02-261-2/+2
| | | | | | | | | | * We have various variables which are either not quoted at all or are half quoted. This patch fixes the bad exmaples so everything is consistent. (From OE-Core rev: 960ee8076e860353a05eb2eb7f825a455c54698d) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: don't create /etc/defaultAndreas Oberritter2012-02-231-1/+0
| | | | | | | | | | * It's not used by the recipe and its creation currently depends on CONFIG_HWCLOCK=y. (From OE-Core rev: cd59c2fcefa6aeacf78a63c5c9a623a4d77c0941) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: Optimise the per file rpm handlingRichard Purdie2012-02-101-2/+2
| | | | | | | | | | | | Currently a process was being forked off for each individual file this class wanted to inspect with rpmdeps. This converts it to use rpmdeps-oecore which allows batch processing of these dependencies. For do_package for perl, this reduced the time by about 1 minute (33%). (From OE-Core rev: 548037acd63bd4859f8de8d23a3d12f36ce9f97f) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox/uglibc: remove obsolete check for "kernel24"Andrei Gherzan2012-01-171-3/+1
| | | | | | | | | | | | | Busybox checks if MACHINE_FEATURES contains "kernel24". If so, CONFIG_FEATURE_2_4_MODULES will be on "y". kernel24 is no longer present in any machine configuration. The same situation is in uglibc with a different CONFIG mapping. [YOCTO #1901] (From OE-Core rev: 7257ded5355ffdc0fc169e7f34daeedb0b3dcd78) Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: rename syslog.conf to syslog-startup.confJoshua Lock2012-01-041-5/+5
| | | | | | | | | | | | | | | | | | | Busybox 1.19 introduced basic support for an rsyslog inspired syslog.conf whereas we've been shipping syslog.conf as a file to be sourced by the syslog init script in order to configure which options busybox's syslog is started with. Busybox 1.19 in syslog mode chokes on our syslog.conf and doesn't start. This patch renames the syslog.conf we ship to syslog-startup.conf in order to prevent busybox trying to parse the file as an rsyslog style syslog.conf Fixes [YOCTO #1848] (From OE-Core rev: b406998019b577eac7f758298cc2695372e03d15) Signed-off-by: Joshua Lock <josh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* OECore license fixes: meta/*Elizabeth Flanagan2011-12-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a quick audit of only the most obviously wrong licenses found within OECore. These fixes fall into four areas: - LICENSE field had incorrect format so that the parser choked - LICENSE field has a license with no version - LICENSE field was actually incorrect - LICENSE field has an imaginary license that didn't exist This fixes most of the LICENSE warnings thrown, along with my prior commit adding additional licenses to common-licenses and additional SPDXLICENSEMAP entries. HOWEVER..... there is much to be done on the license front. For a list of recipes with licenses that need obvious fixing see: https://wiki.yoctoproject.org/wiki/License_Audit That said, I would suggest another license audit as I've found enough inconsistencies. A good suggestion is when in doubt, look at how openSuse or Gentoo or Debian license the package. (From OE-Core rev: 3083dd70b3a9fa01fcc3cf00373b05502505996e) Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* getVar/setVar cleanupsRichard Purdie2011-11-271-6/+4
| | | | | | | | | Complete the bb.data.getVar/setVar replacements with accesses directly to the data store object. (From OE-Core rev: 2864ff6a4b3c3f9b3bbb6d2597243cc5d3715939) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Convert to use direct access to the data store (instead of bb.data.*Var*())Richard Purdie2011-11-101-3/+3
| | | | | | | | | | | | | | | | | This is the result of running the following over the metadata: sed \ -e 's:bb.data.\(setVar([^,()]*,[^,()]*\), *\([^ )]*\) *):\2.\1):g' \ -e 's:bb.data.\(setVarFlag([^,()]*,[^,()]*,[^,()]*\), *\([^) ]*\) *):\2.\1):g' \ -e 's:bb.data.\(getVar([^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \ -e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \ -e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^() ]*\) *):\2.\1):g' \ -e 's:bb.data.\(getVar([^,()]*\), *\([^) ]*\) *):\2.\1):g' \ -i `grep -ril bb.data *` (From OE-Core rev: b22831fd63164c4db9c0b72934d7d734a6585251) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: add grep to temporary links during uninstallPaul Eggleton2011-11-101-0/+1
| | | | | | | | | | | | In the busybox package prerm we set up some temporary links and modify PATH so that certain utilities are provided for the purpose of running update-alternatives; if grep is not among these then you get errors when removing busybox, so add a temporary link for grep as well. (From OE-Core rev: 013eca09c863862cc6b7ee3bc22923bf8fb42956) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: Enhance to add dynamic per-file providesMark Hatle2011-09-211-0/+32
| | | | | | | | | | | | | | | | | | | When using the RPM package backend, we need a full list of per-file provides (and requires). The busybox package provides a number of command line utilities, such as /usr/bin/env. However, because the utilities are created at post install time via scripting the provide of each of the links was never made. So any programs, such as python, that require /usr/bin/env were unable to resolve the dependency and failed. This change only affects packaging backends that use per-file dependency data. Currently RPM is the only packaging backend with this ability. (From OE-Core rev: dd63f64155e0fe41c27a8c9be84dfc0a255a3ff7) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: Change ${PN} to ${BPN} in file namesDongxiao Xu2011-08-191-15/+15
| | | | | | | | | | Some files in busybox are named with ${PN}. In multilib case, ${PN} will be prefixed with "lib32-" or "lib64-". Use ${BPN} instead. (From OE-Core rev: d6c24d3944ed662591372fbd7bf855395655d634) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>