* [PATCH 1/2] meta-environment: Added package of meta-environment-${TARGET_ARCH} for environment files.
2010-12-21 2:39 [PATCH 0/2] [BUGID #565] fixing. Added meta-environment pacakge Lianhao Lu
@ 2010-12-16 1:40 ` Lianhao Lu
2010-12-21 2:26 ` [PATCH 2/2] meta-environment: inherit cross-canadian.bbclass Lianhao Lu
2010-12-21 8:58 ` [PATCH 0/2] [BUGID #565] fixing. Added meta-environment pacakge Richard Purdie
2 siblings, 0 replies; 4+ messages in thread
From: Lianhao Lu @ 2010-12-16 1:40 UTC (permalink / raw)
To: poky
[BUGID #565] Fixing bug #565, added package of
meta-environment-${TARGET_ARCH} for environment files used by
cross-canadian toolchain.
Also corrected the situation of empty config site file for target.
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
---
meta/classes/toolchain-scripts.bbclass | 32 ++++++++++
meta/recipes-core/meta/meta-environment.bb | 75 ++++++++++++++++++++++++
meta/recipes-core/tasks/task-cross-canadian.bb | 1 +
3 files changed, 108 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-core/meta/meta-environment.bb
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index c393d99..4093635 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -60,3 +60,35 @@ toolchain_create_tree_env_script () {
echo 'export POKY_NATIVE_SYSROOT="${STAGING_DIR_NATIVE}"' >> $script
echo 'export POKY_TARGET_SYSROOT="${STAGING_DIR_TARGET}"' >> $script
}
+
+# This function creates an environment-setup-script for use by the ADT installer
+toolchain_create_sdk_env_script_for_installer () {
+ # Create environment setup script
+ script=${SDK_OUTPUT}/${SDKPATH}/environment-setup-${OLD_MULTIMACH_TARGET_SYS}
+ rm -f $script
+ touch $script
+ echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:${SDKPATHNATIVE}${bindir_nativesdk}/${OLD_MULTIMACH_TARGET_SYS}:$PATH' >> $script
+ echo 'export PKG_CONFIG_SYSROOT_DIR=##SDKTARGETSYSROOT##' >> $script
+ echo 'export PKG_CONFIG_PATH=##SDKTARGETSYSROOT##${libdir}/pkgconfig' >> $script
+ echo 'export CONFIG_SITE=${SDKPATH}/site-config-${OLD_MULTIMACH_TARGET_SYS}' >> $script
+ echo 'export CC=${TARGET_PREFIX}gcc' >> $script
+ echo 'export CXX=${TARGET_PREFIX}g++' >> $script
+ echo 'export GDB=${TARGET_PREFIX}gdb' >> $script
+ echo 'export TARGET_PREFIX=${TARGET_PREFIX}' >> $script
+ echo 'export CONFIGURE_FLAGS="--target=${TARGET_SYS} --host=${TARGET_SYS} --build=${SDK_ARCH}-linux"' >> $script
+ if [ "${TARGET_OS}" = "darwin8" ]; then
+ echo 'export TARGET_CFLAGS="-I##SDKTARGETSYSROOT##${includedir}"' >> $script
+ echo 'export TARGET_LDFLAGS="-L##SDKTARGETSYSROOT##{libdir}"' >> $script
+ # Workaround darwin toolchain sysroot path problems
+ cd ${SDK_OUTPUT}${SDKTARGETSYSROOT}/usr
+ ln -s /usr/local local
+ fi
+ echo 'export CFLAGS="${TARGET_CC_ARCH} --sysroot=##SDKTARGETSYSROOT##"' >> $script
+ echo 'export CXXFLAGS="${TARGET_CC_ARCH} --sysroot=##SDKTARGETSYSROOT## -I##SDKTARGETSYSROOT##${GXX_INCLUDEDIR}"' >> $script
+ echo "# alias opkg='LD_LIBRARY_PATH=${SDKPATHNATIVE}${libdir_nativesdk} ${SDKPATHNATIVE}${bindir_nativesdk}/opkg-cl -f ${SDKPATHNATIVE}/${sysconfdir}/opkg-sdk.conf -o ${SDKPATHNATIVE}'" >> $script
+ echo "# alias opkg-target='LD_LIBRARY_PATH=${SDKPATHNATIVE}${libdir_nativesdk} ${SDKPATHNATIVE}${bindir_nativesdk}/opkg-cl -f ##SDKTARGETSYSROOT##${sysconfdir}/opkg.conf -o ##SDKTARGETSYSROOT##'" >> $script
+ echo 'export POKY_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script
+ echo 'export POKY_TARGET_SYSROOT="##SDKTARGETSYSROOT##"' >> $script
+ echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
+ echo 'export POKY_SDK_VERSION="${SDK_VERSION}"' >> $script
+}
diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb
new file mode 100644
index 0000000..255f2f3
--- /dev/null
+++ b/meta/recipes-core/meta/meta-environment.bb
@@ -0,0 +1,75 @@
+DESCRIPTION = "Packge of environment files for SDK"
+LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+ file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LICENSE = "MIT"
+PR = "r0"
+
+inherit meta toolchain-scripts
+
+TRANSLATED_TARGET_ARCH ?= "${TARGET_ARCH}"
+
+EXCLUDE_FROM_WORLD = "1"
+
+SDK_DIR = "${WORKDIR}/sdk"
+SDK_OUTPUT = "${SDK_DIR}/image"
+
+SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${TARGET_SYS}"
+
+# Save MULTIMACH_TARGET_SYS
+OLD_MULTIMACH_TARGET_SYS := "${MULTIMACH_TARGET_SYS}"
+MULTIMACH_TARGET_SYS = "${MULTIMACH_ARCH}${SDK_VENDOR}-${SDK_OS}"
+
+# Save PACKAGE_ARCH
+OLD_PACKAGE_ARCH := ${BASE_PACKAGE_ARCH}
+BASE_PACKAGE_ARCH = "${SDK_ARCH}-nativesdk"
+
+#change SSTATE_PKGARCH due to the PACKAGE_ARCH change
+SSTATE_PKGARCH = "${SDK_ARCH}"
+
+CONFIG_SITE = "${@siteinfo_get_files(d)}"
+GXX_INCLUDEDIR := "${includedir}/c++"
+
+do_generate_content[nostamp] = "1"
+do_generate_content() {
+
+ rm -rf ${SDK_OUTPUT}
+ mkdir -p ${SDK_OUTPUT}/${SDKPATH}
+
+ siteconfig=${SDK_OUTPUT}/${SDKPATH}/site-config-${OLD_MULTIMACH_TARGET_SYS}
+
+ touch $siteconfig
+ for sitefile in ${CONFIG_SITE} ; do
+ cat $sitefile >> $siteconfig
+ done
+
+ toolchain_create_sdk_env_script_for_installer
+
+ # Add version information
+ versionfile=${SDK_OUTPUT}/${SDKPATH}/version-${OLD_MULTIMACH_TARGET_SYS}
+ touch $versionfile
+ echo 'Distro: ${DISTRO}' >> $versionfile
+ echo 'Distro Version: ${DISTRO_VERSION}' >> $versionfile
+ echo 'Metadata Revision: ${METADATA_REVISION}' >> $versionfile
+ echo 'Timestamp: ${DATETIME}' >> $versionfile
+}
+do_generate_content[recrdeptask] = "do_compile"
+addtask generate_content before do_install after do_compile
+
+do_install[nostamp] = "1"
+do_install() {
+ install -d ${D}/${SDKPATH}
+ install -m 0644 -t ${D}/${SDKPATH} ${SDK_OUTPUT}/${SDKPATH}/*
+}
+
+PN = "meta-environment-${TRANSLATED_TARGET_ARCH}"
+PACKAGES = "${PN}"
+FILES_${PN}= " \
+ ${SDKPATH}/* \
+ "
+
+do_fetch[noexec] = "1"
+do_unpack[noexec] = "1"
+do_patch[noexec] = "1"
+do_configure[noexec] = "1"
+do_compile[noexec] = "1"
+do_populage_sysroot[noexec] = "1"
diff --git a/meta/recipes-core/tasks/task-cross-canadian.bb b/meta/recipes-core/tasks/task-cross-canadian.bb
index 7170faa..64e53fe 100644
--- a/meta/recipes-core/tasks/task-cross-canadian.bb
+++ b/meta/recipes-core/tasks/task-cross-canadian.bb
@@ -12,5 +12,6 @@ RDEPENDS_${PN} = "\
binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} \
gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} \
gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} \
+ meta-environment-${TRANSLATED_TARGET_ARCH} \
"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] meta-environment: inherit cross-canadian.bbclass
2010-12-21 2:39 [PATCH 0/2] [BUGID #565] fixing. Added meta-environment pacakge Lianhao Lu
2010-12-16 1:40 ` [PATCH 1/2] meta-environment: Added package of meta-environment-${TARGET_ARCH} for environment files Lianhao Lu
@ 2010-12-21 2:26 ` Lianhao Lu
2010-12-21 8:58 ` [PATCH 0/2] [BUGID #565] fixing. Added meta-environment pacakge Richard Purdie
2 siblings, 0 replies; 4+ messages in thread
From: Lianhao Lu @ 2010-12-21 2:26 UTC (permalink / raw)
To: poky
[BUGID #565] This is a part of the bug #565 fixing, to reduce the
code duplication by inheriting the cross-canadian.bbclass.
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
---
meta/classes/cross-canadian.bbclass | 1 +
meta/classes/toolchain-scripts.bbclass | 8 +++-----
meta/recipes-core/meta/meta-environment.bb | 25 +++++++------------------
3 files changed, 11 insertions(+), 23 deletions(-)
diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass
index 9edce31..3f3a24d 100644
--- a/meta/classes/cross-canadian.bbclass
+++ b/meta/classes/cross-canadian.bbclass
@@ -15,6 +15,7 @@ STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${SDK_ARCH}${S
# Update BASE_PACKAGE_ARCH and PACKAGE_ARCHS
#
OLD_MULTIMACH_ARCH := "${MULTIMACH_ARCH}"
+OLD_MULTIMACH_TARGET_SYS := "${MULTIMACH_TARGET_SYS}"
OLD_PACKAGE_ARCH := ${BASE_PACKAGE_ARCH}
BASE_PACKAGE_ARCH = "${SDK_ARCH}-nativesdk"
python () {
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index 4093635..a5b2bd1 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -69,7 +69,7 @@ toolchain_create_sdk_env_script_for_installer () {
touch $script
echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:${SDKPATHNATIVE}${bindir_nativesdk}/${OLD_MULTIMACH_TARGET_SYS}:$PATH' >> $script
echo 'export PKG_CONFIG_SYSROOT_DIR=##SDKTARGETSYSROOT##' >> $script
- echo 'export PKG_CONFIG_PATH=##SDKTARGETSYSROOT##${libdir}/pkgconfig' >> $script
+ echo 'export PKG_CONFIG_PATH=##SDKTARGETSYSROOT##${target_libdir}/pkgconfig' >> $script
echo 'export CONFIG_SITE=${SDKPATH}/site-config-${OLD_MULTIMACH_TARGET_SYS}' >> $script
echo 'export CC=${TARGET_PREFIX}gcc' >> $script
echo 'export CXX=${TARGET_PREFIX}g++' >> $script
@@ -77,16 +77,14 @@ toolchain_create_sdk_env_script_for_installer () {
echo 'export TARGET_PREFIX=${TARGET_PREFIX}' >> $script
echo 'export CONFIGURE_FLAGS="--target=${TARGET_SYS} --host=${TARGET_SYS} --build=${SDK_ARCH}-linux"' >> $script
if [ "${TARGET_OS}" = "darwin8" ]; then
- echo 'export TARGET_CFLAGS="-I##SDKTARGETSYSROOT##${includedir}"' >> $script
- echo 'export TARGET_LDFLAGS="-L##SDKTARGETSYSROOT##{libdir}"' >> $script
+ echo 'export TARGET_CFLAGS="-I##SDKTARGETSYSROOT##${target_includedir}"' >> $script
+ echo 'export TARGET_LDFLAGS="-L##SDKTARGETSYSROOT##{target_libdir}"' >> $script
# Workaround darwin toolchain sysroot path problems
cd ${SDK_OUTPUT}${SDKTARGETSYSROOT}/usr
ln -s /usr/local local
fi
echo 'export CFLAGS="${TARGET_CC_ARCH} --sysroot=##SDKTARGETSYSROOT##"' >> $script
echo 'export CXXFLAGS="${TARGET_CC_ARCH} --sysroot=##SDKTARGETSYSROOT## -I##SDKTARGETSYSROOT##${GXX_INCLUDEDIR}"' >> $script
- echo "# alias opkg='LD_LIBRARY_PATH=${SDKPATHNATIVE}${libdir_nativesdk} ${SDKPATHNATIVE}${bindir_nativesdk}/opkg-cl -f ${SDKPATHNATIVE}/${sysconfdir}/opkg-sdk.conf -o ${SDKPATHNATIVE}'" >> $script
- echo "# alias opkg-target='LD_LIBRARY_PATH=${SDKPATHNATIVE}${libdir_nativesdk} ${SDKPATHNATIVE}${bindir_nativesdk}/opkg-cl -f ##SDKTARGETSYSROOT##${sysconfdir}/opkg.conf -o ##SDKTARGETSYSROOT##'" >> $script
echo 'export POKY_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script
echo 'export POKY_TARGET_SYSROOT="##SDKTARGETSYSROOT##"' >> $script
echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb
index 255f2f3..da8d661 100644
--- a/meta/recipes-core/meta/meta-environment.bb
+++ b/meta/recipes-core/meta/meta-environment.bb
@@ -4,30 +4,19 @@ LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
LICENSE = "MIT"
PR = "r0"
-inherit meta toolchain-scripts
-
-TRANSLATED_TARGET_ARCH ?= "${TARGET_ARCH}"
-
EXCLUDE_FROM_WORLD = "1"
+inherit toolchain-scripts
+# get target config site before inheritting corss-canadian
+TARGET_CONFIG_SITE := "${@siteinfo_get_files(d)}"
+
SDK_DIR = "${WORKDIR}/sdk"
SDK_OUTPUT = "${SDK_DIR}/image"
-
SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${TARGET_SYS}"
-# Save MULTIMACH_TARGET_SYS
-OLD_MULTIMACH_TARGET_SYS := "${MULTIMACH_TARGET_SYS}"
-MULTIMACH_TARGET_SYS = "${MULTIMACH_ARCH}${SDK_VENDOR}-${SDK_OS}"
-
-# Save PACKAGE_ARCH
-OLD_PACKAGE_ARCH := ${BASE_PACKAGE_ARCH}
-BASE_PACKAGE_ARCH = "${SDK_ARCH}-nativesdk"
-
-#change SSTATE_PKGARCH due to the PACKAGE_ARCH change
-SSTATE_PKGARCH = "${SDK_ARCH}"
+inherit cross-canadian
-CONFIG_SITE = "${@siteinfo_get_files(d)}"
-GXX_INCLUDEDIR := "${includedir}/c++"
+GXX_INCLUDEDIR := "${target_includedir}/c++"
do_generate_content[nostamp] = "1"
do_generate_content() {
@@ -38,7 +27,7 @@ do_generate_content() {
siteconfig=${SDK_OUTPUT}/${SDKPATH}/site-config-${OLD_MULTIMACH_TARGET_SYS}
touch $siteconfig
- for sitefile in ${CONFIG_SITE} ; do
+ for sitefile in ${TARGET_CONFIG_SITE} ; do
cat $sitefile >> $siteconfig
done
--
1.7.0.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 0/2] [BUGID #565] fixing. Added meta-environment pacakge.
@ 2010-12-21 2:39 Lianhao Lu
2010-12-16 1:40 ` [PATCH 1/2] meta-environment: Added package of meta-environment-${TARGET_ARCH} for environment files Lianhao Lu
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Lianhao Lu @ 2010-12-21 2:39 UTC (permalink / raw)
To: poky
Added pacakge of meta-environment-${TARGET_ARCH} for environment files.
Had config site files with correct target config site files' content.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: llu/bug565
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=llu/bug565
Thanks,
Lianhao Lu <lianhao.lu@intel.com>
---
Lianhao Lu (2):
meta-environment: Added package of meta-environment-${TARGET_ARCH}
for environment files.
meta-environment: inherit cross-canadian.bbclass
meta/classes/cross-canadian.bbclass | 1 +
meta/classes/toolchain-scripts.bbclass | 30 +++++++++++
meta/recipes-core/meta/meta-environment.bb | 64 ++++++++++++++++++++++++
meta/recipes-core/tasks/task-cross-canadian.bb | 1 +
4 files changed, 96 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-core/meta/meta-environment.bb
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 0/2] [BUGID #565] fixing. Added meta-environment pacakge.
2010-12-21 2:39 [PATCH 0/2] [BUGID #565] fixing. Added meta-environment pacakge Lianhao Lu
2010-12-16 1:40 ` [PATCH 1/2] meta-environment: Added package of meta-environment-${TARGET_ARCH} for environment files Lianhao Lu
2010-12-21 2:26 ` [PATCH 2/2] meta-environment: inherit cross-canadian.bbclass Lianhao Lu
@ 2010-12-21 8:58 ` Richard Purdie
2 siblings, 0 replies; 4+ messages in thread
From: Richard Purdie @ 2010-12-21 8:58 UTC (permalink / raw)
To: Lianhao Lu; +Cc: poky
On Tue, 2010-12-21 at 10:39 +0800, Lianhao Lu wrote:
> Added pacakge of meta-environment-${TARGET_ARCH} for environment files.
> Had config site files with correct target config site files' content.
>
> Pull URL: git://git.pokylinux.org/poky-contrib.git
> Branch: llu/bug565
> Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=llu/bug565
>
> Thanks,
> Lianhao Lu <lianhao.lu@intel.com>
I've merged these but I squashed the two commits into one.
Cheers,
Richard
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-12-21 8:58 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-21 2:39 [PATCH 0/2] [BUGID #565] fixing. Added meta-environment pacakge Lianhao Lu
2010-12-16 1:40 ` [PATCH 1/2] meta-environment: Added package of meta-environment-${TARGET_ARCH} for environment files Lianhao Lu
2010-12-21 2:26 ` [PATCH 2/2] meta-environment: inherit cross-canadian.bbclass Lianhao Lu
2010-12-21 8:58 ` [PATCH 0/2] [BUGID #565] fixing. Added meta-environment pacakge Richard Purdie
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.