mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-14 03:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

busybox: unify recipe style

Browse Source 
- change spaces to tabs and unify indent level

(From OE-Core rev: 38f8c4725da016df100e7ed434eece26ba77bf5f)

Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Andrej Valek
2018-10-09 14:56:40 +02:00
committed by Richard Purdie
parent 2ff05e9c19
commit 7ee1b6a734
1 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
meta/recipes-core/busybox/busybox.inc
View File

@@ -117,13 +117,13 @@ do_prepare_config () {
${S}/.config ${S}/.config
sed -i -e '${configmangle}' ${S}/.config sed -i -e '${configmangle}' ${S}/.config
if test ${DO_IPv4} -eq 0 && test ${DO_IPv6} -eq 0; then if test ${DO_IPv4} -eq 0 && test ${DO_IPv6} -eq 0; then
# disable networking applets # disable networking applets
mv ${S}/.config ${S}/.config.oe-tmp mv ${S}/.config ${S}/.config.oe-tmp
awk 'BEGIN{net=0} awk 'BEGIN{net=0}
/^# Networking Utilities/{net=1} /^# Networking Utilities/{net=1}
/^#$/{if(net){net=net+1}} /^#$/{if(net){net=net+1}}
{if(net==2&&$0 !~ /^#/&&$1){print("# "$1" is not set")}else{print}}' \ {if(net==2&&$0 !~ /^#/&&$1){print("# "$1" is not set")}else{print}}' \
${S}/.config.oe-tmp > ${S}/.config ${S}/.config.oe-tmp > ${S}/.config
fi fi
sed -i 's/CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"/CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -b"/' ${S}/.config sed -i 's/CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"/CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -b"/' ${S}/.config
sed -i 's|${DEBUG_PREFIX_MAP}||g' ${S}/.config sed -i 's|${DEBUG_PREFIX_MAP}||g' ${S}/.config
@@ -151,7 +151,7 @@ do_compile() {
export KCONFIG_NOTIMESTAMP=1 export KCONFIG_NOTIMESTAMP=1
fi fi
if [ "${BUSYBOX_SPLIT_SUID}" = "1" -a x`grep "CONFIG_FEATURE_INDIVIDUAL=y" .config` = x ]; then if [ "${BUSYBOX_SPLIT_SUID}" = "1" -a x`grep "CONFIG_FEATURE_INDIVIDUAL=y" .config` = x ]; then
# split the .config into two parts, and make two busybox binaries # split the .config into two parts, and make two busybox binaries
if [ -e .config.orig ]; then if [ -e .config.orig ]; then
# Need to guard again an interrupted do_compile - restore any backup # Need to guard again an interrupted do_compile - restore any backup
cp .config.orig .config cp .config.orig .config
@@ -303,51 +303,51 @@ do_install () {
sed -i "s:/usr/sbin/:${sbindir}/:" ${D}${sysconfdir}/init.d/inetd.${BPN} sed -i "s:/usr/sbin/:${sbindir}/:" ${D}${sysconfdir}/init.d/inetd.${BPN}
install -m 0644 ${WORKDIR}/inetd.conf ${D}${sysconfdir}/ install -m 0644 ${WORKDIR}/inetd.conf ${D}${sysconfdir}/
fi fi
if grep -q "CONFIG_MDEV=y" ${B}/.config; then if grep -q "CONFIG_MDEV=y" ${B}/.config; then
install -m 0755 ${WORKDIR}/mdev ${D}${sysconfdir}/init.d/mdev install -m 0755 ${WORKDIR}/mdev ${D}${sysconfdir}/init.d/mdev
if grep "CONFIG_FEATURE_MDEV_CONF=y" ${B}/.config; then if grep "CONFIG_FEATURE_MDEV_CONF=y" ${B}/.config; then
install -m 644 ${WORKDIR}/mdev.conf ${D}${sysconfdir}/mdev.conf install -m 644 ${WORKDIR}/mdev.conf ${D}${sysconfdir}/mdev.conf
install -d ${D}${sysconfdir}/mdev install -d ${D}${sysconfdir}/mdev
install -m 0755 ${WORKDIR}/find-touchscreen.sh ${D}${sysconfdir}/mdev install -m 0755 ${WORKDIR}/find-touchscreen.sh ${D}${sysconfdir}/mdev
install -m 0755 ${WORKDIR}/mdev-mount.sh ${D}${sysconfdir}/mdev install -m 0755 ${WORKDIR}/mdev-mount.sh ${D}${sysconfdir}/mdev
fi fi
fi
if grep -q "CONFIG_INIT=y" ${B}/.config; then
install -D -m 0777 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d/rcS
install -D -m 0777 ${WORKDIR}/rcK ${D}${sysconfdir}/init.d/rcK
fi fi
if grep -q "CONFIG_INIT=y" ${B}/.config; then
install -D -m 0777 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d/rcS
install -D -m 0777 ${WORKDIR}/rcK ${D}${sysconfdir}/init.d/rcK
fi
if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
if grep -q "CONFIG_KLOGD=y" ${B}/.config; then if grep -q "CONFIG_KLOGD=y" ${B}/.config; then
install -d ${D}${systemd_unitdir}/system install -d ${D}${systemd_unitdir}/system
sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-klogd.service.in \ sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-klogd.service.in \
> ${D}${systemd_unitdir}/system/busybox-klogd.service > ${D}${systemd_unitdir}/system/busybox-klogd.service
fi fi
if grep -q "CONFIG_SYSLOGD=y" ${B}/.config; then if grep -q "CONFIG_SYSLOGD=y" ${B}/.config; then
install -d ${D}${systemd_unitdir}/system install -d ${D}${systemd_unitdir}/system
sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-syslog.service.in \ sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-syslog.service.in \
> ${D}${systemd_unitdir}/system/busybox-syslog.service > ${D}${systemd_unitdir}/system/busybox-syslog.service
if [ ! -e ${D}${systemd_unitdir}/system/busybox-klogd.service ] ; then if [ ! -e ${D}${systemd_unitdir}/system/busybox-klogd.service ] ; then
sed -i '/klog/d' ${D}${systemd_unitdir}/system/busybox-syslog.service sed -i '/klog/d' ${D}${systemd_unitdir}/system/busybox-syslog.service
fi fi
if [ -f ${WORKDIR}/busybox-syslog.default ] ; then if [ -f ${WORKDIR}/busybox-syslog.default ] ; then
install -d ${D}${sysconfdir}/default install -d ${D}${sysconfdir}/default
install -m 0644 ${WORKDIR}/busybox-syslog.default ${D}${sysconfdir}/default/busybox-syslog install -m 0644 ${WORKDIR}/busybox-syslog.default ${D}${sysconfdir}/default/busybox-syslog
fi fi
fi fi
fi fi
# Remove the sysvinit specific configuration file for systemd systems to avoid confusion # Remove the sysvinit specific configuration file for systemd systems to avoid confusion
if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'false', 'true', d)}; then if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'false', 'true', d)}; then
rm -f ${D}${sysconfdir}/syslog-startup.conf rm -f ${D}${sysconfdir}/syslog-startup.conf
fi fi
} }
do_install_ptest () { do_install_ptest () {
cp -r ${B}/testsuite ${D}${PTEST_PATH}/ cp -r ${B}/testsuite ${D}${PTEST_PATH}/
cp ${B}/.config ${D}${PTEST_PATH}/ cp ${B}/.config ${D}${PTEST_PATH}/
ln -s /bin/busybox ${D}${PTEST_PATH}/busybox ln -s /bin/busybox ${D}${PTEST_PATH}/busybox
} }
inherit update-alternatives inherit update-alternatives