mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-26 19:47:17 +00:00
Code Issues Projects Releases Wiki Activity

kernel.bbclass: unify white spaces

Browse Source 
* indentation was with spaces and tabs, unify to use tabs instead of
  spaces, because "python populate_packages" expects tabs (or 8 spaces)
  and we're doing populate_packages_preppend here

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa
2012-03-29 06:59:12 +02:00
committed by Koen Kooi
parent 4e9eb33068
commit d110784db8
1 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/classes/kernel.bbclass
+39 -39
View File
@@ -11,20 +11,20 @@ INITRAMFS_IMAGE ?= ""
INITRAMFS_TASK ?= "" 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:
d.setVar('INITRAMFS_TASK', '${INITRAMFS_IMAGE}:do_rootfs') d.setVar('INITRAMFS_TASK', '${INITRAMFS_IMAGE}:do_rootfs')
machine_kernel_pr = d.getVar('MACHINE_KERNEL_PR', True) machine_kernel_pr = d.getVar('MACHINE_KERNEL_PR', True)
if machine_kernel_pr: if machine_kernel_pr:
d.setVar('PR', machine_kernel_pr) d.setVar('PR', machine_kernel_pr)
} }
inherit kernel-arch deploy inherit kernel-arch deploy
@@ -96,7 +96,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
@@ -120,7 +120,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}
@@ -193,7 +193,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
} }
@@ -391,10 +391,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
@@ -498,34 +498,34 @@ 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
do_uboot_mkimage() { do_uboot_mkimage() {
if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then
ENTRYPOINT=${UBOOT_ENTRYPOINT} ENTRYPOINT=${UBOOT_ENTRYPOINT}
if test -n "${UBOOT_ENTRYSYMBOL}"; then if test -n "${UBOOT_ENTRYSYMBOL}"; then
ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \ ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \
awk '$3=="${UBOOT_ENTRYSYMBOL}" {print $1}'` awk '$3=="${UBOOT_ENTRYSYMBOL}" {print $1}'`
fi fi
if test -e arch/${ARCH}/boot/compressed/vmlinux ; then if test -e arch/${ARCH}/boot/compressed/vmlinux ; then
${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin ${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin
uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C none -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin arch/${ARCH}/boot/uImage uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C none -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin arch/${ARCH}/boot/uImage
rm -f linux.bin rm -f linux.bin
else else
${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin
rm -f linux.bin.gz rm -f linux.bin.gz
gzip -9 linux.bin gzip -9 linux.bin
uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C gzip -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz arch/${ARCH}/boot/uImage uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C gzip -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz arch/${ARCH}/boot/uImage
rm -f linux.bin.gz rm -f linux.bin.gz
fi fi
fi fi
} }
addtask uboot_mkimage before do_install after do_compile addtask uboot_mkimage before do_install after do_compile