diff options
author | Paul Barker <paul@paulbarker.me.uk> | 2016-05-04 08:23:32 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-05-06 12:40:27 +0200 |
commit | 09806901be06fd99b0c7ed3f15bc4de2d03ec174 (patch) | |
tree | aab62a3787233a53c54dcb84815d628fe4b1fd73 /meta-oe/recipes-core/toybox/toybox_0.7.0.bb | |
parent | 3391c2e65c9c608758fb62ebd2d2d4820d5cce92 (diff) | |
download | meta-openembedded-contrib-09806901be06fd99b0c7ed3f15bc4de2d03ec174.tar.gz |
toybox: Upgrade to 0.7.0
Add additional patches to fix issues seen during testing on qemux86.
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-core/toybox/toybox_0.7.0.bb')
-rw-r--r-- | meta-oe/recipes-core/toybox/toybox_0.7.0.bb | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/meta-oe/recipes-core/toybox/toybox_0.7.0.bb b/meta-oe/recipes-core/toybox/toybox_0.7.0.bb new file mode 100644 index 0000000000..d7b469a899 --- /dev/null +++ b/meta-oe/recipes-core/toybox/toybox_0.7.0.bb @@ -0,0 +1,69 @@ +SUMMARY = "Toybox combines common utilities together into a single executable." +HOMEPAGE = "http://www.landley.net/toybox/" +DEPENDS = "attr" + +SRC_URI = " \ + http://www.landley.net/toybox/downloads/${BPN}-${PV}.tar.gz \ + file://0001-Fix-segfault-in-login.patch \ + file://0002-Add-b-and-F-arguments-to-hostname.patch \ +" + +SRC_URI[md5sum] = "d86c78624b47625c2f0fc64eda599443" +SRC_URI[sha256sum] = "65428816f88ad3fe92b67df86dc05427c8078fe03843b8b9715fdfa6d29c0f97" + +LICENSE = "BSD-0-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f0b8b3dd6431bcaa245da0a08bd0d511" + +SECTION = "base" + +do_configure() { + oe_runmake defconfig + + # Disable killall5 as it isn't managed by update-alternatives + sed -e 's/CONFIG_KILLALL5=y/# CONFIG_KILLALL5 is not set/' -i .config +} + +do_compile() { + oe_runmake toybox_unstripped + + # Create a list of links needed + oe_runmake generated/instlist + ./generated/instlist long | sed -e 's#^#/#' > toybox.links +} + +do_install() { + # Install manually instead of using 'make install' + install -d ${D}${base_bindir} + if grep -q "CONFIG_TOYBOX_SUID=y" ${B}/.config; then + install -m 4755 ${B}/toybox_unstripped ${D}${base_bindir}/toybox + else + install -m 0755 ${B}/toybox_unstripped ${D}${base_bindir}/toybox + fi + + install -d ${D}${sysconfdir} + install -m 0644 ${B}/toybox.links ${D}${sysconfdir} +} + +inherit update-alternatives + +# If you've chosen to install toybox you probably want it to take precedence +# over busybox where possible but not over other packages +ALTERNATIVE_PRIORITY = "60" + +python do_package_prepend () { + # Read links from /etc/toybox.links and create appropriate + # update-alternatives variables + + dvar = d.getVar('D', True) + pn = d.getVar('PN', True) + target = "/bin/toybox" + + f = open('%s/etc/toybox.links' % (dvar), 'r') + for alt_link_name in f: + alt_link_name = alt_link_name.strip() + alt_name = os.path.basename(alt_link_name) + d.appendVar('ALTERNATIVE_%s' % (pn), ' ' + alt_name) + d.setVarFlag('ALTERNATIVE_LINK_NAME', alt_name, alt_link_name) + d.setVarFlag('ALTERNATIVE_TARGET', alt_name, target) + f.close() +} |