From 4f980553868ff8f99acf61eba3a1c578c7a1c02b Mon Sep 17 00:00:00 2001 From: Ting Liu Date: Fri, 11 Jul 2014 02:49:10 -0500 Subject: inherit qoriq_build_64bit_kernel for kernel/module recipes ppce6500 is a specific core which only support 64bit kernel, the duplicate hack codes were packaged into qoriq_build_64bit_kernel.bbclass, use it. Signed-off-by: Ting Liu --- meta-fsl-ppc/recipes-bsp/ipc/ipc-modules.inc | 20 +---------------- meta-fsl-ppc/recipes-kernel/asf/asf_git.bb | 21 +----------------- meta-fsl-ppc/recipes-kernel/ceetm/ceetm_git.bb | 21 +----------------- meta-fsl-ppc/recipes-kernel/linux/linux-qoriq.inc | 25 +--------------------- .../recipes-kernel/lttng/lttng-modules_%.bbappend | 18 +--------------- .../recipes-kernel/pkc-host/pkc-host_git.bb | 21 +----------------- .../recipes-kernel/qoriq-debug/qoriq-debug_git.bb | 21 +----------------- .../recipes-kernel/skmm-host/skmm-host_git.bb | 21 +----------------- 8 files changed, 8 insertions(+), 160 deletions(-) (limited to 'meta-fsl-ppc') diff --git a/meta-fsl-ppc/recipes-bsp/ipc/ipc-modules.inc b/meta-fsl-ppc/recipes-bsp/ipc/ipc-modules.inc index 015a91bc..3d7dfa66 100644 --- a/meta-fsl-ppc/recipes-bsp/ipc/ipc-modules.inc +++ b/meta-fsl-ppc/recipes-bsp/ipc/ipc-modules.inc @@ -5,27 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fa38cd73d71527dc6efb546474f64d10" require ipc.inc -inherit module +inherit module qoriq_build_64bit_kernel S = "${WORKDIR}/git" -python () { - ma = d.getVar("DISTRO_FEATURES", True) - arch = d.getVar("OVERRIDES", True) - - # the : after the arch is to skip the message on 64b - if not "multiarch" in ma and ("e5500:" in arch or "e6500:" in arch): - raise bb.parse.SkipPackage("Building the kernel for this arch requires multiarch to be in DISTRO_FEATURES") - - promote_kernel = d.getVar('BUILD_64BIT_KERNEL') - - if promote_kernel == "1": - d.setVar('KERNEL_CC_append', ' -m64') - d.setVar('KERNEL_LD_append', ' -melf64ppc') - - error_qa = d.getVar('ERROR_QA', True) - if 'arch' in error_qa: - d.setVar('ERROR_QA', error_qa.replace(' arch', '')) -} do_compile_prepend () { cd ${S}/kernel diff --git a/meta-fsl-ppc/recipes-kernel/asf/asf_git.bb b/meta-fsl-ppc/recipes-kernel/asf/asf_git.bb index 743ce62e..9597257c 100644 --- a/meta-fsl-ppc/recipes-kernel/asf/asf_git.bb +++ b/meta-fsl-ppc/recipes-kernel/asf/asf_git.bb @@ -9,32 +9,13 @@ SRCREV = "f107bc7dac7fe74d765dc09f66dca84951921d2c" DEPENDS="virtual/kernel" RDEPENDS_${PN} += "ipsec-tools" -inherit module +inherit module qoriq_build_64bit_kernel S = "${WORKDIR}/git/asfmodule" EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" export KERNEL_PATH = "${STAGING_KERNEL_DIR}" -python () { - ma = d.getVar("DISTRO_FEATURES", True) - arch = d.getVar("OVERRIDES", True) - - # the : after the arch is to skip the message on 64b - if not "multiarch" in ma and "e6500:" in arch: - raise bb.parse.SkipPackage("Building the kernel for this arch requires multiarch to be in DISTRO_FEATURES") - - promote_kernel = d.getVar('BUILD_64BIT_KERNEL') - - if promote_kernel == "1": - d.setVar('KERNEL_CC_append', ' -m64') - d.setVar('KERNEL_LD_append', ' -melf64ppc') - - error_qa = d.getVar('ERROR_QA', True) - if 'arch' in error_qa: - d.setVar('ERROR_QA', error_qa.replace(' arch', '')) -} - do_install(){ mkdir -p ${D}/usr/driver/asf cp -rf ${S}/bin/full ${D}/usr/driver/asf diff --git a/meta-fsl-ppc/recipes-kernel/ceetm/ceetm_git.bb b/meta-fsl-ppc/recipes-kernel/ceetm/ceetm_git.bb index 7620cdbc..266261eb 100644 --- a/meta-fsl-ppc/recipes-kernel/ceetm/ceetm_git.bb +++ b/meta-fsl-ppc/recipes-kernel/ceetm/ceetm_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b5881ecf398da8a03a3f4c501e29d287" DEPENDS="virtual/kernel" -inherit module +inherit module qoriq_build_64bit_kernel SRC_URI = "git://git.freescale.com/ppc/sdk/ceetm.git;nobranch=1" SRCREV = "ecf55c9ca0cd42a212653e1f99c19cd611e3a008" @@ -14,25 +14,6 @@ S = "${WORKDIR}/git" EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} SYSROOT=${STAGING_DIR_TARGET}" export KERNEL_PATH = "${STAGING_KERNEL_DIR}" -python () { - ma = d.getVar("DISTRO_FEATURES", True) - arch = d.getVar("OVERRIDES", True) - - # the : after the arch is to skip the message on 64b - if not "multiarch" in ma and "e6500:" in arch: - raise bb.parse.SkipPackage("Building the kernel for this arch requires multiarch to be in DISTRO_FEATURES") - - promote_kernel = d.getVar('BUILD_64BIT_KERNEL') - - if promote_kernel == "1": - d.setVar('KERNEL_CC_append', ' -m64') - d.setVar('KERNEL_LD_append', ' -melf64ppc') - - error_qa = d.getVar('ERROR_QA', True) - if 'arch' in error_qa: - d.setVar('ERROR_QA', error_qa.replace(' arch', '')) -} - do_install(){ mkdir -p ${D}/usr/driver/ceetm mkdir -p ${D}/${libdir}/tc diff --git a/meta-fsl-ppc/recipes-kernel/linux/linux-qoriq.inc b/meta-fsl-ppc/recipes-kernel/linux/linux-qoriq.inc index 00fe526f..9e463ddb 100644 --- a/meta-fsl-ppc/recipes-kernel/linux/linux-qoriq.inc +++ b/meta-fsl-ppc/recipes-kernel/linux/linux-qoriq.inc @@ -1,4 +1,4 @@ -inherit kernel +inherit kernel qoriq_build_64bit_kernel require recipes-kernel/linux/linux-dtb.inc DESCRIPTION = "Linux kernel for Freescale platforms" @@ -9,29 +9,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" KSRC ?= "" S = '${@base_conditional("KSRC", "", "${WORKDIR}/git", "${KSRC}", d)}' -python () { - ma = d.getVar("DISTRO_FEATURES", True) - arch = d.getVar("OVERRIDES", True) - - # the : after the arch is to skip the message on 64b - if not "multiarch" in ma and ("e5500:" in arch or "e6500:" in arch): - raise bb.parse.SkipPackage("Building the kernel for this arch requires multiarch to be in DISTRO_FEATURES") - - promote_kernel = d.getVar('BUILD_64BIT_KERNEL') - - if promote_kernel == "1": - d.setVar('KERNEL_CC_append', ' -m64') - d.setVar('KERNEL_LD_append', ' -melf64ppc') - - error_qa = d.getVar('ERROR_QA', True) - if 'arch' in error_qa: - d.setVar('ERROR_QA', error_qa.replace(' arch', '')) - - all_qa = d.getVar('ALL_QA', True) - if 'arch' in all_qa: - d.setVar('ALL_QA', all_qa.replace(' arch', '')) -} - DEPENDS_append = " libgcc" KERNEL_CC_append = " ${TOOLCHAIN_OPTIONS}" KERNEL_LD_append = " ${TOOLCHAIN_OPTIONS}" diff --git a/meta-fsl-ppc/recipes-kernel/lttng/lttng-modules_%.bbappend b/meta-fsl-ppc/recipes-kernel/lttng/lttng-modules_%.bbappend index 5415f16e..5ff765d4 100644 --- a/meta-fsl-ppc/recipes-kernel/lttng/lttng-modules_%.bbappend +++ b/meta-fsl-ppc/recipes-kernel/lttng/lttng-modules_%.bbappend @@ -1,18 +1,2 @@ -inherit distro_features_check +inherit qoriq_build_64bit_kernel -REQUIRED_DISTRO_FEATURES_append_e6500 ?= "multiarch" - -python () { - - promote_kernel = d.getVar('BUILD_64BIT_KERNEL') - - if promote_kernel == "1": - d.appendVar('KERNEL_CC', ' -m64') - d.appendVar('KERNEL_LD', ' -melf64ppc') - - - error_qa = d.getVar('ERROR_QA', True) - if 'arch' in error_qa: - d.setVar('ERROR_QA', error_qa.replace(' arch', '')) - -} diff --git a/meta-fsl-ppc/recipes-kernel/pkc-host/pkc-host_git.bb b/meta-fsl-ppc/recipes-kernel/pkc-host/pkc-host_git.bb index 9535005d..2e579c1e 100644 --- a/meta-fsl-ppc/recipes-kernel/pkc-host/pkc-host_git.bb +++ b/meta-fsl-ppc/recipes-kernel/pkc-host/pkc-host_git.bb @@ -3,7 +3,7 @@ SECTION = "pkc-host" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://Makefile;endline=30;md5=6a26ed8e76a8ea2e019c525369ed0f03" -inherit module +inherit module qoriq_build_64bit_kernel SRC_URI = "git://git.freescale.com/ppc/sdk/pkc-host.git;nobranch=1" SRCREV = "cae512c94e2a26cc6b0d6393d307cdea2d7282c9" @@ -12,25 +12,6 @@ S = "${WORKDIR}/git" EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"' -python () { - ma = d.getVar("DISTRO_FEATURES", True) - arch = d.getVar("OVERRIDES", True) - - # the : after the arch is to skip the message on 64b - if not "multiarch" in ma and ("e5500:" in arch or "e6500:" in arch): - raise bb.parse.SkipPackage("Building the kernel for this arch requires multiarch to be in DISTRO_FEATURES") - - promote_kernel = d.getVar('BUILD_64BIT_KERNEL') - - if promote_kernel == "1": - d.setVar('KERNEL_CC_append', ' -m64') - d.setVar('KERNEL_LD_append', ' -melf64ppc') - - error_qa = d.getVar('ERROR_QA', True) - if 'arch' in error_qa: - d.setVar('ERROR_QA', error_qa.replace(' arch', '')) -} - do_install() { install -d ${D}/lib/modules/c2x0 install -d ${D}/etc/crypto diff --git a/meta-fsl-ppc/recipes-kernel/qoriq-debug/qoriq-debug_git.bb b/meta-fsl-ppc/recipes-kernel/qoriq-debug/qoriq-debug_git.bb index 5dd2468d..c08f057f 100644 --- a/meta-fsl-ppc/recipes-kernel/qoriq-debug/qoriq-debug_git.bb +++ b/meta-fsl-ppc/recipes-kernel/qoriq-debug/qoriq-debug_git.bb @@ -3,7 +3,7 @@ SECTION = "qoriq-debug" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=e29234dd5d40dc352cc60cc0c93437ba" -inherit module autotools-brokensep +inherit module autotools-brokensep qoriq_build_64bit_kernel SRC_URI = "git://git.freescale.com/ppc/sdk/qoriq-debug.git;nobranch=1" SRCREV = "20615c1ea332102635f8314cee5787c48c1a4254" @@ -13,22 +13,3 @@ S = "${WORKDIR}/git" EXTRA_OECONF += "--with-linux=${STAGING_KERNEL_DIR}" EXTRA_OEMAKE += 'SYSROOT="${D}"' -python () { - ma = d.getVar("DISTRO_FEATURES", True) - arch = d.getVar("OVERRIDES", True) - - # the : after the arch is to skip the message on 64b - if not "multiarch" in ma and ("e5500:" in arch or "e6500:" in arch): - raise bb.parse.SkipPackage("Building the kernel for this arch requires multiarch to be in DISTRO_FEATURES") - - promote_kernel = d.getVar('BUILD_64BIT_KERNEL') - - if promote_kernel == "1": - d.setVar('KERNEL_CC_append', ' -m64') - d.setVar('KERNEL_LD_append', ' -melf64ppc') - - error_qa = d.getVar('ERROR_QA', True) - if 'arch' in error_qa: - d.setVar('ERROR_QA', error_qa.replace(' arch', '')) -} - diff --git a/meta-fsl-ppc/recipes-kernel/skmm-host/skmm-host_git.bb b/meta-fsl-ppc/recipes-kernel/skmm-host/skmm-host_git.bb index 9ce8a1dd..a1c43f35 100644 --- a/meta-fsl-ppc/recipes-kernel/skmm-host/skmm-host_git.bb +++ b/meta-fsl-ppc/recipes-kernel/skmm-host/skmm-host_git.bb @@ -3,7 +3,7 @@ SECTION = "c293-skmm-host" LICENSE = "Freescale-EULA" LIC_FILES_CHKSUM = "file://Makefile;endline=7;md5=edffaac1da9e809ade0d2fcfcc18d8df" -inherit module +inherit module qoriq_build_64bit_kernel SRC_URI = "git://git.freescale.com/ppc/sdk/skmm-host.git;nobranch=1" SRCREV = "97c9241a359edccdf8913cb9accbfe4ceb511523" @@ -12,23 +12,4 @@ S = "${WORKDIR}/git" EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"' -python () { - ma = d.getVar("DISTRO_FEATURES", True) - arch = d.getVar("OVERRIDES", True) - - # the : after the arch is to skip the message on 64b - if not "multiarch" in ma and ("e5500:" in arch or "e6500:" in arch): - raise bb.parse.SkipPackage("Building the kernel for this arch requires multiarch to be in DISTRO_FEATURES") - - promote_kernel = d.getVar('BUILD_64BIT_KERNEL') - - if promote_kernel == "1": - d.setVar('KERNEL_CC_append', ' -m64') - d.setVar('KERNEL_LD_append', ' -melf64ppc') - - error_qa = d.getVar('ERROR_QA', True) - if 'arch' in error_qa: - d.setVar('ERROR_QA', error_qa.replace(' arch', '')) -} - FILES_${PN} += "/etc/skmm/" -- cgit v1.2.3-54-g00ecf