diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2012-03-29 16:08:55 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-26 10:05:15 +0100 |
| commit | d7a6e09dc4a6ac119041056741653bf6faaf25b7 (patch) | |
| tree | 6c8874c51d929ad109076b92c899b39a007d307e | |
| parent | 03d978b1ac90ab09682708007fe2f0b542507bcb (diff) | |
| download | poky-d7a6e09dc4a6ac119041056741653bf6faaf25b7.tar.gz | |
kernel.bbclass: unify white spaces
* indentation was with spaces and tabs, unify to use tabs instead of
spaces, for shell code and populate_packages_preppend,
because "python populate_packages" expects tabs (or 8 spaces)
* and use 4 spaces for anonymous python
(From OE-Core rev: 24472a794e1787ebcd700dde66018a31069aa50b)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/kernel.bbclass | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index fefa608500..7c5240bd30 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass | |||
| @@ -13,9 +13,9 @@ INITRAMFS_TASK ?= "" | |||
| 13 | python __anonymous () { | 13 | python __anonymous () { |
| 14 | kerneltype = d.getVar('KERNEL_IMAGETYPE', True) or '' | 14 | kerneltype = d.getVar('KERNEL_IMAGETYPE', True) or '' |
| 15 | if kerneltype == 'uImage': | 15 | if kerneltype == 'uImage': |
| 16 | depends = d.getVar("DEPENDS", True) | 16 | depends = d.getVar("DEPENDS", True) |
| 17 | depends = "%s u-boot-mkimage-native" % depends | 17 | depends = "%s u-boot-mkimage-native" % depends |
| 18 | d.setVar("DEPENDS", depends) | 18 | d.setVar("DEPENDS", depends) |
| 19 | 19 | ||
| 20 | image = d.getVar('INITRAMFS_IMAGE', True) | 20 | image = d.getVar('INITRAMFS_IMAGE', True) |
| 21 | if image: | 21 | if image: |
| @@ -91,7 +91,7 @@ kernel_do_compile() { | |||
| 91 | do_compile_kernelmodules() { | 91 | do_compile_kernelmodules() { |
| 92 | unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE | 92 | unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE |
| 93 | if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then | 93 | if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then |
| 94 | oe_runmake ${PARALLEL_MAKE} modules CC="${KERNEL_CC}" LD="${KERNEL_LD}" | 94 | oe_runmake ${PARALLEL_MAKE} modules CC="${KERNEL_CC}" LD="${KERNEL_LD}" |
| 95 | else | 95 | else |
| 96 | bbnote "no modules to compile" | 96 | bbnote "no modules to compile" |
| 97 | fi | 97 | fi |
| @@ -115,7 +115,7 @@ kernel_do_install() { | |||
| 115 | 115 | ||
| 116 | # | 116 | # |
| 117 | # Install various kernel output (zImage, map file, config, module support files) | 117 | # Install various kernel output (zImage, map file, config, module support files) |
| 118 | # | 118 | # |
| 119 | install -d ${D}/${KERNEL_IMAGEDEST} | 119 | install -d ${D}/${KERNEL_IMAGEDEST} |
| 120 | install -d ${D}/boot | 120 | install -d ${D}/boot |
| 121 | install -m 0644 ${KERNEL_OUTPUT} ${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION} | 121 | install -m 0644 ${KERNEL_OUTPUT} ${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION} |
| @@ -188,7 +188,7 @@ kernel_do_install() { | |||
| 188 | bin_files="arch/powerpc/boot/addnote arch/powerpc/boot/hack-coff \ | 188 | bin_files="arch/powerpc/boot/addnote arch/powerpc/boot/hack-coff \ |
| 189 | arch/powerpc/boot/mktree" | 189 | arch/powerpc/boot/mktree" |
| 190 | for entry in $bin_files; do | 190 | for entry in $bin_files; do |
| 191 | rm -f $kerneldir/$entry | 191 | rm -f $kerneldir/$entry |
| 192 | done | 192 | done |
| 193 | } | 193 | } |
| 194 | 194 | ||
| @@ -386,10 +386,10 @@ python populate_packages_prepend () { | |||
| 386 | return deps | 386 | return deps |
| 387 | 387 | ||
| 388 | def get_dependencies(file, pattern, format): | 388 | def get_dependencies(file, pattern, format): |
| 389 | # file no longer includes PKGD | 389 | # file no longer includes PKGD |
| 390 | file = file.replace(d.getVar('PKGD', True) or '', '', 1) | 390 | file = file.replace(d.getVar('PKGD', True) or '', '', 1) |
| 391 | # instead is prefixed with /lib/modules/${KERNEL_VERSION} | 391 | # instead is prefixed with /lib/modules/${KERNEL_VERSION} |
| 392 | file = file.replace("/lib/modules/%s/" % d.getVar('KERNEL_VERSION', True) or '', '', 1) | 392 | file = file.replace("/lib/modules/%s/" % d.getVar('KERNEL_VERSION', True) or '', '', 1) |
| 393 | 393 | ||
| 394 | if module_deps.has_key(file): | 394 | if module_deps.has_key(file): |
| 395 | import re | 395 | import re |
| @@ -493,11 +493,11 @@ python populate_packages_prepend () { | |||
| 493 | do_sizecheck() { | 493 | do_sizecheck() { |
| 494 | if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" ]; then | 494 | if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" ]; then |
| 495 | size=`ls -l ${KERNEL_OUTPUT} | awk '{ print $5}'` | 495 | size=`ls -l ${KERNEL_OUTPUT} | awk '{ print $5}'` |
| 496 | if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then | 496 | if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then |
| 497 | rm ${KERNEL_OUTPUT} | 497 | rm ${KERNEL_OUTPUT} |
| 498 | die "This kernel (size=$size > ${KERNEL_IMAGE_MAXSIZE}) is too big for your device. Please reduce the size of the kernel by making more of it modular." | 498 | die "This kernel (size=$size > ${KERNEL_IMAGE_MAXSIZE}) is too big for your device. Please reduce the size of the kernel by making more of it modular." |
| 499 | fi | 499 | fi |
| 500 | fi | 500 | fi |
| 501 | } | 501 | } |
| 502 | 502 | ||
| 503 | addtask sizecheck before do_install after do_compile | 503 | addtask sizecheck before do_install after do_compile |
