]> code.ossystems Code Review - openembedded-core.git/commitdiff
busybox: unify recipe style
authorAndrej Valek <andrej.valek@siemens.com>
Tue, 9 Oct 2018 12:56:40 +0000 (14:56 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 10 Oct 2018 11:42:40 +0000 (12:42 +0100)
- change spaces to tabs and unify indent level

Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-core/busybox/busybox.inc

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