diff options
author | Andrej Valek <andrej.valek@siemens.com> | 2018-10-09 14:56:40 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-10-10 12:47:34 +0100 |
commit | 7ee1b6a734724ef7ca6330cac4d14c8544d3285c (patch) | |
tree | 4c5fdf1dbb0b1abf03da7d80b818e9998bc71674 | |
parent | 2ff05e9c19c9472ba0fa6a96a286a2094599d8fb (diff) | |
download | poky-7ee1b6a734724ef7ca6330cac4d14c8544d3285c.tar.gz |
busybox: unify recipe style
- 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>
-rw-r--r-- | meta/recipes-core/busybox/busybox.inc | 98 |
1 files changed, 49 insertions, 49 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 97b73c1dc0..10582a7534 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc | |||
@@ -117,13 +117,13 @@ do_prepare_config () { | |||
117 | ${S}/.config | 117 | ${S}/.config |
118 | sed -i -e '${configmangle}' ${S}/.config | 118 | sed -i -e '${configmangle}' ${S}/.config |
119 | if test ${DO_IPv4} -eq 0 && test ${DO_IPv6} -eq 0; then | 119 | if test ${DO_IPv4} -eq 0 && test ${DO_IPv6} -eq 0; then |
120 | # disable networking applets | 120 | # disable networking applets |
121 | mv ${S}/.config ${S}/.config.oe-tmp | 121 | mv ${S}/.config ${S}/.config.oe-tmp |
122 | awk 'BEGIN{net=0} | 122 | awk 'BEGIN{net=0} |
123 | /^# Networking Utilities/{net=1} | 123 | /^# Networking Utilities/{net=1} |
124 | /^#$/{if(net){net=net+1}} | 124 | /^#$/{if(net){net=net+1}} |
125 | {if(net==2&&$0 !~ /^#/&&$1){print("# "$1" is not set")}else{print}}' \ | 125 | {if(net==2&&$0 !~ /^#/&&$1){print("# "$1" is not set")}else{print}}' \ |
126 | ${S}/.config.oe-tmp > ${S}/.config | 126 | ${S}/.config.oe-tmp > ${S}/.config |
127 | fi | 127 | fi |
128 | sed -i 's/CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"/CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -b"/' ${S}/.config | 128 | sed -i 's/CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"/CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -b"/' ${S}/.config |
129 | sed -i 's|${DEBUG_PREFIX_MAP}||g' ${S}/.config | 129 | sed -i 's|${DEBUG_PREFIX_MAP}||g' ${S}/.config |
@@ -151,7 +151,7 @@ do_compile() { | |||
151 | export KCONFIG_NOTIMESTAMP=1 | 151 | export KCONFIG_NOTIMESTAMP=1 |
152 | fi | 152 | fi |
153 | if [ "${BUSYBOX_SPLIT_SUID}" = "1" -a x`grep "CONFIG_FEATURE_INDIVIDUAL=y" .config` = x ]; then | 153 | if [ "${BUSYBOX_SPLIT_SUID}" = "1" -a x`grep "CONFIG_FEATURE_INDIVIDUAL=y" .config` = x ]; then |
154 | # split the .config into two parts, and make two busybox binaries | 154 | # split the .config into two parts, and make two busybox binaries |
155 | if [ -e .config.orig ]; then | 155 | if [ -e .config.orig ]; then |
156 | # Need to guard again an interrupted do_compile - restore any backup | 156 | # Need to guard again an interrupted do_compile - restore any backup |
157 | cp .config.orig .config | 157 | cp .config.orig .config |
@@ -303,51 +303,51 @@ do_install () { | |||
303 | sed -i "s:/usr/sbin/:${sbindir}/:" ${D}${sysconfdir}/init.d/inetd.${BPN} | 303 | sed -i "s:/usr/sbin/:${sbindir}/:" ${D}${sysconfdir}/init.d/inetd.${BPN} |
304 | install -m 0644 ${WORKDIR}/inetd.conf ${D}${sysconfdir}/ | 304 | install -m 0644 ${WORKDIR}/inetd.conf ${D}${sysconfdir}/ |
305 | fi | 305 | fi |
306 | if grep -q "CONFIG_MDEV=y" ${B}/.config; then | 306 | if grep -q "CONFIG_MDEV=y" ${B}/.config; then |
307 | install -m 0755 ${WORKDIR}/mdev ${D}${sysconfdir}/init.d/mdev | 307 | install -m 0755 ${WORKDIR}/mdev ${D}${sysconfdir}/init.d/mdev |
308 | if grep "CONFIG_FEATURE_MDEV_CONF=y" ${B}/.config; then | 308 | if grep "CONFIG_FEATURE_MDEV_CONF=y" ${B}/.config; then |
309 | install -m 644 ${WORKDIR}/mdev.conf ${D}${sysconfdir}/mdev.conf | 309 | install -m 644 ${WORKDIR}/mdev.conf ${D}${sysconfdir}/mdev.conf |
310 | install -d ${D}${sysconfdir}/mdev | 310 | install -d ${D}${sysconfdir}/mdev |
311 | install -m 0755 ${WORKDIR}/find-touchscreen.sh ${D}${sysconfdir}/mdev | 311 | install -m 0755 ${WORKDIR}/find-touchscreen.sh ${D}${sysconfdir}/mdev |
312 | install -m 0755 ${WORKDIR}/mdev-mount.sh ${D}${sysconfdir}/mdev | 312 | install -m 0755 ${WORKDIR}/mdev-mount.sh ${D}${sysconfdir}/mdev |
313 | fi | 313 | fi |
314 | fi | ||
315 | if grep -q "CONFIG_INIT=y" ${B}/.config; then | ||
316 | install -D -m 0777 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d/rcS | ||
317 | install -D -m 0777 ${WORKDIR}/rcK ${D}${sysconfdir}/init.d/rcK | ||
318 | fi | ||
319 | |||
320 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | ||
321 | if grep -q "CONFIG_KLOGD=y" ${B}/.config; then | ||
322 | install -d ${D}${systemd_unitdir}/system | ||
323 | sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-klogd.service.in \ | ||
324 | > ${D}${systemd_unitdir}/system/busybox-klogd.service | ||
325 | fi | ||
326 | |||
327 | if grep -q "CONFIG_SYSLOGD=y" ${B}/.config; then | ||
328 | install -d ${D}${systemd_unitdir}/system | ||
329 | sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-syslog.service.in \ | ||
330 | > ${D}${systemd_unitdir}/system/busybox-syslog.service | ||
331 | if [ ! -e ${D}${systemd_unitdir}/system/busybox-klogd.service ] ; then | ||
332 | sed -i '/klog/d' ${D}${systemd_unitdir}/system/busybox-syslog.service | ||
333 | fi | ||
334 | if [ -f ${WORKDIR}/busybox-syslog.default ] ; then | ||
335 | install -d ${D}${sysconfdir}/default | ||
336 | install -m 0644 ${WORKDIR}/busybox-syslog.default ${D}${sysconfdir}/default/busybox-syslog | ||
337 | fi | ||
338 | fi | ||
339 | fi | ||
340 | |||
341 | # Remove the sysvinit specific configuration file for systemd systems to avoid confusion | ||
342 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'false', 'true', d)}; then | ||
343 | rm -f ${D}${sysconfdir}/syslog-startup.conf | ||
314 | fi | 344 | fi |
315 | if grep -q "CONFIG_INIT=y" ${B}/.config; then | ||
316 | install -D -m 0777 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d/rcS | ||
317 | install -D -m 0777 ${WORKDIR}/rcK ${D}${sysconfdir}/init.d/rcK | ||
318 | fi | ||
319 | |||
320 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | ||
321 | if grep -q "CONFIG_KLOGD=y" ${B}/.config; then | ||
322 | install -d ${D}${systemd_unitdir}/system | ||
323 | sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-klogd.service.in \ | ||
324 | > ${D}${systemd_unitdir}/system/busybox-klogd.service | ||
325 | fi | ||
326 | |||
327 | if grep -q "CONFIG_SYSLOGD=y" ${B}/.config; then | ||
328 | install -d ${D}${systemd_unitdir}/system | ||
329 | sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-syslog.service.in \ | ||
330 | > ${D}${systemd_unitdir}/system/busybox-syslog.service | ||
331 | if [ ! -e ${D}${systemd_unitdir}/system/busybox-klogd.service ] ; then | ||
332 | sed -i '/klog/d' ${D}${systemd_unitdir}/system/busybox-syslog.service | ||
333 | fi | ||
334 | if [ -f ${WORKDIR}/busybox-syslog.default ] ; then | ||
335 | install -d ${D}${sysconfdir}/default | ||
336 | install -m 0644 ${WORKDIR}/busybox-syslog.default ${D}${sysconfdir}/default/busybox-syslog | ||
337 | fi | ||
338 | fi | ||
339 | fi | ||
340 | |||
341 | # Remove the sysvinit specific configuration file for systemd systems to avoid confusion | ||
342 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'false', 'true', d)}; then | ||
343 | rm -f ${D}${sysconfdir}/syslog-startup.conf | ||
344 | fi | ||
345 | } | 345 | } |
346 | 346 | ||
347 | do_install_ptest () { | 347 | do_install_ptest () { |
348 | cp -r ${B}/testsuite ${D}${PTEST_PATH}/ | 348 | cp -r ${B}/testsuite ${D}${PTEST_PATH}/ |
349 | cp ${B}/.config ${D}${PTEST_PATH}/ | 349 | cp ${B}/.config ${D}${PTEST_PATH}/ |
350 | ln -s /bin/busybox ${D}${PTEST_PATH}/busybox | 350 | ln -s /bin/busybox ${D}${PTEST_PATH}/busybox |
351 | } | 351 | } |
352 | 352 | ||
353 | inherit update-alternatives | 353 | inherit update-alternatives |