* [PATCH 0/3] [Bug #728] corrected environment files content
@ 2011-02-17 3:08 Lianhao Lu
2011-02-17 3:08 ` [PATCH 1/3] toolchain-scripts.bbclass: Added libtool sysroot support Lianhao Lu
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Lianhao Lu @ 2011-02-17 3:08 UTC (permalink / raw)
To: poky
From: Lianhao Lu <lianhao.lu@intel.com>
1. Added libtool sysroot related param value into environment files.
2. Moved common code between meta-environment.bb and populate_sdk.bbclass into toolchain-script.bbclass.
3. Set CONFIG_SITE to correct value for autoconf config site.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: llu/bug728
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=llu/bug728
Thanks,
Lianhao Lu <lianhao.lu@intel.com>
---
Lianhao Lu (3):
toolchain-scripts.bbclass: Added libtool sysroot support.
toolchain-script/populate_sdk/meta-toolchain: moving common code.
recipe-core/meta/meta-toolchain.bb: Set correct value for
CONFIG_SITE.
meta/classes/populate_sdk.bbclass | 13 +---------
meta/classes/toolchain-scripts.bbclass | 34 +++++++++++++++++++++++-----
meta/recipes-core/meta/meta-environment.bb | 16 ++----------
meta/recipes-core/meta/meta-toolchain.bb | 4 ++-
4 files changed, 36 insertions(+), 31 deletions(-)
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/3] toolchain-scripts.bbclass: Added libtool sysroot support.
2011-02-17 3:08 [PATCH 0/3] [Bug #728] corrected environment files content Lianhao Lu
@ 2011-02-17 3:08 ` Lianhao Lu
2011-02-17 3:08 ` [PATCH 2/3] toolchain-script/populate_sdk/meta-toolchain: moving common code Lianhao Lu
` (2 subsequent siblings)
3 siblings, 0 replies; 8+ messages in thread
From: Lianhao Lu @ 2011-02-17 3:08 UTC (permalink / raw)
To: poky
From: Lianhao Lu <lianhao.lu@intel.com>
Added missing --with-libtool-sysroot and --sysroot in environment files.
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
---
meta/classes/toolchain-scripts.bbclass | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index b2165bc..fb59761 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -14,7 +14,7 @@ toolchain_create_sdk_env_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
+ echo 'export CONFIGURE_FLAGS="--target=${TARGET_SYS} --host=${TARGET_SYS} --build=${SDK_ARCH}-linux --with-libtool-sysroot=${SDKTARGETSYSROOT}"' >> $script
if [ "${TARGET_OS}" = "darwin8" ]; then
echo 'export TARGET_CFLAGS="-I${SDKTARGETSYSROOT}${includedir}"' >> $script
echo 'export TARGET_LDFLAGS="-L${SDKTARGETSYSROOT}${libdir}"' >> $script
@@ -22,10 +22,8 @@ toolchain_create_sdk_env_script () {
cd ${SDK_OUTPUT}${SDKTARGETSYSROOT}/usr
ln -s /usr/local local
fi
- echo 'export CFLAGS="${TARGET_CC_ARCH}"' >> $script
- echo 'export CXXFLAGS="${TARGET_CC_ARCH}"' >> $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 CFLAGS="${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT}"' >> $script
+ echo 'export CXXFLAGS="${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT}"' >> $script
echo 'export POKY_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script
echo 'export POKY_TARGET_SYSROOT="${SDKTARGETSYSROOT}"' >> $script
echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
@@ -75,7 +73,7 @@ toolchain_create_sdk_env_script_for_installer () {
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
+ echo 'export CONFIGURE_FLAGS="--target=${TARGET_SYS} --host=${TARGET_SYS} --build=${SDK_ARCH}-linux --with-libtool-sysroot=##SDKTARGETSYSROOT##"' >> $script
if [ "${TARGET_OS}" = "darwin8" ]; then
echo 'export TARGET_CFLAGS="-I##SDKTARGETSYSROOT##${target_includedir}"' >> $script
echo 'export TARGET_LDFLAGS="-L##SDKTARGETSYSROOT##{target_libdir}"' >> $script
--
1.7.0.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/3] toolchain-script/populate_sdk/meta-toolchain: moving common code.
2011-02-17 3:08 [PATCH 0/3] [Bug #728] corrected environment files content Lianhao Lu
2011-02-17 3:08 ` [PATCH 1/3] toolchain-scripts.bbclass: Added libtool sysroot support Lianhao Lu
@ 2011-02-17 3:08 ` Lianhao Lu
2011-02-17 3:08 ` [PATCH 3/3] recipe-core/meta/meta-toolchain.bb: Set correct value for CONFIG_SITE Lianhao Lu
2011-02-22 15:53 ` [PATCH 0/3] [Bug #728] corrected environment files content Saul Wold
3 siblings, 0 replies; 8+ messages in thread
From: Lianhao Lu @ 2011-02-17 3:08 UTC (permalink / raw)
To: poky
From: Lianhao Lu <lianhao.lu@intel.com>
moving common code between populate_sdk.bbclass and meta-environment.bb
into toolchain-script.bbclass.
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
---
meta/classes/populate_sdk.bbclass | 13 ++-----------
meta/classes/toolchain-scripts.bbclass | 24 ++++++++++++++++++++++++
meta/recipes-core/meta/meta-environment.bb | 16 +++-------------
3 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/meta/classes/populate_sdk.bbclass b/meta/classes/populate_sdk.bbclass
index 7e260ef..474b43b 100644
--- a/meta/classes/populate_sdk.bbclass
+++ b/meta/classes/populate_sdk.bbclass
@@ -38,21 +38,12 @@ fakeroot do_populate_sdk() {
ln -s /etc/ld.so.cache ${SDK_OUTPUT}/${SDKPATHNATIVE}/etc/ld.so.cache
# Setup site file for external use
- siteconfig=${SDK_OUTPUT}/${SDKPATH}/site-config-${MULTIMACH_TARGET_SYS}
- touch $siteconfig
- for sitefile in ${CONFIG_SITE} ; do
- cat $sitefile >> $siteconfig
- done
+ toolchain_create_sdk_siteconfig ${SDK_OUTPUT}/${SDKPATH}/site-config-${MULTIMACH_TARGET_SYS} ${CONFIG_SITE}
toolchain_create_sdk_env_script
# Add version information
- versionfile=${SDK_OUTPUT}/${SDKPATH}/version-${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
+ toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${MULTIMACH_TARGET_SYS}
# Package it up
mkdir -p ${SDK_DEPLOY}
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index fb59761..2b9cfac 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -88,3 +88,27 @@ toolchain_create_sdk_env_script_for_installer () {
echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
echo 'export POKY_SDK_VERSION="${SDK_VERSION}"' >> $script
}
+
+#This function create a site config file
+toolchain_create_sdk_siteconfig () {
+ local siteconfig=$1
+ shift
+ local files=$@
+
+ rm -f $siteconfig
+ touch $siteconfig
+ for sitefile in ${files} ; do
+ cat $sitefile >> $siteconfig
+ done
+}
+
+#This function create a version information file
+toolchain_create_sdk_version () {
+ local versionfile=$1
+ rm -f $versionfile
+ touch $versionfile
+ echo 'Distro: ${DISTRO}' >> $versionfile
+ echo 'Distro Version: ${DISTRO_VERSION}' >> $versionfile
+ echo 'Metadata Revision: ${METADATA_REVISION}' >> $versionfile
+ echo 'Timestamp: ${DATETIME}' >> $versionfile
+}
diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb
index 4ba919f..0b88260 100644
--- a/meta/recipes-core/meta/meta-environment.bb
+++ b/meta/recipes-core/meta/meta-environment.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Package of environment files for SDK"
LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
LICENSE = "MIT"
-PR = "r1"
+PR = "r2"
EXCLUDE_FROM_WORLD = "1"
@@ -22,22 +22,12 @@ 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 ${TARGET_CONFIG_SITE} ; do
- cat $sitefile >> $siteconfig
- done
+ toolchain_create_sdk_siteconfig ${SDK_OUTPUT}/${SDKPATH}/site-config-${OLD_MULTIMACH_TARGET_SYS} ${TARGET_CONFIG_SITE}
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
+ toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${OLD_MULTIMACH_TARGET_SYS}
}
addtask generate_content before do_install after do_compile
--
1.7.0.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 3/3] recipe-core/meta/meta-toolchain.bb: Set correct value for CONFIG_SITE.
2011-02-17 3:08 [PATCH 0/3] [Bug #728] corrected environment files content Lianhao Lu
2011-02-17 3:08 ` [PATCH 1/3] toolchain-scripts.bbclass: Added libtool sysroot support Lianhao Lu
2011-02-17 3:08 ` [PATCH 2/3] toolchain-script/populate_sdk/meta-toolchain: moving common code Lianhao Lu
@ 2011-02-17 3:08 ` Lianhao Lu
2011-02-22 15:53 ` [PATCH 0/3] [Bug #728] corrected environment files content Saul Wold
3 siblings, 0 replies; 8+ messages in thread
From: Lianhao Lu @ 2011-02-17 3:08 UTC (permalink / raw)
To: poky
From: Lianhao Lu <lianhao.lu@intel.com>
Set the value of CONFIG_SITE for correct autoconf config site files.
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
---
meta/recipes-core/meta/meta-toolchain.bb | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/meta/meta-toolchain.bb b/meta/recipes-core/meta/meta-toolchain.bb
index feff9ac..2443b38 100644
--- a/meta/recipes-core/meta/meta-toolchain.bb
+++ b/meta/recipes-core/meta/meta-toolchain.bb
@@ -1,9 +1,11 @@
DESCRIPTION = "Meta package for building a installable toolchain"
LICENSE = "MIT"
-PR = "r1"
+PR = "r2"
LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
inherit populate_sdk
+
+CONFIG_SITE := "${@siteinfo_get_files(d)}"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 0/3] [Bug #728] corrected environment files content
2011-02-17 3:08 [PATCH 0/3] [Bug #728] corrected environment files content Lianhao Lu
` (2 preceding siblings ...)
2011-02-17 3:08 ` [PATCH 3/3] recipe-core/meta/meta-toolchain.bb: Set correct value for CONFIG_SITE Lianhao Lu
@ 2011-02-22 15:53 ` Saul Wold
3 siblings, 0 replies; 8+ messages in thread
From: Saul Wold @ 2011-02-22 15:53 UTC (permalink / raw)
To: Lianhao Lu; +Cc: poky
On 02/16/2011 07:08 PM, Lianhao Lu wrote:
> From: Lianhao Lu<lianhao.lu@intel.com>
>
> 1. Added libtool sysroot related param value into environment files.
> 2. Moved common code between meta-environment.bb and populate_sdk.bbclass into toolchain-script.bbclass.
> 3. Set CONFIG_SITE to correct value for autoconf config site.
>
> Pull URL: git://git.pokylinux.org/poky-contrib.git
> Branch: llu/bug728
> Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=llu/bug728
>
> Thanks,
> Lianhao Lu<lianhao.lu@intel.com>
> ---
>
>
> Lianhao Lu (3):
> toolchain-scripts.bbclass: Added libtool sysroot support.
> toolchain-script/populate_sdk/meta-toolchain: moving common code.
> recipe-core/meta/meta-toolchain.bb: Set correct value for
> CONFIG_SITE.
>
> meta/classes/populate_sdk.bbclass | 13 +---------
> meta/classes/toolchain-scripts.bbclass | 34 +++++++++++++++++++++++-----
> meta/recipes-core/meta/meta-environment.bb | 16 ++----------
> meta/recipes-core/meta/meta-toolchain.bb | 4 ++-
> 4 files changed, 36 insertions(+), 31 deletions(-)
>
> _______________________________________________
> poky mailing list
> poky@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/poky
>
All merged into Master
Thanks
Sau!
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 0/3] [Bug#728] corrected environment files content
2011-02-16 17:05 ` Richard Purdie
@ 2011-02-17 3:12 ` Lu, Lianhao
0 siblings, 0 replies; 8+ messages in thread
From: Lu, Lianhao @ 2011-02-17 3:12 UTC (permalink / raw)
To: Richard Purdie; +Cc: poky
Richard Purdie wrote on 2011-02-17:
> On Wed, 2011-02-16 at 17:35 +0800, Lianhao Lu wrote:
>> From: Lianhao Lu <lianhao.lu@intel.com>
>>
>> 1. Added libtool sysroot related param value into environment files. 2.
>> Moved common code between meta-environment.bb and populate_sdk.bbclass
>> into toolchain-script.bbclass. 3. Set CONFIG_SITE to pkgconfig site
>> files for meta-toolchain.bb.
>>
>> Pull URL: git://git.pokylinux.org/poky-contrib.git
>> Branch: llu/bug728
>> Browse:
>> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=llu/bug728
>>
>> Thanks,
>> Lianhao Lu <lianhao.lu@intel.com>
>
> Hi Lianhao,
>
> It looks like part of the first patch should really be in the second patch?
I've re-orged the patch and resent the pull requests.
> I also don't understand the third change, how are CONFIG_SITE and
> pkgconfig connected?
Sorry, it should be config site for autoconf, not pkgconfig. The original config site file generated by meta-toolchain.bb was empty because the CONFIG_SITE was never set in it.
Best Regards,
Lianhao
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 0/3] [Bug#728] corrected environment files content
2011-02-16 9:35 [PATCH 0/3] [Bug#728] " Lianhao Lu
@ 2011-02-16 17:05 ` Richard Purdie
2011-02-17 3:12 ` Lu, Lianhao
0 siblings, 1 reply; 8+ messages in thread
From: Richard Purdie @ 2011-02-16 17:05 UTC (permalink / raw)
To: Lianhao Lu; +Cc: poky
On Wed, 2011-02-16 at 17:35 +0800, Lianhao Lu wrote:
> From: Lianhao Lu <lianhao.lu@intel.com>
>
> 1. Added libtool sysroot related param value into environment files.
> 2. Moved common code between meta-environment.bb and populate_sdk.bbclass into toolchain-script.bbclass.
> 3. Set CONFIG_SITE to pkgconfig site files for meta-toolchain.bb.
>
> Pull URL: git://git.pokylinux.org/poky-contrib.git
> Branch: llu/bug728
> Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=llu/bug728
>
> Thanks,
> Lianhao Lu <lianhao.lu@intel.com>
Hi Lianhao,
It looks like part of the first patch should really be in the second
patch?
I also don't understand the third change, how are CONFIG_SITE and
pkgconfig connected?
Cheers,
Richard
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 0/3] [Bug#728] corrected environment files content
@ 2011-02-16 9:35 Lianhao Lu
2011-02-16 17:05 ` Richard Purdie
0 siblings, 1 reply; 8+ messages in thread
From: Lianhao Lu @ 2011-02-16 9:35 UTC (permalink / raw)
To: poky
From: Lianhao Lu <lianhao.lu@intel.com>
1. Added libtool sysroot related param value into environment files.
2. Moved common code between meta-environment.bb and populate_sdk.bbclass into toolchain-script.bbclass.
3. Set CONFIG_SITE to pkgconfig site files for meta-toolchain.bb.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: llu/bug728
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=llu/bug728
Thanks,
Lianhao Lu <lianhao.lu@intel.com>
---
Lianhao Lu (3):
toolchain-scripts.bbclass: Added libtool sysroot support.
meta-environment/populate_sdk: moving common code to
toolchain-script.
meta-toolchain.bb: Set value for CONFIG_SITE.
meta/classes/populate_sdk.bbclass | 14 +----------
meta/classes/toolchain-scripts.bbclass | 34 +++++++++++++++++++++++-----
meta/recipes-core/meta/meta-environment.bb | 16 ++----------
meta/recipes-core/meta/meta-toolchain.bb | 4 ++-
4 files changed, 36 insertions(+), 32 deletions(-)
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2011-02-22 15:53 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-02-17 3:08 [PATCH 0/3] [Bug #728] corrected environment files content Lianhao Lu
2011-02-17 3:08 ` [PATCH 1/3] toolchain-scripts.bbclass: Added libtool sysroot support Lianhao Lu
2011-02-17 3:08 ` [PATCH 2/3] toolchain-script/populate_sdk/meta-toolchain: moving common code Lianhao Lu
2011-02-17 3:08 ` [PATCH 3/3] recipe-core/meta/meta-toolchain.bb: Set correct value for CONFIG_SITE Lianhao Lu
2011-02-22 15:53 ` [PATCH 0/3] [Bug #728] corrected environment files content Saul Wold
-- strict thread matches above, loose matches on Subject: below --
2011-02-16 9:35 [PATCH 0/3] [Bug#728] " Lianhao Lu
2011-02-16 17:05 ` Richard Purdie
2011-02-17 3:12 ` Lu, Lianhao
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.