Skip to contentSkip to conversation

Couple minor fixes that omitted in the recent OECORE rename

PATCH Applied Jessica Zhang 2 participants 3 messages May 17, 2011 – May 20, 2011

lore
Share & tools
lore

Jessica Zhang

author
#0 lore raw

cover Couple minor fixes that omitted in the recent OECORE rename

From: Jessica Zhang <[email protected]>

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: jzhang/oe-rename
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jzhang/oe-rename

Thanks,
Jessica Zhang <[email protected]>
---

Jessica Zhang (1):
Couple minor fixes for the OECORE rename

 meta/classes/toolchain-scripts.bbclass |    6 +++---
 meta/conf/bitbake.conf                 |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
author
#1 lore raw

PATCH 1/1 Couple minor fixes for the OECORE rename

From: Jessica Zhang <[email protected]>

Signed-off-by Jessica Zhang <[email protected]>
---
 meta/classes/toolchain-scripts.bbclass |    6 +++---
 meta/conf/bitbake.conf                 |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
meta/classes/toolchain-scripts.bbclass +3 -3
index aa34b98..09ecd7c 100644
@@ -27,7 +27,7 @@ toolchain_create_sdk_env_script () {
 	echo 'export LDFLAGS="--sysroot=${SDKTARGETSYSROOT}"' >> $script
 	echo 'export CPPFLAGS="--sysroot=${SDKTARGETSYSROOT}"' >> $script
 	echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script
-	echo 'export POKY_TARGET_SYSROOT="${SDKTARGETSYSROOT}"' >> $script
+	echo 'export OECORE_TARGET_SYSROOT="${SDKTARGETSYSROOT}"' >> $script
 	echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
 }
 

@@ -58,7 +58,7 @@ toolchain_create_tree_env_script () {
 	echo 'export CFLAGS="${TARGET_CC_ARCH}"' >> $script
 	echo 'export CXXFLAGS="${TARGET_CC_ARCH}"' >> $script
 	echo 'export OECORE_NATIVE_SYSROOT="${STAGING_DIR_NATIVE}"' >> $script
-	echo 'export POKY_TARGET_SYSROOT="${STAGING_DIR_TARGET}"' >> $script
+	echo 'export OECORE_TARGET_SYSROOT="${STAGING_DIR_TARGET}"' >> $script
 }
 
 # This function creates an environment-setup-script for use by the ADT installer

@@ -88,7 +88,7 @@ toolchain_create_sdk_env_script_for_installer () {
 	echo 'export LDFLAGS="--sysroot=##SDKTARGETSYSROOT##"' >> $script
 	echo 'export CPPFLAGS="--sysroot=##SDKTARGETSYSROOT##"' >> $script
 	echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script
-	echo 'export POKY_TARGET_SYSROOT="##SDKTARGETSYSROOT##"' >> $script
+	echo 'export OECORE_TARGET_SYSROOT="##SDKTARGETSYSROOT##"' >> $script
 	echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
 	echo 'export POKY_SDK_VERSION="${SDK_VERSION}"' >> $script
 }
meta/conf/bitbake.conf +1 -1
index 8b6236e..484fc5e 100644
@@ -327,7 +327,7 @@ DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools"
 
 PKGDATA_DIR = "${TMPDIR}/pkgdata/${MULTIMACH_TARGET_SYS}"
 
-SDK_NAME = "${DISTRO}-${SDK_ARCH}-${TARGET_ARCH}"
+SDK_NAME = "oecore-${SDK_ARCH}-${TARGET_ARCH}"
 SDKPATH = "/usr/local/${SDK_NAME}"
 SDKPATHNATIVE = "${SDKPATH}/sysroots/${SDK_SYS}"
Signature · 1 line
1.7.0.4
Applied
#2 lore raw
In reply to Jessica Zhang
Quoted 20 lines · Jessica Zhang

From: Jessica Zhang<[email protected]>

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: jzhang/oe-rename
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jzhang/oe-rename

Thanks,
Jessica Zhang<[email protected]>
---

Jessica Zhang (1):
Couple minor fixes for the OECORE rename

  meta/classes/toolchain-scripts.bbclass |    6 +++---
  meta/conf/bitbake.conf                 |    2 +-
  2 files changed, 4 insertions(+), 4 deletions(-)
Quoted 5 lines

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Merged into oe-core and poky

Thanks
Sau!