diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-13 22:49:41 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-15 16:23:17 +0200 |
commit | a45830a39bb47a9eab27980d52966226c9504ea4 (patch) | |
tree | 001209d9740e8668b2eeeac4212b3561aecebf29 /meta-initramfs/recipes-devtools | |
parent | 6f48cf899aed0622f8fb26ffa144656a1143c9c5 (diff) | |
download | meta-openembedded-a45830a39bb47a9eab27980d52966226c9504ea4.tar.gz |
recipes: Unify indentation
* This change is only aesthetic (unlike indentation in Python
tasks).
* Some recipes were using tabs.
* Some were using 8 spaces.
* Some were using mix or different number of spaces.
* Make them consistently use 4 spaces everywhere.
* Yocto styleguide advises to use tabs (but the only reason to keep
tabs is the need to update a lot of recipes). Lately this advice
was also merged into the styleguide on the OE wiki.
* Using 4 spaces in both types of tasks is better because it's less
error prone when someone is not sure if e.g.
do_generate_toolchain_file() is Python or shell task and also allows
to highlight every tab used in .bb, .inc, .bbappend, .bbclass as
potentially bad (shouldn't be used for indenting of multiline
variable assignments and cannot be used for Python tasks).
* Don't indent closing quote on multiline variables
we're quite inconsistent wheater it's first character on line
under opening quote or under first non-whitespace character in
previous line.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Acked-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-initramfs/recipes-devtools')
7 files changed, 68 insertions, 72 deletions
diff --git a/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.2.bb b/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.2.bb index 56456f7a8..0c187d2a3 100644 --- a/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.2.bb +++ b/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.2.bb | |||
@@ -14,14 +14,14 @@ FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:" | |||
14 | inherit cross | 14 | inherit cross |
15 | 15 | ||
16 | do_configure () { | 16 | do_configure () { |
17 | : | 17 | : |
18 | } | 18 | } |
19 | 19 | ||
20 | do_compile() { | 20 | do_compile() { |
21 | oe_runmake klcc | 21 | oe_runmake klcc |
22 | } | 22 | } |
23 | 23 | ||
24 | do_install() { | 24 | do_install() { |
25 | install -d ${D}${base_bindir} | 25 | install -d ${D}${base_bindir} |
26 | install -m 0755 klcc/klcc ${D}${base_bindir}/${TARGET_PREFIX}klcc | 26 | install -m 0755 klcc/klcc ${D}${base_bindir}/${TARGET_PREFIX}klcc |
27 | } | 27 | } |
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.2.bb b/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.2.bb index 484134e44..ffad585d6 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.2.bb +++ b/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.2.bb | |||
@@ -6,7 +6,7 @@ KLIBC_UTILS_PKGNAME = "klibc-static-utils" | |||
6 | FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:" | 6 | FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:" |
7 | 7 | ||
8 | do_install() { | 8 | do_install() { |
9 | : | 9 | : |
10 | } | 10 | } |
11 | 11 | ||
12 | PACKAGES_${PN} = "${PN}" | 12 | PACKAGES_${PN} = "${PN}" |
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-utils.inc b/meta-initramfs/recipes-devtools/klibc/klibc-utils.inc index cdcaafa55..a626c9696 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc-utils.inc +++ b/meta-initramfs/recipes-devtools/klibc/klibc-utils.inc | |||
@@ -4,55 +4,54 @@ KLIBC_UTILS_PKGNAME ?= "klibc-utils" | |||
4 | # losetup goes in ${base_sbindir} | 4 | # losetup goes in ${base_sbindir} |
5 | 5 | ||
6 | do_install_append() { | 6 | do_install_append() { |
7 | install -d ${D}${base_bindir} | ||
8 | install -d ${D}${base_sbindir} | ||
7 | 9 | ||
8 | install -d ${D}${base_bindir} | 10 | # debian packages kinit + kinit.shared but only sh.shared |
9 | install -d ${D}${base_sbindir} | 11 | if [ "${KLIBC_UTILS_VARIANT}" = "shared" ]; then |
12 | install -m 755 usr/kinit/kinit ${D}${base_bindir}/kinit | ||
13 | install -m 755 usr/kinit/kinit.shared ${D}${base_bindir}/kinit.shared | ||
14 | install -m 755 usr/dash/sh.shared ${D}${base_bindir}/sh.shared | ||
15 | else | ||
16 | install -m 755 usr/dash/sh ${D}${base_bindir}/sh | ||
17 | install -m 755 usr/kinit/kinit ${D}${base_bindir}/kinit | ||
18 | fi | ||
10 | 19 | ||
11 | # debian packages kinit + kinit.shared but only sh.shared | 20 | install -m 755 usr/gzip/gzip ${D}${base_bindir} |
12 | if [ "${KLIBC_UTILS_VARIANT}" = "shared" ]; then | 21 | install -m 755 usr/kinit/fstype/${KLIBC_UTILS_VARIANT}/fstype ${D}${base_bindir} |
13 | install -m 755 usr/kinit/kinit ${D}${base_bindir}/kinit | 22 | install -m 755 usr/kinit/ipconfig/${KLIBC_UTILS_VARIANT}/ipconfig ${D}${base_bindir} |
14 | install -m 755 usr/kinit/kinit.shared ${D}${base_bindir}/kinit.shared | 23 | install -m 755 usr/kinit/nfsmount/${KLIBC_UTILS_VARIANT}/nfsmount ${D}${base_bindir} |
15 | install -m 755 usr/dash/sh.shared ${D}${base_bindir}/sh.shared | 24 | install -m 755 usr/kinit/resume/${KLIBC_UTILS_VARIANT}/resume ${D}${base_bindir} |
16 | else | 25 | install -m 755 usr/kinit/run-init/${KLIBC_UTILS_VARIANT}/run-init ${D}${base_bindir} |
17 | install -m 755 usr/dash/sh ${D}${base_bindir}/sh | 26 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/cat ${D}${base_bindir} |
18 | install -m 755 usr/kinit/kinit ${D}${base_bindir}/kinit | 27 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/chroot ${D}${base_bindir} |
19 | fi | 28 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/cpio ${D}${base_bindir} |
20 | 29 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/dd ${D}${base_bindir} | |
21 | install -m 755 usr/gzip/gzip ${D}${base_bindir} | 30 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/dmesg ${D}${base_bindir} |
22 | install -m 755 usr/kinit/fstype/${KLIBC_UTILS_VARIANT}/fstype ${D}${base_bindir} | 31 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/false ${D}${base_bindir} |
23 | install -m 755 usr/kinit/ipconfig/${KLIBC_UTILS_VARIANT}/ipconfig ${D}${base_bindir} | 32 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/halt ${D}${base_bindir} |
24 | install -m 755 usr/kinit/nfsmount/${KLIBC_UTILS_VARIANT}/nfsmount ${D}${base_bindir} | 33 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/kill ${D}${base_bindir} |
25 | install -m 755 usr/kinit/resume/${KLIBC_UTILS_VARIANT}/resume ${D}${base_bindir} | 34 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/ln ${D}${base_bindir} |
26 | install -m 755 usr/kinit/run-init/${KLIBC_UTILS_VARIANT}/run-init ${D}${base_bindir} | 35 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/losetup ${D}${base_sbindir} |
27 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/cat ${D}${base_bindir} | 36 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/ls ${D}${base_bindir} |
28 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/chroot ${D}${base_bindir} | 37 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/minips ${D}${base_bindir} |
29 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/cpio ${D}${base_bindir} | 38 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mkdir ${D}${base_bindir} |
30 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/dd ${D}${base_bindir} | 39 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mkfifo ${D}${base_bindir} |
31 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/dmesg ${D}${base_bindir} | 40 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mknod ${D}${base_bindir} |
32 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/false ${D}${base_bindir} | 41 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mount ${D}${base_bindir} |
33 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/halt ${D}${base_bindir} | 42 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mv ${D}${base_bindir} |
34 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/kill ${D}${base_bindir} | 43 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/nuke ${D}${base_bindir} |
35 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/ln ${D}${base_bindir} | 44 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/pivot_root ${D}${base_bindir} |
36 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/losetup ${D}${base_sbindir} | 45 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/poweroff ${D}${base_bindir} |
37 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/ls ${D}${base_bindir} | 46 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/readlink ${D}${base_bindir} |
38 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/minips ${D}${base_bindir} | 47 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/reboot ${D}${base_bindir} |
39 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mkdir ${D}${base_bindir} | 48 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/sleep ${D}${base_bindir} |
40 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mkfifo ${D}${base_bindir} | 49 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/sync ${D}${base_bindir} |
41 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mknod ${D}${base_bindir} | 50 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/true ${D}${base_bindir} |
42 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mount ${D}${base_bindir} | 51 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/umount ${D}${base_bindir} |
43 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mv ${D}${base_bindir} | 52 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/uname ${D}${base_bindir} |
44 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/nuke ${D}${base_bindir} | 53 | ln -s gzip ${D}${base_bindir}/gunzip |
45 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/pivot_root ${D}${base_bindir} | 54 | ln -s gzip ${D}${base_bindir}/zcat |
46 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/poweroff ${D}${base_bindir} | ||
47 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/readlink ${D}${base_bindir} | ||
48 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/reboot ${D}${base_bindir} | ||
49 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/sleep ${D}${base_bindir} | ||
50 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/sync ${D}${base_bindir} | ||
51 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/true ${D}${base_bindir} | ||
52 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/umount ${D}${base_bindir} | ||
53 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/uname ${D}${base_bindir} | ||
54 | ln -s gzip ${D}${base_bindir}/gunzip | ||
55 | ln -s gzip ${D}${base_bindir}/zcat | ||
56 | } | 55 | } |
57 | 56 | ||
58 | EXTRA_KLIBC_DEPS = '${@base_conditional("KLIBC_UTILS_VARIANT", "shared", "${THIS_LIBKLIBC}", "", d)}' | 57 | EXTRA_KLIBC_DEPS = '${@base_conditional("KLIBC_UTILS_VARIANT", "shared", "${THIS_LIBKLIBC}", "", d)}' |
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.2.bb b/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.2.bb index 37cab84c5..96fd19e50 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.2.bb +++ b/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.2.bb | |||
@@ -6,7 +6,7 @@ KLIBC_UTILS_PKGNAME = "klibc-utils" | |||
6 | FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:" | 6 | FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:" |
7 | 7 | ||
8 | do_install() { | 8 | do_install() { |
9 | : | 9 | : |
10 | } | 10 | } |
11 | 11 | ||
12 | PACKAGES_${PN} = "${PN}" | 12 | PACKAGES_${PN} = "${PN}" |
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc.inc b/meta-initramfs/recipes-devtools/klibc/klibc.inc index fa31f73d1..a4937fa5e 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc.inc +++ b/meta-initramfs/recipes-devtools/klibc/klibc.inc | |||
@@ -28,26 +28,25 @@ SRC_URI = "git://git.kernel.org/pub/scm/libs/klibc/klibc.git;protocol=git" | |||
28 | 28 | ||
29 | SRC_URI_append_linux-gnueabi = " file://klibc-config-eabi.patch \ | 29 | SRC_URI_append_linux-gnueabi = " file://klibc-config-eabi.patch \ |
30 | file://armv4-fix-v4bx.patch \ | 30 | file://armv4-fix-v4bx.patch \ |
31 | " | 31 | " |
32 | SRC_URI_append_linux-uclibceabi = " file://klibc-config-eabi.patch \ | 32 | SRC_URI_append_linux-uclibceabi = " file://klibc-config-eabi.patch \ |
33 | file://armv4-fix-v4bx.patch \ | 33 | file://armv4-fix-v4bx.patch \ |
34 | " | 34 | " |
35 | 35 | ||
36 | SRC_URI += "file://klibc-linux-libc-dev.patch \ | 36 | SRC_URI += "file://klibc-linux-libc-dev.patch \ |
37 | file://prefix.patch \ | 37 | file://prefix.patch \ |
38 | file://staging.patch \ | 38 | file://staging.patch \ |
39 | " | 39 | " |
40 | 40 | ||
41 | S = "${WORKDIR}/git" | 41 | S = "${WORKDIR}/git" |
42 | 42 | ||
43 | EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \ | 43 | EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \ |
44 | 'CROSS_COMPILE=${TARGET_PREFIX}' \ | 44 | 'CROSS_COMPILE=${TARGET_PREFIX}' \ |
45 | 'KLIBCKERNELSRC=${STAGING_DIR_TARGET}${exec_prefix}' \ | 45 | 'KLIBCKERNELSRC=${STAGING_DIR_TARGET}${exec_prefix}' \ |
46 | " | 46 | " |
47 | 47 | ||
48 | do_configure () { | 48 | do_configure () { |
49 | 49 | ln -sf "${STAGING_DIR_TARGET}${exec_prefix}" linux | |
50 | ln -sf "${STAGING_DIR_TARGET}${exec_prefix}" linux | ||
51 | } | 50 | } |
52 | 51 | ||
53 | THIS_LIBKLIBC = "libklibc (= ${PV}-${PR})" | 52 | THIS_LIBKLIBC = "libklibc (= ${PV}-${PR})" |
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc_2.0.2.bb b/meta-initramfs/recipes-devtools/klibc/klibc_2.0.2.bb index 8eaab2c44..4ec989faf 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc_2.0.2.bb +++ b/meta-initramfs/recipes-devtools/klibc/klibc_2.0.2.bb | |||
@@ -3,19 +3,17 @@ PR = "${INC_PR}.0" | |||
3 | export INST = "${D}" | 3 | export INST = "${D}" |
4 | 4 | ||
5 | do_install() { | 5 | do_install() { |
6 | oe_runmake install | ||
6 | 7 | ||
7 | oe_runmake install | 8 | # the crosscompiler is packaged by klcc-cross |
8 | 9 | # remove klcc | |
9 | # the crosscompiler is packaged by klcc-cross | 10 | rm ${D}${base_bindir}/klcc |
10 | # remove klcc | 11 | # remove now empty dir |
11 | rm ${D}${base_bindir}/klcc | 12 | rmdir ${D}${base_bindir} |
12 | # remove now empty dir | ||
13 | rmdir ${D}${base_bindir} | ||
14 | |||
15 | install -d ${D}${base_libdir} | ||
16 | install -m 755 usr/klibc/klibc-*.so ${D}${base_libdir} | ||
17 | (cd ${D}${base_libdir}; ln -s klibc-*.so klibc.so) | ||
18 | 13 | ||
14 | install -d ${D}${base_libdir} | ||
15 | install -m 755 usr/klibc/klibc-*.so ${D}${base_libdir} | ||
16 | (cd ${D}${base_libdir}; ln -s klibc-*.so klibc.so) | ||
19 | } | 17 | } |
20 | 18 | ||
21 | PACKAGES = "libklibc libklibc-staticdev libklibc-dev" | 19 | PACKAGES = "libklibc libklibc-staticdev libklibc-dev" |
@@ -24,5 +22,5 @@ FILES_libklibc-staticdev = "${base_libdir}/klibc/lib/libc.a" | |||
24 | FILES_libklibc-dev = "${base_libdir}/klibc.so \ | 22 | FILES_libklibc-dev = "${base_libdir}/klibc.so \ |
25 | ${base_libdir}/klibc/lib/* \ | 23 | ${base_libdir}/klibc/lib/* \ |
26 | ${base_libdir}/klibc/include/* \ | 24 | ${base_libdir}/klibc/include/* \ |
27 | " | 25 | " |
28 | require klibc.inc | 26 | require klibc.inc |
diff --git a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.5.0.bb b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.5.0.bb index 5cdd984b2..e00fc3065 100644 --- a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.5.0.bb +++ b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.5.0.bb | |||
@@ -16,7 +16,7 @@ SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=ca39eb1d98e736 | |||
16 | file://libubi.c.patch \ | 16 | file://libubi.c.patch \ |
17 | file://libiniparser.c.patch \ | 17 | file://libiniparser.c.patch \ |
18 | file://ubiformat.c.patch \ | 18 | file://ubiformat.c.patch \ |
19 | " | 19 | " |
20 | 20 | ||
21 | S = "${WORKDIR}/git/" | 21 | S = "${WORKDIR}/git/" |
22 | 22 | ||