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>
This commit is contained in:
parent
03d978b1ac
commit
d7a6e09dc4
|
@ -13,9 +13,9 @@ INITRAMFS_TASK ?= ""
|
||||||
python __anonymous () {
|
python __anonymous () {
|
||||||
kerneltype = d.getVar('KERNEL_IMAGETYPE', True) or ''
|
kerneltype = d.getVar('KERNEL_IMAGETYPE', True) or ''
|
||||||
if kerneltype == 'uImage':
|
if kerneltype == 'uImage':
|
||||||
depends = d.getVar("DEPENDS", True)
|
depends = d.getVar("DEPENDS", True)
|
||||||
depends = "%s u-boot-mkimage-native" % depends
|
depends = "%s u-boot-mkimage-native" % depends
|
||||||
d.setVar("DEPENDS", depends)
|
d.setVar("DEPENDS", depends)
|
||||||
|
|
||||||
image = d.getVar('INITRAMFS_IMAGE', True)
|
image = d.getVar('INITRAMFS_IMAGE', True)
|
||||||
if image:
|
if image:
|
||||||
|
@ -91,7 +91,7 @@ kernel_do_compile() {
|
||||||
do_compile_kernelmodules() {
|
do_compile_kernelmodules() {
|
||||||
unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
|
unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
|
||||||
if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
|
if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
|
||||||
oe_runmake ${PARALLEL_MAKE} modules CC="${KERNEL_CC}" LD="${KERNEL_LD}"
|
oe_runmake ${PARALLEL_MAKE} modules CC="${KERNEL_CC}" LD="${KERNEL_LD}"
|
||||||
else
|
else
|
||||||
bbnote "no modules to compile"
|
bbnote "no modules to compile"
|
||||||
fi
|
fi
|
||||||
|
@ -115,7 +115,7 @@ kernel_do_install() {
|
||||||
|
|
||||||
#
|
#
|
||||||
# Install various kernel output (zImage, map file, config, module support files)
|
# Install various kernel output (zImage, map file, config, module support files)
|
||||||
#
|
#
|
||||||
install -d ${D}/${KERNEL_IMAGEDEST}
|
install -d ${D}/${KERNEL_IMAGEDEST}
|
||||||
install -d ${D}/boot
|
install -d ${D}/boot
|
||||||
install -m 0644 ${KERNEL_OUTPUT} ${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION}
|
install -m 0644 ${KERNEL_OUTPUT} ${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION}
|
||||||
|
@ -188,7 +188,7 @@ kernel_do_install() {
|
||||||
bin_files="arch/powerpc/boot/addnote arch/powerpc/boot/hack-coff \
|
bin_files="arch/powerpc/boot/addnote arch/powerpc/boot/hack-coff \
|
||||||
arch/powerpc/boot/mktree"
|
arch/powerpc/boot/mktree"
|
||||||
for entry in $bin_files; do
|
for entry in $bin_files; do
|
||||||
rm -f $kerneldir/$entry
|
rm -f $kerneldir/$entry
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -386,10 +386,10 @@ python populate_packages_prepend () {
|
||||||
return deps
|
return deps
|
||||||
|
|
||||||
def get_dependencies(file, pattern, format):
|
def get_dependencies(file, pattern, format):
|
||||||
# file no longer includes PKGD
|
# file no longer includes PKGD
|
||||||
file = file.replace(d.getVar('PKGD', True) or '', '', 1)
|
file = file.replace(d.getVar('PKGD', True) or '', '', 1)
|
||||||
# instead is prefixed with /lib/modules/${KERNEL_VERSION}
|
# instead is prefixed with /lib/modules/${KERNEL_VERSION}
|
||||||
file = file.replace("/lib/modules/%s/" % d.getVar('KERNEL_VERSION', True) or '', '', 1)
|
file = file.replace("/lib/modules/%s/" % d.getVar('KERNEL_VERSION', True) or '', '', 1)
|
||||||
|
|
||||||
if module_deps.has_key(file):
|
if module_deps.has_key(file):
|
||||||
import re
|
import re
|
||||||
|
@ -493,11 +493,11 @@ python populate_packages_prepend () {
|
||||||
do_sizecheck() {
|
do_sizecheck() {
|
||||||
if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" ]; then
|
if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" ]; then
|
||||||
size=`ls -l ${KERNEL_OUTPUT} | awk '{ print $5}'`
|
size=`ls -l ${KERNEL_OUTPUT} | awk '{ print $5}'`
|
||||||
if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then
|
if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then
|
||||||
rm ${KERNEL_OUTPUT}
|
rm ${KERNEL_OUTPUT}
|
||||||
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."
|
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."
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
addtask sizecheck before do_install after do_compile
|
addtask sizecheck before do_install after do_compile
|
||||||
|
|
Loading…
Reference in New Issue