From 6b9f0feb54d95560f7015c61566044baf4d215d0 Mon Sep 17 00:00:00 2001 From: zangrc Date: Fri, 11 Jun 2021 17:01:51 +0800 Subject: toybox: upgrade 0.8.4 -> 0.8.5 Signed-off-by: Zang Ruochen Signed-off-by: Khem Raj --- meta-oe/recipes-core/toybox/toybox_0.8.4.bb | 114 ---------------------------- meta-oe/recipes-core/toybox/toybox_0.8.5.bb | 114 ++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+), 114 deletions(-) delete mode 100644 meta-oe/recipes-core/toybox/toybox_0.8.4.bb create mode 100644 meta-oe/recipes-core/toybox/toybox_0.8.5.bb diff --git a/meta-oe/recipes-core/toybox/toybox_0.8.4.bb b/meta-oe/recipes-core/toybox/toybox_0.8.4.bb deleted file mode 100644 index cc98b9ec07..0000000000 --- a/meta-oe/recipes-core/toybox/toybox_0.8.4.bb +++ /dev/null @@ -1,114 +0,0 @@ -SUMMARY = "Toybox combines common utilities together into a single executable." -HOMEPAGE = "http://www.landley.net/toybox/" -DEPENDS = "attr virtual/crypt" - -LICENSE = "BSD-0-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=78659a599b9325da368f2f1eb88f19c7" - -inherit cml1 update-alternatives - -SRC_URI = "http://www.landley.net/toybox/downloads/${BPN}-${PV}.tar.gz \ - " -SRC_URI[sha256sum] = "cb2a565a8d30015d08d73628795dca51a85b99b149aeabbbecd9e8dbdbd8fddc" - -SECTION = "base" - -RDEPENDS_${PN} = "${@["", "toybox-inittab"][(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'toybox')]}" - -TOYBOX_BIN = "generated/unstripped/toybox" - -# Toybox is strict on what CC, CFLAGS and CROSS_COMPILE variables should contain. -# Fix CC, CFLAGS, CROSS_COMPILE to match expectations. -# CC = compiler name -# CFLAGS = only compiler flags -# CROSS_COMPILE = compiler prefix -CFLAGS += "${TOOLCHAIN_OPTIONS} ${TUNE_CCARGS}" - -COMPILER_toolchain-clang = "clang" -COMPILER ?= "gcc" - -PACKAGECONFIG ??= "no-iconv no-getconf" - -PACKAGECONFIG[no-iconv] = ",," -PACKAGECONFIG[no-getconf] = ",," - -EXTRA_OEMAKE = 'CROSS_COMPILE="${HOST_PREFIX}" \ - CC="${COMPILER}" \ - STRIP="strip" \ - CFLAGS="${CFLAGS}" \ - HOSTCC="${BUILD_CC}" CPUS=${@oe.utils.cpu_count()} V=1' - -do_configure() { - # allow user to define their own defconfig in bbappend, taken from kernel.bbclass - if [ "${S}" != "${B}" ] && [ -f "${S}/.config" ] && [ ! -f "${B}/.config" ]; then - mv "${S}/.config" "${B}/.config" - fi - - # Copy defconfig to .config if .config does not exist. This allows - # recipes to manage the .config themselves in do_configure_prepend(). - if [ -f "${WORKDIR}/defconfig" ] && [ ! -f "${B}/.config" ]; then - cp "${WORKDIR}/defconfig" "${B}/.config" - fi - - oe_runmake oldconfig || 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 - - # Disable swapon as it doesn't handle the '-a' argument used during boot - sed -e 's/CONFIG_SWAPON=y/# CONFIG_SWAPON is not set/' -i .config - - # Enable init if toybox was set as init manager - if ${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','toybox','true','false',d)}; then - sed -e 's/# CONFIG_INIT is not set/CONFIG_INIT=y/' -i .config - fi -} - -do_compile() { - oe_runmake ${TOYBOX_BIN} - - # Create a list of links needed - ${BUILD_CC} -I . scripts/install.c -o generated/instlist - ./generated/instlist long | sed -e 's#^#/#' > toybox.links - if ${@bb.utils.contains('PACKAGECONFIG','no-iconv','true','false',d)}; then - sed -i -e '/iconv$/d' toybox.links - fi - if ${@bb.utils.contains('PACKAGECONFIG','no-getconf','true','false',d)}; then - sed -i -e '/getconf$/d' toybox.links - fi -} - -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_BIN} ${D}${base_bindir}/toybox - else - install -m 0755 ${B}/${TOYBOX_BIN} ${D}${base_bindir}/toybox - fi - - install -d ${D}${sysconfdir} - install -m 0644 ${B}/toybox.links ${D}${sysconfdir} -} - -# 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') - pn = d.getVar('PN') - target = d.expand("${base_bindir}/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() -} diff --git a/meta-oe/recipes-core/toybox/toybox_0.8.5.bb b/meta-oe/recipes-core/toybox/toybox_0.8.5.bb new file mode 100644 index 0000000000..90a0ad6c73 --- /dev/null +++ b/meta-oe/recipes-core/toybox/toybox_0.8.5.bb @@ -0,0 +1,114 @@ +SUMMARY = "Toybox combines common utilities together into a single executable." +HOMEPAGE = "http://www.landley.net/toybox/" +DEPENDS = "attr virtual/crypt" + +LICENSE = "BSD-0-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=78659a599b9325da368f2f1eb88f19c7" + +inherit cml1 update-alternatives + +SRC_URI = "http://www.landley.net/toybox/downloads/${BPN}-${PV}.tar.gz \ + " +SRC_URI[sha256sum] = "bfd230c187726347f7e31a1fc5841705871dfe4f3cbc6628f512b54e57360949" + +SECTION = "base" + +RDEPENDS_${PN} = "${@["", "toybox-inittab"][(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'toybox')]}" + +TOYBOX_BIN = "generated/unstripped/toybox" + +# Toybox is strict on what CC, CFLAGS and CROSS_COMPILE variables should contain. +# Fix CC, CFLAGS, CROSS_COMPILE to match expectations. +# CC = compiler name +# CFLAGS = only compiler flags +# CROSS_COMPILE = compiler prefix +CFLAGS += "${TOOLCHAIN_OPTIONS} ${TUNE_CCARGS}" + +COMPILER_toolchain-clang = "clang" +COMPILER ?= "gcc" + +PACKAGECONFIG ??= "no-iconv no-getconf" + +PACKAGECONFIG[no-iconv] = ",," +PACKAGECONFIG[no-getconf] = ",," + +EXTRA_OEMAKE = 'CROSS_COMPILE="${HOST_PREFIX}" \ + CC="${COMPILER}" \ + STRIP="strip" \ + CFLAGS="${CFLAGS}" \ + HOSTCC="${BUILD_CC}" CPUS=${@oe.utils.cpu_count()} V=1' + +do_configure() { + # allow user to define their own defconfig in bbappend, taken from kernel.bbclass + if [ "${S}" != "${B}" ] && [ -f "${S}/.config" ] && [ ! -f "${B}/.config" ]; then + mv "${S}/.config" "${B}/.config" + fi + + # Copy defconfig to .config if .config does not exist. This allows + # recipes to manage the .config themselves in do_configure_prepend(). + if [ -f "${WORKDIR}/defconfig" ] && [ ! -f "${B}/.config" ]; then + cp "${WORKDIR}/defconfig" "${B}/.config" + fi + + oe_runmake oldconfig || 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 + + # Disable swapon as it doesn't handle the '-a' argument used during boot + sed -e 's/CONFIG_SWAPON=y/# CONFIG_SWAPON is not set/' -i .config + + # Enable init if toybox was set as init manager + if ${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','toybox','true','false',d)}; then + sed -e 's/# CONFIG_INIT is not set/CONFIG_INIT=y/' -i .config + fi +} + +do_compile() { + oe_runmake ${TOYBOX_BIN} + + # Create a list of links needed + ${BUILD_CC} -I . scripts/install.c -o generated/instlist + ./generated/instlist long | sed -e 's#^#/#' > toybox.links + if ${@bb.utils.contains('PACKAGECONFIG','no-iconv','true','false',d)}; then + sed -i -e '/iconv$/d' toybox.links + fi + if ${@bb.utils.contains('PACKAGECONFIG','no-getconf','true','false',d)}; then + sed -i -e '/getconf$/d' toybox.links + fi +} + +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_BIN} ${D}${base_bindir}/toybox + else + install -m 0755 ${B}/${TOYBOX_BIN} ${D}${base_bindir}/toybox + fi + + install -d ${D}${sysconfdir} + install -m 0644 ${B}/toybox.links ${D}${sysconfdir} +} + +# 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') + pn = d.getVar('PN') + target = d.expand("${base_bindir}/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() +} -- cgit v1.2.3-54-g00ecf