-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Does this make the TI recipes live in the same sysroot dir as the kernel? Thas was the aim for this.
On 27-07-10 08:48, Khem Raj wrote: > Signed-off-by: Khem Raj <[email protected]> > --- > 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 | 4 +- > recipes/xapian/xapian-bindings-python_1.0.14.bb | 2 +- > 7 files changed, 24 insertions(+), 25 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..1a2d7bb 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}/${MACHINE_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..9a36f70 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}/${MACHINE_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..de8893a 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}/${CURRENT_TARGET_SYS}${CODEGEN_INSTALL_DIR_RECIPE}" > +export XDC_INSTALL_DIR = > "${STAGING_DIR}/${CURRENT_TARGET_SYS}${XDC_INSTALL_DIR_RECIPE}" > +export XDAIS_INSTALL_DIR = > "${STAGING_DIR}/${CURRENT_TARGET_SYS}${XDAIS_INSTALL_DIR_RECIPE}" > +export BIOS_INSTALL_DIR = > "${STAGING_DIR}/${CURRENT_TARGET_SYS}${BIOS_INSTALL_DIR_RECIPE}" > +export SYSBIOS_INSTALL_DIR = > "${STAGING_DIR}/${CURRENT_TARGET_SYS}${SYSBIOS_INSTALL_DIR_RECIPE}" > +export BIOSUTILS_INSTALL_DIR = > "${STAGING_DIR}/${CURRENT_TARGET_SYS}${BIOSUTILS_INSTALL_DIR_RECIPE}" > +export FC_INSTALL_DIR = > "${STAGING_DIR}/${CURRENT_TARGET_SYS}${FC_INSTALL_DIR_RECIPE}" > +export CE_INSTALL_DIR = > "${STAGING_DIR}/${CURRENT_TARGET_SYS}${CE_INSTALL_DIR_RECIPE}" > +export EDMA3_LLD_INSTALL_DIR = > "${STAGING_DIR}/${CURRENT_TARGET_SYS}${EDMA3_LLD_INSTALL_DIR_RECIPE}" > +export LINUXUTILS_INSTALL_DIR = > "${STAGING_DIR}/${CURRENT_TARGET_SYS}${LINUXUTILS_INSTALL_DIR_RECIPE}" > +export CMEM_INSTALL_DIR = > "${STAGING_DIR}/${CURRENT_TARGET_SYS}${CMEM_INSTALL_DIR_RECIPE}" > +export LINK_INSTALL_DIR = > "${STAGING_DIR}/${CURRENT_TARGET_SYS}${LINK_INSTALL_DIR_RECIPE}" > +export LPM_INSTALL_DIR = > "${STAGING_DIR}/${CURRENT_TARGET_SYS}${LPM_INSTALL_DIR_RECIPE}" > +export DMAI_INSTALL_DIR = > "${STAGING_DIR}/${CURRENT_TARGET_SYS}${DMAI_INSTALL_DIR_RECIPE}" > +export CODEC_INSTALL_DIR = > "${STAGING_DIR}/${CURRENT_TARGET_SYS}${CODEC_INSTALL_DIR_RECIPE}" > +export DSPLIB_INSTALL_DIR = > "${STAGING_DIR}/${CURRENT_TARGET_SYS}${DSPLIB_INSTALL_DIR_RECIPE}" > +export BIOSPSP_INSTALL_DIR = > "${STAGING_DIR}/${CURRENT_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..c32f01c 100644 > --- a/recipes/ti/ti-staging.inc > +++ b/recipes/ti/ti-staging.inc > @@ -1,10 +1,10 @@ > PACKAGE_ARCH = "${MACHINE_ARCH}" > > # Allow staging into machine specific dir > -BASEPKG_HOST_SYS = "${MULTIMACH_HOST_SYS}" > +HOST_SYS = "${CURRENT_TARGET_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" > +SHLIBSDIR = "${STAGING_DIR}/${HOST_SYS}/shlibs" > > PACKAGE_STRIP = "no" > > 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) iD8DBQFMToNlMkyGM64RGpERAsFnAJ9+UXehtRlhzUMvFHpuokdGjyHgMQCfQWg3 wNICOn4mFRWBj/gSN2iI/nQ= =SKRJ -----END PGP SIGNATURE----- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
