From: Bob Cochran <yocto@mindchasers.com>
To: meta-freescale@yoctoproject.org
Subject: Re: [meta-fsl-ppc][PATCH 07/12] remove fslmachine MACHINEOVERRIDES usage
Date: Mon, 14 Jul 2014 01:12:01 -0400 [thread overview]
Message-ID: <53C366A1.1070408@mindchasers.com> (raw)
In-Reply-To: <1405066162-30121-7-git-send-email-ting.liu@freescale.com>
On 07/11/2014 04:09 AM, ting.liu@freescale.com wrote:
> From: Ting Liu <b28495@freescale.com>
>
> fslmachine is too generic, use qoriq instead.
Maybe something to think about here: I noticed that the luajit recipe in
meta-openembedded/meta-oe/recipes-devtools uses
SRC_URI_append_fslmachine to introduce a powerpc patch.
But switching the name from fslmachine to qoriq might still lead to
problems down the road since there is a qoriq-ppc and qoriq-arm.
>
> Signed-off-by: Ting Liu <b28495@freescale.com>
> ---
> conf/machine/include/e500mc.inc | 2 +-
> conf/machine/include/e500v2.inc | 2 +-
> conf/machine/include/e5500-64b.inc | 2 +-
> conf/machine/include/e5500.inc | 2 +-
> conf/machine/include/e6500-64b.inc | 2 +-
> conf/machine/include/e6500.inc | 2 +-
> recipes-bsp/rcw/rcw_git.bb | 2 +-
> recipes-devtools/qemu/qemu_fslgit.bb | 2 +-
> recipes-dpaa/fmlib/fmlib_git.bb | 2 +-
> recipes-dpaa/usdpaa/usdpaa_git.bb | 2 +-
> recipes-extended/testfloat/testfloat_2a.bb | 2 +-
> recipes-kernel/cryptodev/cryptodev-fsl.inc | 6 +++---
> .../cryptodev/cryptodev-module_1.6.bbappend | 2 +-
> recipes-virtualization/hv-cfg/hv-cfg_git.bb | 2 +-
> .../hypervisor/hypervisor_git.bb | 2 +-
> 15 files changed, 17 insertions(+), 17 deletions(-)
>
> diff --git a/conf/machine/include/e500mc.inc b/conf/machine/include/e500mc.inc
> index 09b5c69..5871104 100644
> --- a/conf/machine/include/e500mc.inc
> +++ b/conf/machine/include/e500mc.inc
> @@ -3,4 +3,4 @@ TARGET_FPU = "hard"
> require conf/machine/include/tune-ppce500mc.inc
> require conf/machine/include/qoriq-base.inc
>
> -MACHINEOVERRIDES .= ":e500mc:fslmachine"
> +MACHINEOVERRIDES .= ":e500mc"
> diff --git a/conf/machine/include/e500v2.inc b/conf/machine/include/e500v2.inc
> index 178de18..a937254 100644
> --- a/conf/machine/include/e500v2.inc
> +++ b/conf/machine/include/e500v2.inc
> @@ -1,4 +1,4 @@
> require conf/machine/include/tune-ppce500v2.inc
> require conf/machine/include/qoriq-base.inc
>
> -MACHINEOVERRIDES .= ":e500v2:fslmachine"
> +MACHINEOVERRIDES .= ":e500v2"
> diff --git a/conf/machine/include/e5500-64b.inc b/conf/machine/include/e5500-64b.inc
> index 47a9ad7..5c75883 100644
> --- a/conf/machine/include/e5500-64b.inc
> +++ b/conf/machine/include/e5500-64b.inc
> @@ -4,4 +4,4 @@ DEFAULTTUNE ?= "ppc64e5500"
> require conf/machine/include/tune-ppce5500.inc
> require conf/machine/include/qoriq-base.inc
>
> -MACHINEOVERRIDES .= ":e5500-64b:fslmachine"
> +MACHINEOVERRIDES .= ":e5500-64b"
> diff --git a/conf/machine/include/e5500.inc b/conf/machine/include/e5500.inc
> index e6f0400..88f6d06 100644
> --- a/conf/machine/include/e5500.inc
> +++ b/conf/machine/include/e5500.inc
> @@ -3,4 +3,4 @@ TARGET_FPU = "hard"
> require conf/machine/include/tune-ppce5500.inc
> require conf/machine/include/qoriq-base.inc
>
> -MACHINEOVERRIDES .= ":e5500:fslmachine"
> +MACHINEOVERRIDES .= ":e5500"
> diff --git a/conf/machine/include/e6500-64b.inc b/conf/machine/include/e6500-64b.inc
> index 0770cc3..5e533e0 100644
> --- a/conf/machine/include/e6500-64b.inc
> +++ b/conf/machine/include/e6500-64b.inc
> @@ -4,4 +4,4 @@ DEFAULTTUNE ?= "ppc64e6500"
> require conf/machine/include/tune-ppce6500.inc
> require conf/machine/include/qoriq-base.inc
>
> -MACHINEOVERRIDES .= ":e6500-64b:fslmachine"
> +MACHINEOVERRIDES .= ":e6500-64b"
> diff --git a/conf/machine/include/e6500.inc b/conf/machine/include/e6500.inc
> index 323e420..5ebeccf 100644
> --- a/conf/machine/include/e6500.inc
> +++ b/conf/machine/include/e6500.inc
> @@ -3,7 +3,7 @@ TARGET_FPU = "hard"
> require conf/machine/include/tune-ppce6500.inc
> require conf/machine/include/qoriq-base.inc
>
> -MACHINEOVERRIDES .= ":e6500:fslmachine"
> +MACHINEOVERRIDES .= ":e6500"
>
> BUILD_64BIT_KERNEL = "1"
>
> diff --git a/recipes-bsp/rcw/rcw_git.bb b/recipes-bsp/rcw/rcw_git.bb
> index 5e751b8..713ae86 100644
> --- a/recipes-bsp/rcw/rcw_git.bb
> +++ b/recipes-bsp/rcw/rcw_git.bb
> @@ -42,6 +42,6 @@ addtask deploy after do_install
> PACKAGES += "${PN}-image"
> FILES_${PN}-image += "/boot"
>
> -COMPATIBLE_HOST_fslmachine = ".*"
> +COMPATIBLE_HOST_qoriq = ".*"
> COMPATIBLE_HOST ?= "(none)"
> ALLOW_EMPTY_${PN} = "1"
> diff --git a/recipes-devtools/qemu/qemu_fslgit.bb b/recipes-devtools/qemu/qemu_fslgit.bb
> index 30f27d6..03395a9 100644
> --- a/recipes-devtools/qemu/qemu_fslgit.bb
> +++ b/recipes-devtools/qemu/qemu_fslgit.bb
> @@ -46,4 +46,4 @@ INSANE_SKIP_${PN} += "dev-deps"
> # the package get built. COMPATIBLE_HOST would not work
> # because it was too generic
> COMPATIBLE_MACHINE = "a^"
> -COMPATIBLE_MACHINE_libc-glibc_fslmachine = ".*"
> +COMPATIBLE_MACHINE_libc-glibc_qoriq = ".*"
> diff --git a/recipes-dpaa/fmlib/fmlib_git.bb b/recipes-dpaa/fmlib/fmlib_git.bb
> index 04ca515..4350cbd 100644
> --- a/recipes-dpaa/fmlib/fmlib_git.bb
> +++ b/recipes-dpaa/fmlib/fmlib_git.bb
> @@ -16,7 +16,7 @@ S = "${WORKDIR}/git"
> TARGET_ARCH_FMLIB = "${DEFAULTTUNE}"
> TARGET_ARCH_FMLIB_e5500 = "ppc32e5500"
> TARGET_ARCH_FMLIB_e6500 = "ppc32e6500"
> -COMPATIBLE_HOST_fslmachine = ".*"
> +COMPATIBLE_HOST_qoriq = ".*"
> COMPATIBLE_HOST ?= "(none)"
>
> EXTRA_OEMAKE = "DESTDIR=${D} PREFIX=${prefix} LIB_DEST_DIR=${libdir} \
> diff --git a/recipes-dpaa/usdpaa/usdpaa_git.bb b/recipes-dpaa/usdpaa/usdpaa_git.bb
> index 9c7e388..e8ec4e7 100644
> --- a/recipes-dpaa/usdpaa/usdpaa_git.bb
> +++ b/recipes-dpaa/usdpaa/usdpaa_git.bb
> @@ -71,6 +71,6 @@ do_install () {
> PARALLEL_MAKE_pn-${PN} = ""
> FILES_${PN} += "/root/SOURCE_THIS /usr/etc/"
>
> -COMPATIBLE_HOST_fslmachine = ".*"
> +COMPATIBLE_HOST_qoriq = ".*"
> COMPATIBLE_HOST ?= "(none)"
>
> diff --git a/recipes-extended/testfloat/testfloat_2a.bb b/recipes-extended/testfloat/testfloat_2a.bb
> index fb89e26..f3f58b4 100644
> --- a/recipes-extended/testfloat/testfloat_2a.bb
> +++ b/recipes-extended/testfloat/testfloat_2a.bb
> @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://testfloat/testfloat.txt;beginline=87;endline=95;md5=b
> SRC_URI = " http://www.jhauser.us/arithmetic/TestFloat-2a.tar.Z;name=TestFloat \
> http://www.jhauser.us/arithmetic/SoftFloat-2b.tar.Z;name=SoftFloat \
> "
> -SRC_URI_append_fslmachine = " file://SoftFloat-powerpc-1.patch \
> +SRC_URI_append_qoriq = " file://SoftFloat-powerpc-1.patch \
> file://TestFloat-powerpc-E500v2-SPE-1.patch \
> file://Yocto-replace-COMPILE_PREFIX-gcc.patch \
> "
> diff --git a/recipes-kernel/cryptodev/cryptodev-fsl.inc b/recipes-kernel/cryptodev/cryptodev-fsl.inc
> index 774ef10..0c59128 100644
> --- a/recipes-kernel/cryptodev/cryptodev-fsl.inc
> +++ b/recipes-kernel/cryptodev/cryptodev-fsl.inc
> @@ -1,6 +1,6 @@
> FILESEXTRAPATHS_prepend := "${THISDIR}/cryptodev-fsl"
>
> -SRC_URI_fslmachine = "git://github.com/nmav/cryptodev-linux.git \
> +SRC_URI_qoriq = "git://github.com/nmav/cryptodev-linux.git \
> file://0001-add-support-for-composite-TLS-SHA1-AES-algorithm-off.patch \
> file://0002-use-function-local-storage-for-cipher-and-hmac-keys.patch \
> file://0003-Add-support-for-aead-keys-for-composite-algorithms.patch \
> @@ -18,7 +18,7 @@ SRC_URI_fslmachine = "git://github.com/nmav/cryptodev-linux.git \
> file://0015-Add-RSA-Key-generation-offloading.patch \
> file://0016-Fixed-compilation-error-of-openssl-with-fsl-cryptode.patch \
> "
> -SRCREV_fslmachine = "e8609a408d40c83ae8fc11bbe9a7b3847612669b"
> +SRCREV_qoriq = "e8609a408d40c83ae8fc11bbe9a7b3847612669b"
>
> -S_fslmachine = "${WORKDIR}/git"
> +S_qoriq = "${WORKDIR}/git"
>
> diff --git a/recipes-kernel/cryptodev/cryptodev-module_1.6.bbappend b/recipes-kernel/cryptodev/cryptodev-module_1.6.bbappend
> index 1dbf3b6..ff95702 100644
> --- a/recipes-kernel/cryptodev/cryptodev-module_1.6.bbappend
> +++ b/recipes-kernel/cryptodev/cryptodev-module_1.6.bbappend
> @@ -2,7 +2,7 @@ require recipes-kernel/cryptodev/cryptodev-fsl.inc
>
> inherit qoriq_build_64bit_kernel
>
> -do_install_append_fslmachine () {
> +do_install_append_qoriq () {
> rm -fr ${D}/usr
> }
>
> diff --git a/recipes-virtualization/hv-cfg/hv-cfg_git.bb b/recipes-virtualization/hv-cfg/hv-cfg_git.bb
> index 304b78f..285f0be 100644
> --- a/recipes-virtualization/hv-cfg/hv-cfg_git.bb
> +++ b/recipes-virtualization/hv-cfg/hv-cfg_git.bb
> @@ -41,6 +41,6 @@ addtask deploy after do_install
> PACKAGES += "${PN}-image"
> FILES_${PN}-image += "/boot"
>
> -COMPATIBLE_HOST_fslmachine = ".*"
> +COMPATIBLE_HOST_qoriq = ".*"
> COMPATIBLE_HOST ?= "(none)"
> ALLOW_EMPTY_${PN} = "1"
> diff --git a/recipes-virtualization/hypervisor/hypervisor_git.bb b/recipes-virtualization/hypervisor/hypervisor_git.bb
> index 4add9f3..f1ad3c1 100644
> --- a/recipes-virtualization/hypervisor/hypervisor_git.bb
> +++ b/recipes-virtualization/hypervisor/hypervisor_git.bb
> @@ -36,7 +36,7 @@ EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHA
> DEFCONFIG = "defconfig"
> DEFCONFIG_powerpc64 = "64bit_defconfig"
>
> -COMPATIBLE_HOST_fslmachine = ".*"
> +COMPATIBLE_HOST_qoriq = ".*"
> COMPATIBLE_HOST ?= "(none)"
>
> inherit cml1
>
next prev parent reply other threads:[~2014-07-14 5:12 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-11 8:09 [meta-fsl-ppc][PATCH 01/12] move all inc files to folder include/ ting.liu
2014-07-11 8:09 ` [meta-fsl-ppc][PATCH 02/12] remove kernel26 machine feature usage ting.liu
2014-07-11 17:06 ` Otavio Salvador
2014-07-11 8:09 ` [meta-fsl-ppc][PATCH 03/12] remove obsolete PREFERRED_VERSION for virtual/kernel ting.liu
2014-07-11 17:10 ` Otavio Salvador
2014-07-11 8:09 ` [meta-fsl-ppc][PATCH 04/12] conf/machine/: move common bits to inc files ting.liu
2014-07-11 17:16 ` Otavio Salvador
2014-07-14 2:23 ` ting.liu
2014-07-11 8:09 ` [meta-fsl-ppc][PATCH 05/12] u-boot: rename to u-boot-qoriq ting.liu
2014-07-11 17:17 ` Otavio Salvador
2014-07-11 8:09 ` [meta-fsl-ppc][PATCH 06/12] linux-qoriq-sdk: rename to linux-qoriq ting.liu
2014-07-11 17:06 ` Otavio Salvador
2014-07-11 8:09 ` [meta-fsl-ppc][PATCH 07/12] remove fslmachine MACHINEOVERRIDES usage ting.liu
2014-07-11 17:18 ` Otavio Salvador
2014-07-14 5:12 ` Bob Cochran [this message]
2014-07-14 7:52 ` ting.liu
2014-07-11 8:09 ` [meta-fsl-ppc][PATCH 08/12] add u-boot as EXTRA_IMAGEDEPENDS ting.liu
2014-07-11 17:17 ` Otavio Salvador
2014-07-11 8:09 ` [meta-fsl-ppc][PATCH 09/12] set IMAGE_CLASSES = "image_types_uboot" as defaut ting.liu
2014-07-11 17:07 ` Otavio Salvador
2014-07-14 2:10 ` ting.liu
2014-07-11 8:09 ` [meta-fsl-ppc][PATCH 10/12] add default setting for MKUBIFS_ARGS and UBINIZE_ARGS ting.liu
2014-07-11 17:09 ` Otavio Salvador
2014-07-18 19:28 ` Bob Cochran
2014-07-11 8:09 ` [meta-fsl-ppc][PATCH 11/12] inherit qoriq_build_64bit_kernel for kernel/module recipes ting.liu
2014-07-11 17:12 ` Otavio Salvador
2014-07-11 8:09 ` [meta-fsl-ppc][PATCH 12/12] ipc-modules: move to recipes-kernel/ ting.liu
2014-07-11 17:08 ` Otavio Salvador
2014-07-11 17:09 ` [meta-fsl-ppc][PATCH 01/12] move all inc files to folder include/ Otavio Salvador
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=53C366A1.1070408@mindchasers.com \
--to=yocto@mindchasers.com \
--cc=meta-freescale@yoctoproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.