[meta-freescale] [meta-fsl-ppc master] replace tab with space character to fix warnings
Zhenhua Luo
zhenhua.luo at freescale.com
Mon Mar 4 01:45:08 PST 2013
fix following warnings:
WARNING: Variable clean_make contains tabs, please remove these ...
WARNING: Variable remove_workdir contains tabs, please remove these ...
WARNING: Variable clean_builddir contains tabs, please remove these ...
WARNING: Variable clean_stamps contains tabs, please remove these ...
Signed-off-by: Zhenhua Luo <zhenhua.luo at freescale.com>
---
recipes-kernel/linux/linux-qoriq-sdk-headers.bb | 16 +--
recipes-kernel/linux/linux-qoriq-sdk.bb | 6 +-
recipes-kernel/u-boot/u-boot_git.bb | 150 +++++++++++------------
recipes-tools/embedded-hv/hypervisor_git.bb | 50 ++++----
recipes-tools/rcw/rcw_git.bb | 16 +--
recipes-tools/usdpaa/usdpaa_git.bb | 14 +--
recipes-ucode/fm-ucode/fm-ucode_git.bb | 10 +-
recipes-ucode/fmlib/fmlib_git.bb | 10 +-
8 files changed, 140 insertions(+), 132 deletions(-)
diff --git a/recipes-kernel/linux/linux-qoriq-sdk-headers.bb b/recipes-kernel/linux/linux-qoriq-sdk-headers.bb
index b1cbb8d..ee1b977 100644
--- a/recipes-kernel/linux/linux-qoriq-sdk-headers.bb
+++ b/recipes-kernel/linux/linux-qoriq-sdk-headers.bb
@@ -11,20 +11,22 @@ RRECOMMENDS_${PN}-dbg = "linux-libc-headers-dev (= ${EXTENDPKGV})"
require recipes-kernel/linux/linux-qoriq-sdk.inc
+PR = "r1"
+
inherit kernel-arch
do_configure() {
- oe_runmake allnoconfig
+ oe_runmake allnoconfig
}
do_compile () {
}
do_install() {
- oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix}
- # Kernel should not be exporting this header
- rm -f ${D}${exec_prefix}/include/scsi/scsi.h
-
- # The ..install.cmd conflicts between various configure runs
- find ${D}${includedir} -name ..install.cmd | xargs rm -f
+ oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix}
+ # Kernel should not be exporting this header
+ rm -f ${D}${exec_prefix}/include/scsi/scsi.h
+
+ # The ..install.cmd conflicts between various configure runs
+ find ${D}${includedir} -name ..install.cmd | xargs rm -f
}
diff --git a/recipes-kernel/linux/linux-qoriq-sdk.bb b/recipes-kernel/linux/linux-qoriq-sdk.bb
index 1971f15..ed01535 100644
--- a/recipes-kernel/linux/linux-qoriq-sdk.bb
+++ b/recipes-kernel/linux/linux-qoriq-sdk.bb
@@ -13,7 +13,9 @@ PR = "r9"
SRC_URI += "file://fix_getrusage_for_perf.patch \
"
+PR = "r1"
+
do_configure_prepend() {
- # copy desired defconfig so we pick it up for the real kernel_do_configure
- cp ${KERNEL_DEFCONFIG} ${B}/.config
+ # copy desired defconfig so we pick it up for the real kernel_do_configure
+ cp ${KERNEL_DEFCONFIG} ${B}/.config
}
diff --git a/recipes-kernel/u-boot/u-boot_git.bb b/recipes-kernel/u-boot/u-boot_git.bb
index bc19bb4..b246459 100644
--- a/recipes-kernel/u-boot/u-boot_git.bb
+++ b/recipes-kernel/u-boot/u-boot_git.bb
@@ -5,7 +5,7 @@ PROVIDES = "virtual/bootloader"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
-PR = "r29"
+PR = "r30"
INHIBIT_DEFAULT_DEPS = "1"
DEPENDS = "boot-format-native virtual/${TARGET_PREFIX}gcc libgcc"
@@ -16,11 +16,11 @@ SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git"
SRCREV_e6500 = "9040d1ee41fc29fc7e9796bdfb59612f80bc1ee4"
SRCREV_e6500-64b = "9040d1ee41fc29fc7e9796bdfb59612f80bc1ee4"
python () {
- ml = d.getVar("MULTILIB_VARIANTS", True)
- arch = d.getVar("OVERRIDES", True)
+ ml = d.getVar("MULTILIB_VARIANTS", True)
+ arch = d.getVar("OVERRIDES", True)
- if ("e5500-64b:" in arch or "e6500-64b:" in arch) and not "lib32" in ml:
- raise bb.parse.SkipPackage("Building the u-boot for this arch requires multilib to be enabled")
+ if ("e5500-64b:" in arch or "e6500-64b:" in arch) and not "lib32" in ml:
+ raise bb.parse.SkipPackage("Building the u-boot for this arch requires multilib to be enabled")
}
DEPENDS_append_e5500-64b = " lib32-gcc-cross lib32-libgcc"
@@ -44,89 +44,89 @@ USRC ?= ""
S = '${@base_conditional("USRC", "", "${WORKDIR}/git", "${USRC}", d)}'
do_compile () {
- unset LDFLAGS
- unset CFLAGS
- unset CPPFLAGS
-
- if [ "x${UBOOT_MACHINES}" == "x" ]; then
- UBOOT_MACHINES=${UBOOT_MACHINE}
- fi
-
- for board in ${UBOOT_MACHINES}; do
- oe_runmake O=${board} distclean
- oe_runmake O=${board} ${board}
- oe_runmake O=${board} all
-
- case "${board}" in
- *SDCARD*) UBOOT_TARGET="u-boot-sd";;
- *SPIFLASH*) UBOOT_TARGET="u-boot-spi";;
- *NAND*) UBOOT_TARGET="u-boot-nand";;
- *) UBOOT_TARGET="";;
- esac
-
- if [ "x${UBOOT_TARGET}" != "x" ]; then
- if [ "${UBOOT_TARGET}" == "u-boot-sd" ]; then
- cp ${S}/${board}/u-boot.bin ${S}/${board}/${UBOOT_TARGET}.bin
+ unset LDFLAGS
+ unset CFLAGS
+ unset CPPFLAGS
+
+ if [ "x${UBOOT_MACHINES}" == "x" ]; then
+ UBOOT_MACHINES=${UBOOT_MACHINE}
+ fi
+
+ for board in ${UBOOT_MACHINES}; do
+ oe_runmake O=${board} distclean
+ oe_runmake O=${board} ${board}
+ oe_runmake O=${board} all
+
+ case "${board}" in
+ *SDCARD*) UBOOT_TARGET="u-boot-sd";;
+ *SPIFLASH*) UBOOT_TARGET="u-boot-spi";;
+ *NAND*) UBOOT_TARGET="u-boot-nand";;
+ *) UBOOT_TARGET="";;
+ esac
+
+ if [ "x${UBOOT_TARGET}" != "x" ]; then
+ if [ "${UBOOT_TARGET}" == "u-boot-sd" ]; then
+ cp ${S}/${board}/u-boot.bin ${S}/${board}/${UBOOT_TARGET}.bin
elif [ "${UBOOT_TARGET}" == "u-boot-nand" ];then
- if [ "${DEFAULTTUNE}" != "ppce500v2" ];then
+ if [ "${DEFAULTTUNE}" != "ppce500v2" ];then
cp ${S}/${board}/u-boot.bin ${S}/${board}/${UBOOT_TARGET}.bin
fi
- else
- if [ -n "${BOOTFORMAT_CONFIG}" ];then
+ else
+ if [ -n "${BOOTFORMAT_CONFIG}" ];then
${STAGING_BINDIR_NATIVE}/boot_format \
- ${STAGING_DATADIR_NATIVE}/boot_format/${BOOTFORMAT_CONFIG} \
- ${S}/${board}/u-boot.bin -spi ${S}/${board}/${UBOOT_TARGET}.bin
+ ${STAGING_DATADIR_NATIVE}/boot_format/${BOOTFORMAT_CONFIG} \
+ ${S}/${board}/u-boot.bin -spi ${S}/${board}/${UBOOT_TARGET}.bin
else
cp ${S}/${board}/u-boot.bin ${S}/${board}/${UBOOT_TARGET}.bin
fi
- fi
- fi
- done
+ fi
+ fi
+ done
}
do_install(){
- if [ "x${UBOOT_MACHINES}" == "x" ]; then
- UBOOT_MACHINES=${UBOOT_MACHINE}
- fi
-
- for board in ${UBOOT_MACHINES}; do
- case "${board}" in
- *SDCARD*) UBOOT_TARGET="u-boot-sd";;
- *SPIFLASH*) UBOOT_TARGET="u-boot-spi";;
- *NAND*) UBOOT_TARGET="u-boot-nand";;
- *) UBOOT_TARGET="u-boot";;
- esac
-
- if [ -f ${S}/${board}/${UBOOT_TARGET}.bin ]; then
- mkdir -p ${D}/boot/
- install ${S}/${board}/${UBOOT_TARGET}.bin ${D}/boot/${UBOOT_TARGET}-${board}-${PV}-${PR}.bin
- ln -sf ${UBOOT_TARGET}-${board}-${PV}-${PR}.bin ${D}/boot/${UBOOT_TARGET}.bin
- fi
- done
+ if [ "x${UBOOT_MACHINES}" == "x" ]; then
+ UBOOT_MACHINES=${UBOOT_MACHINE}
+ fi
+
+ for board in ${UBOOT_MACHINES}; do
+ case "${board}" in
+ *SDCARD*) UBOOT_TARGET="u-boot-sd";;
+ *SPIFLASH*) UBOOT_TARGET="u-boot-spi";;
+ *NAND*) UBOOT_TARGET="u-boot-nand";;
+ *) UBOOT_TARGET="u-boot";;
+ esac
+
+ if [ -f ${S}/${board}/${UBOOT_TARGET}.bin ]; then
+ mkdir -p ${D}/boot/
+ install ${S}/${board}/${UBOOT_TARGET}.bin ${D}/boot/${UBOOT_TARGET}-${board}-${PV}-${PR}.bin
+ ln -sf ${UBOOT_TARGET}-${board}-${PV}-${PR}.bin ${D}/boot/${UBOOT_TARGET}.bin
+ fi
+ done
}
do_deploy(){
- if [ "x${UBOOT_MACHINES}" == "x" ]; then
- UBOOT_MACHINES=${UBOOT_MACHINE}
- fi
-
- for board in ${UBOOT_MACHINES}; do
- case "${board}" in
- *SDCARD*) UBOOT_TARGET="u-boot-sd";;
- *SPIFLASH*) UBOOT_TARGET="u-boot-spi";;
- *NAND*) UBOOT_TARGET="u-boot-nand";;
- *) UBOOT_TARGET="u-boot";;
- esac
-
- if [ -f ${S}/${board}/${UBOOT_TARGET}.bin ]; then
- mkdir -p ${DEPLOYDIR}
- install ${S}/${board}/${UBOOT_TARGET}.bin ${DEPLOYDIR}/${UBOOT_TARGET}-${board}-${PV}-${PR}.bin
-
- cd ${DEPLOYDIR}
- rm -f ${UBOOT_TARGET}-${board}.bin
- ln -sf ${UBOOT_TARGET}-${board}-${PV}-${PR}.bin ${UBOOT_TARGET}-${board}.bin
- fi
- done
+ if [ "x${UBOOT_MACHINES}" == "x" ]; then
+ UBOOT_MACHINES=${UBOOT_MACHINE}
+ fi
+
+ for board in ${UBOOT_MACHINES}; do
+ case "${board}" in
+ *SDCARD*) UBOOT_TARGET="u-boot-sd";;
+ *SPIFLASH*) UBOOT_TARGET="u-boot-spi";;
+ *NAND*) UBOOT_TARGET="u-boot-nand";;
+ *) UBOOT_TARGET="u-boot";;
+ esac
+
+ if [ -f ${S}/${board}/${UBOOT_TARGET}.bin ]; then
+ mkdir -p ${DEPLOYDIR}
+ install ${S}/${board}/${UBOOT_TARGET}.bin ${DEPLOYDIR}/${UBOOT_TARGET}-${board}-${PV}-${PR}.bin
+
+ cd ${DEPLOYDIR}
+ rm -f ${UBOOT_TARGET}-${board}.bin
+ ln -sf ${UBOOT_TARGET}-${board}-${PV}-${PR}.bin ${UBOOT_TARGET}-${board}.bin
+ fi
+ done
}
addtask deploy after do_install
diff --git a/recipes-tools/embedded-hv/hypervisor_git.bb b/recipes-tools/embedded-hv/hypervisor_git.bb
index 25942ee..4de6c3a 100644
--- a/recipes-tools/embedded-hv/hypervisor_git.bb
+++ b/recipes-tools/embedded-hv/hypervisor_git.bb
@@ -3,7 +3,7 @@ SECTION = "embedded-hv"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://README;endline=22;md5=0655bbc3b7d7166c30c87208b4e23cf0"
-PR = "r3"
+PR = "r4"
DEPENDS = "u-boot-mkimage-native"
@@ -13,12 +13,12 @@ S = "${WORKDIR}/git"
# TODO: fix dtc to use the already built package
SRC_URI = " \
- git://git.freescale.com/ppc/sdk/hypervisor/hypervisor.git;name=hypervisor \
- git://git.freescale.com/ppc/sdk/hypervisor/kconfig.git;name=kconfig;destsuffix=git/kconfig \
- git://git.freescale.com/ppc/sdk/hypervisor/libos.git;name=libos;destsuffix=git/libos \
- git://www.jdl.com/software/dtc.git;name=dtc;destsuffix=dtc \
- file://81-fsl-embedded-hv.rules \
- "
+ git://git.freescale.com/ppc/sdk/hypervisor/hypervisor.git;name=hypervisor \
+ git://git.freescale.com/ppc/sdk/hypervisor/kconfig.git;name=kconfig;destsuffix=git/kconfig \
+ git://git.freescale.com/ppc/sdk/hypervisor/libos.git;name=libos;destsuffix=git/libos \
+ git://www.jdl.com/software/dtc.git;name=dtc;destsuffix=dtc \
+ file://81-fsl-embedded-hv.rules \
+"
SRCREV_FORMAT="hypervisor"
SRCREV = "d3f8d79ca252fc17d4a9ca5f44f563c8a291a9a1"
@@ -33,39 +33,39 @@ DEFCONFIG_powerpc64 = "64bit_defconfig"
inherit cml1
do_configure () {
- oe_runmake ${DEFCONFIG}
+ oe_runmake ${DEFCONFIG}
}
do_compile () {
- oe_runmake
- oe_runmake partman
+ oe_runmake
+ oe_runmake partman
}
do_install () {
- install -d ${D}/${bindir}
- install ${S}/output/bin/linux/partman ${D}/${bindir}/partman
+ install -d ${D}/${bindir}
+ install ${S}/output/bin/linux/partman ${D}/${bindir}/partman
- install -d ${D}${sysconfdir}/udev/rules.d
- install -m 0644 ${WORKDIR}/81-fsl-embedded-hv.rules ${D}${sysconfdir}/udev/rules.d
+ install -d ${D}${sysconfdir}/udev/rules.d
+ install -m 0644 ${WORKDIR}/81-fsl-embedded-hv.rules ${D}${sysconfdir}/udev/rules.d
- install -d ${D}/boot/hv
- install ${S}/output/.config ${D}/boot/hv/hypervisor.config
- install -m 644 ${S}/output/bin/hv ${S}/output/bin/hv.map \
- ${S}/output/bin/hv.uImage ${S}/output/bin/hv.bin \
- ${D}/boot/hv/
+ install -d ${D}/boot/hv
+ install ${S}/output/.config ${D}/boot/hv/hypervisor.config
+ install -m 644 ${S}/output/bin/hv ${S}/output/bin/hv.map \
+ ${S}/output/bin/hv.uImage ${S}/output/bin/hv.bin \
+ ${D}/boot/hv/
}
do_deploy () {
- install -d ${DEPLOYDIR}/hv/
- install ${S}/output/.config ${DEPLOYDIR}/hv/hypervisor.config
- install -m 644 ${S}/output/bin/hv ${S}/output/bin/hv.map \
- ${S}/output/bin/hv.uImage ${S}/output/bin/hv.bin \
- ${DEPLOYDIR}/hv/
+ install -d ${DEPLOYDIR}/hv/
+ install ${S}/output/.config ${DEPLOYDIR}/hv/hypervisor.config
+ install -m 644 ${S}/output/bin/hv ${S}/output/bin/hv.map \
+ ${S}/output/bin/hv.uImage ${S}/output/bin/hv.bin \
+ ${DEPLOYDIR}/hv/
}
addtask deploy before do_build after do_install
do_deploy_append() {
- rm -f ${S}/../hv
+ rm -f ${S}/../hv
}
ALLOW_EMPTY_${PN} = "1"
diff --git a/recipes-tools/rcw/rcw_git.bb b/recipes-tools/rcw/rcw_git.bb
index 2bbc025..72adac9 100644
--- a/recipes-tools/rcw/rcw_git.bb
+++ b/recipes-tools/rcw/rcw_git.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Reset Control Words (RCW)"
SECTION = "rcw"
LICENSE = "BSD"
-PR = "r7"
+PR = "r8"
LIC_FILES_CHKSUM = "file://rcw.py;beginline=8;endline=28;md5=9ba0b28922dd187b06b6c8ebcfdd208e"
@@ -19,17 +19,17 @@ SRC_URI = "git://git.freescale.com/ppc/sdk/rcw.git"
S = "${WORKDIR}/git"
do_install () {
- make install
+ make install
- M=`echo ${MACHINE} | sed s/-64b//g`
- install -d ${D}/boot/rcw
- cp -r ${S}/${M}/${M}/* ${D}/boot/rcw
+ M=`echo ${MACHINE} | sed s/-64b//g`
+ install -d ${D}/boot/rcw
+ cp -r ${S}/${M}/${M}/* ${D}/boot/rcw
}
do_deploy () {
- M=`echo ${MACHINE} | sed s/-64b//g`
- install -d ${DEPLOYDIR}/rcw
- cp -r ${S}/${M}/${M}/* ${DEPLOYDIR}/rcw
+ M=`echo ${MACHINE} | sed s/-64b//g`
+ install -d ${DEPLOYDIR}/rcw
+ cp -r ${S}/${M}/${M}/* ${DEPLOYDIR}/rcw
}
addtask deploy after do_install
diff --git a/recipes-tools/usdpaa/usdpaa_git.bb b/recipes-tools/usdpaa/usdpaa_git.bb
index 731f01b..ec9c4da 100644
--- a/recipes-tools/usdpaa/usdpaa_git.bb
+++ b/recipes-tools/usdpaa/usdpaa_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "User-Space Data-Path Acceleration Architecture drivers"
SECTION = "usdpaa"
LICENSE = "BSD & GPLv2"
LIC_FILES_CHKSUM = "file://Makefile;endline=30;md5=39e58bedc879163c9338596e52df5b1f"
-PR = "r1"
+PR = "r2"
inherit pkgconfig
@@ -19,15 +19,15 @@ S = "${WORKDIR}/git"
EXTRA_OEMAKE = 'V=1 CC="${CC}" LD="${LD}" AR="${AR}"'
do_compile_prepend () {
- export ARCH=${TARGET_ARCH}
- export LIBXML2_CFLAGS="$(pkg-config --cflags libxml-2.0)"
- export LIBXML2_LDFLAGS="$(pkg-config --libs --static libxml-2.0)"
- export LIBEDIT_CFLAGS="$(pkg-config --cflags libedit)"
- export LIBEDIT_LDFLAGS="$(pkg-config --libs --static libedit)"
+ export ARCH=${TARGET_ARCH}
+ export LIBXML2_CFLAGS="$(pkg-config --cflags libxml-2.0)"
+ export LIBXML2_LDFLAGS="$(pkg-config --libs --static libxml-2.0)"
+ export LIBEDIT_CFLAGS="$(pkg-config --cflags libedit)"
+ export LIBEDIT_LDFLAGS="$(pkg-config --libs --static libedit)"
}
do_install () {
- oe_runmake ARCH=${TARGET_ARCH} install DESTDIR=${D}
+ oe_runmake ARCH=${TARGET_ARCH} install DESTDIR=${D}
}
PARALLEL_MAKE_pn-${PN} = ""
diff --git a/recipes-ucode/fm-ucode/fm-ucode_git.bb b/recipes-ucode/fm-ucode/fm-ucode_git.bb
index 89c43ba..bb148e3 100644
--- a/recipes-ucode/fm-ucode/fm-ucode_git.bb
+++ b/recipes-ucode/fm-ucode/fm-ucode_git.bb
@@ -3,6 +3,8 @@ SECTION = "fm-ucode"
LICENSE = "Freescale EULA"
LIC_FILES_CHKSUM = "file://EULA;md5=60037ccba533a5995e8d1a838d85799c"
+PR = "r1"
+
FMAN_UCODE_INSTALL_FILE = "fsl_fman_ucode"
FMAN_UCODE_INSTALL_FILE_append_p2041rdb = "_P2041"
FMAN_UCODE_INSTALL_FILE_append_p4080ds= "_P4080"
@@ -31,13 +33,13 @@ S = "${WORKDIR}/git"
ALLOW_EMPTY_${PN} = "1"
do_install () {
- install -d ${D}/boot
- install -m 644 ${FMAN_UCODE_INSTALL_FILE}*.bin ${D}/boot/
+ install -d ${D}/boot
+ install -m 644 ${FMAN_UCODE_INSTALL_FILE}*.bin ${D}/boot/
}
do_deploy () {
- install -d ${DEPLOYDIR}/
- install -m 644 ${FMAN_UCODE_INSTALL_FILE}*.bin ${DEPLOYDIR}/
+ install -d ${DEPLOYDIR}/
+ install -m 644 ${FMAN_UCODE_INSTALL_FILE}*.bin ${DEPLOYDIR}/
}
addtask deploy before do_build after do_install
diff --git a/recipes-ucode/fmlib/fmlib_git.bb b/recipes-ucode/fmlib/fmlib_git.bb
index 74eb204..e65c6b9 100644
--- a/recipes-ucode/fmlib/fmlib_git.bb
+++ b/recipes-ucode/fmlib/fmlib_git.bb
@@ -3,6 +3,8 @@ SECTION = "fman"
LICENSE = "BSD & GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=3f16fa8e677e45af3127c5c4bafc3c00"
+PR = "r1"
+
DEPENDS = "linux-libc-headers"
DEPENDS_virtclass-native = ""
@@ -19,19 +21,19 @@ EXTRA_OEMAKE = "DESTDIR=${D} PREFIX=${prefix} LIB_DEST_DIR=${libdir} \
CROSS_COMPILE=${TARGET_PREFIX} KERNEL_SRC=${STAGING_EXECPREFIXDIR}"
do_compile () {
- oe_runmake libfm-${TARGET_ARCH_FMLIB}.a
+ oe_runmake libfm-${TARGET_ARCH_FMLIB}.a
}
do_compile_virtclass-native () {
}
do_install () {
- oe_runmake install-libfm-${TARGET_ARCH_FMLIB}
+ oe_runmake install-libfm-${TARGET_ARCH_FMLIB}
}
do_install_virtclass-native () {
- install -d ${D}/${includedir}
- cp -rf ${S}/include/* ${D}/${includedir}
+ install -d ${D}/${includedir}
+ cp -rf ${S}/include/* ${D}/${includedir}
}
ALLOW_EMPTY = "1"
--
1.7.9.5
More information about the meta-freescale
mailing list