From: Koen Kooi <k.kooi@student.utwente.nl>
To: openembedded-devel@lists.openembedded.org
Subject: Re: [PATCH 7/7] recipes: Replace usage of MULTIMACH_TARGET_SYS with TARGET_SYS
Date: Mon, 26 Jul 2010 22:17:16 +0200 [thread overview]
Message-ID: <i2kqgc$ql1$1@dough.gmane.org> (raw)
In-Reply-To: <1280174528-27682-8-git-send-email-raj.khem@gmail.com>
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Khem,
What does '${TARGET_SYS}' expand to for machine specific recipes? The TI
tools need to go into sysroots/machine/, not sysroot/arch/ in the
current setup.
regards,
Koen
On 26-07-10 22:02, Khem Raj wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> recipes/gnuradio/gnuradio-libusb-compat.inc | 2 +-
> recipes/gnuradio/gnuradio.inc | 2 +-
> recipes/opencv/opencv-dsp-acceleration_svn.bb | 2 +-
> recipes/ti/README | 3 +-
> recipes/ti/ti-paths.inc | 34 +++++++++++-----------
> recipes/ti/ti-staging.inc | 3 --
> recipes/xapian/xapian-bindings-python_1.0.14.bb | 2 +-
> 7 files changed, 22 insertions(+), 26 deletions(-)
>
> diff --git a/recipes/gnuradio/gnuradio-libusb-compat.inc b/recipes/gnuradio/gnuradio-libusb-compat.inc
> index efe2b88..aa4d41a 100644
> --- a/recipes/gnuradio/gnuradio-libusb-compat.inc
> +++ b/recipes/gnuradio/gnuradio-libusb-compat.inc
> @@ -8,7 +8,7 @@ INC_PR = "r7"
> inherit distutils-base autotools autotools_stage pkgconfig
>
> export BUILD_SYS
> -export HOST_SYS=${MULTIMACH_TARGET_SYS}
> +export HOST_SYS
>
> CXXFLAGS_powerpc += "-lstdc++"
>
> diff --git a/recipes/gnuradio/gnuradio.inc b/recipes/gnuradio/gnuradio.inc
> index 6eaf119..1a08930 100644
> --- a/recipes/gnuradio/gnuradio.inc
> +++ b/recipes/gnuradio/gnuradio.inc
> @@ -8,7 +8,7 @@ INC_PR = "r7"
> inherit distutils-base autotools autotools_stage pkgconfig
>
> export BUILD_SYS
> -export HOST_SYS=${MULTIMACH_TARGET_SYS}
> +export HOST_SYS
>
> CXXFLAGS_powerpc += "-lstdc++"
>
> diff --git a/recipes/opencv/opencv-dsp-acceleration_svn.bb b/recipes/opencv/opencv-dsp-acceleration_svn.bb
> index 788e8e2..26fc3c6 100644
> --- a/recipes/opencv/opencv-dsp-acceleration_svn.bb
> +++ b/recipes/opencv/opencv-dsp-acceleration_svn.bb
> @@ -22,7 +22,7 @@ export OPENCV_PATH = "${STAGING_INCDIR}"
> export DSPLIB_PATH = "${DSPLIB_INSTALL_DIR}"
>
> # You need to extract the imglib from the .exe manually and place it in /OE/tmp (or somewhere else and change the patch below)
> -export IMGLIB_PATH = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${installdir}/imglib_v201"
> +export IMGLIB_PATH = "${STAGING_DIR}/${TARGET_SYS}${installdir}/imglib_v201"
>
> do_configure() {
> echo "-l ${DSPLIB_INSTALL_DIR}/dsplib64plus.lib" >> ${S}/beagle/server/opencv_unitserver_evm3530/link.cmd
> diff --git a/recipes/ti/README b/recipes/ti/README
> index 2fbb9f1..6262c9c 100644
> --- a/recipes/ti/README
> +++ b/recipes/ti/README
> @@ -29,13 +29,12 @@ Since most of the recipes in this directory deal with a DSP (e.g OMAP3) or accel
> The complete unpacked trees are staged to staging/machine/usr/share/ti/${PN}(-tree) and all the _INSTALL_DIR vars will point to that. To make this work there is a ti-staging.inc which contains:
>
> PACKAGE_ARCH = "${MACHINE_ARCH}"
> -BASEPKG_HOST_SYS = "${MULTIMACH_HOST_SYS}"
> PACKAGE_STRIP = "no"
>
> The 'BASEPKG_HOST_SYS' bit is what makes it work, but cause trouble is you want to read from it, so ti-paths.inc does:
>
> export CODEGEN_INSTALL_DIR_RECIPE = "${installdir}/ti-cgt6x"
> -export CODEGEN_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/${CODEGEN_INSTALL_DIR_RECIPE}"
> +export CODEGEN_INSTALL_DIR = "${STAGING_DIR}/${TARGET_SYS}/${CODEGEN_INSTALL_DIR_RECIPE}"
>
> Which will point it to the machine specific staging like we want it to.
>
> diff --git a/recipes/ti/ti-paths.inc b/recipes/ti/ti-paths.inc
> index 27400a1..57af6c5 100644
> --- a/recipes/ti/ti-paths.inc
> +++ b/recipes/ti/ti-paths.inc
> @@ -22,23 +22,23 @@ export BIOSPSP_INSTALL_DIR_RECIPE = "${installdir}/ti-biospsp-tree"
> export AUDIO_SOC_INSTALL_DIR_RECIPE = "${installdir}/ti-audio-soc-example-tree"
>
> # This is where the tools will end up in staging provided PACKAGE_ARCH = ${MACHINE_ARCH} is set
> -export CODEGEN_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${CODEGEN_INSTALL_DIR_RECIPE}"
> -export XDC_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${XDC_INSTALL_DIR_RECIPE}"
> -export XDAIS_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${XDAIS_INSTALL_DIR_RECIPE}"
> -export BIOS_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${BIOS_INSTALL_DIR_RECIPE}"
> -export SYSBIOS_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${SYSBIOS_INSTALL_DIR_RECIPE}"
> -export BIOSUTILS_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${BIOSUTILS_INSTALL_DIR_RECIPE}"
> -export FC_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${FC_INSTALL_DIR_RECIPE}"
> -export CE_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${CE_INSTALL_DIR_RECIPE}"
> -export EDMA3_LLD_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${EDMA3_LLD_INSTALL_DIR_RECIPE}"
> -export LINUXUTILS_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${LINUXUTILS_INSTALL_DIR_RECIPE}"
> -export CMEM_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${CMEM_INSTALL_DIR_RECIPE}"
> -export LINK_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${LINK_INSTALL_DIR_RECIPE}"
> -export LPM_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${LPM_INSTALL_DIR_RECIPE}"
> -export DMAI_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${DMAI_INSTALL_DIR_RECIPE}"
> -export CODEC_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${CODEC_INSTALL_DIR_RECIPE}"
> -export DSPLIB_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${DSPLIB_INSTALL_DIR_RECIPE}"
> -export BIOSPSP_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${BIOSPSP_INSTALL_DIR_RECIPE}"
> +export CODEGEN_INSTALL_DIR = "${STAGING_DIR}/${TARGET_SYS}${CODEGEN_INSTALL_DIR_RECIPE}"
> +export XDC_INSTALL_DIR = "${STAGING_DIR}/${TARGET_SYS}${XDC_INSTALL_DIR_RECIPE}"
> +export XDAIS_INSTALL_DIR = "${STAGING_DIR}/${TARGET_SYS}${XDAIS_INSTALL_DIR_RECIPE}"
> +export BIOS_INSTALL_DIR = "${STAGING_DIR}/${TARGET_SYS}${BIOS_INSTALL_DIR_RECIPE}"
> +export SYSBIOS_INSTALL_DIR = "${STAGING_DIR}/${TARGET_SYS}${SYSBIOS_INSTALL_DIR_RECIPE}"
> +export BIOSUTILS_INSTALL_DIR = "${STAGING_DIR}/${TARGET_SYS}${BIOSUTILS_INSTALL_DIR_RECIPE}"
> +export FC_INSTALL_DIR = "${STAGING_DIR}/${TARGET_SYS}${FC_INSTALL_DIR_RECIPE}"
> +export CE_INSTALL_DIR = "${STAGING_DIR}/${TARGET_SYS}${CE_INSTALL_DIR_RECIPE}"
> +export EDMA3_LLD_INSTALL_DIR = "${STAGING_DIR}/${TARGET_SYS}${EDMA3_LLD_INSTALL_DIR_RECIPE}"
> +export LINUXUTILS_INSTALL_DIR = "${STAGING_DIR}/${TARGET_SYS}${LINUXUTILS_INSTALL_DIR_RECIPE}"
> +export CMEM_INSTALL_DIR = "${STAGING_DIR}/${TARGET_SYS}${CMEM_INSTALL_DIR_RECIPE}"
> +export LINK_INSTALL_DIR = "${STAGING_DIR}/${TARGET_SYS}${LINK_INSTALL_DIR_RECIPE}"
> +export LPM_INSTALL_DIR = "${STAGING_DIR}/${TARGET_SYS}${LPM_INSTALL_DIR_RECIPE}"
> +export DMAI_INSTALL_DIR = "${STAGING_DIR}/${TARGET_SYS}${DMAI_INSTALL_DIR_RECIPE}"
> +export CODEC_INSTALL_DIR = "${STAGING_DIR}/${TARGET_SYS}${CODEC_INSTALL_DIR_RECIPE}"
> +export DSPLIB_INSTALL_DIR = "${STAGING_DIR}/${TARGET_SYS}${DSPLIB_INSTALL_DIR_RECIPE}"
> +export BIOSPSP_INSTALL_DIR = "${STAGING_DIR}/${TARGET_SYS}${BIOSPSP_INSTALL_DIR_RECIPE}"
>
> DSPSUFFIX_omapl137 = "x674"
> DSPSUFFIX_omapl138 = "x674"
> diff --git a/recipes/ti/ti-staging.inc b/recipes/ti/ti-staging.inc
> index 593f094..de2a882 100644
> --- a/recipes/ti/ti-staging.inc
> +++ b/recipes/ti/ti-staging.inc
> @@ -1,8 +1,5 @@
> PACKAGE_ARCH = "${MACHINE_ARCH}"
>
> -# Allow staging into machine specific dir
> -BASEPKG_HOST_SYS = "${MULTIMACH_HOST_SYS}"
> -
> # Search archdir for shlibs instead of machine dir due to above BASEPKG_HOST_SYS
> SHLIBSDIR = "${STAGING_DIR}/${BASE_PACKAGE_ARCH}${HOST_VENDOR}-${HOST_OS}/shlibs"
>
> diff --git a/recipes/xapian/xapian-bindings-python_1.0.14.bb b/recipes/xapian/xapian-bindings-python_1.0.14.bb
> index ae97779..6c24e2d 100644
> --- a/recipes/xapian/xapian-bindings-python_1.0.14.bb
> +++ b/recipes/xapian/xapian-bindings-python_1.0.14.bb
> @@ -18,7 +18,7 @@ EXTRA_OECONF = "--with-python --without-php --without-ruby --without-tcl \
> --without-csharp --without-java"
>
> do_configure () {
> - BUILD_SYS=${BUILD_SYS} HOST_SYS=${MULTIMACH_HOST_SYS} \
> + BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
> autotools_do_configure
> }
>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFMTe1MMkyGM64RGpERAoCzAJwPY77OLBG0BghEgbCtOwyU/o+VcwCgg/j8
Ica4QN3ugkVKWaLju2oc6ig=
=DWeX
-----END PGP SIGNATURE-----
next prev parent reply other threads:[~2010-07-26 20:17 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-26 20:02 [PATCH 0/7] Make multi-machine toolchains to co-exist (revised) Khem Raj
2010-07-26 20:02 ` [PATCH 1/7] bitbake.conf: Define HOST_SYS and TARGET_SYS based on target sub-arch Khem Raj
2010-07-26 20:02 ` [PATCH 2/7] binutils-cross.inc, binutils.inc: Overhaul for new cross dir structure Khem Raj
2010-07-26 20:12 ` Tom Rini
2010-07-26 20:19 ` Khem Raj
2010-07-26 20:02 ` [PATCH 3/7] gcc-cross: Use EXTRA_OECONF_PATHS in initial and intermediate recipes Khem Raj
2010-07-26 20:02 ` [PATCH 4/7] sdk.bbclass: override BASEPKG_HOST_SYS as it is used to make TARGET_SYS Khem Raj
2010-07-26 20:02 ` [PATCH 5/7] machines: Add new variable TARGET_SUB_ARCH Khem Raj
2010-07-26 20:02 ` [PATCH 6/7] cross.bbclass, packaged-staging.bbclass, bitbake.conf: construct *VENDOR variable from TARGET_SUB_ARCH and DISTRO_VENDOR Khem Raj
2010-07-26 20:02 ` [PATCH 7/7] recipes: Replace usage of MULTIMACH_TARGET_SYS with TARGET_SYS Khem Raj
2010-07-26 20:17 ` Koen Kooi [this message]
2010-07-26 20:24 ` Khem Raj
2010-07-26 20:30 ` Koen Kooi
2010-07-26 20:39 ` Khem Raj
2010-07-26 22:58 ` [PATCH 0/7] Make multi-machine toolchains to co-exist (revised) Tom Rini
2010-07-27 4:47 ` Khem Raj
2010-07-27 17:16 ` Tom Rini
2010-07-27 7:34 ` Phil Blundell
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='i2kqgc$ql1$1@dough.gmane.org' \
--to=k.kooi@student.utwente.nl \
--cc=openembedded-devel@lists.openembedded.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.