summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-09-10 17:58:36 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-09-10 17:58:36 +0100
commit846794c17e88ae9d7a79bdebf31c0ab31474c22a (patch)
tree1a21afbef4a8dbce599c430d63ce43a5d060156c
parentd6719550db330dd3d9c77a597dba29ff052aed8e (diff)
downloadpoky-846794c17e88ae9d7a79bdebf31c0ab31474c22a.tar.gz
bitbake.conf: Rename SDK_PREFIX SDKPATH
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta-moblin/conf/distro/moblin.conf2
-rw-r--r--meta/classes/sdk.bbclass2
-rw-r--r--meta/conf/bitbake.conf2
-rw-r--r--meta/conf/distro/include/poky-external.inc2
-rw-r--r--meta/conf/distro/poky.conf2
-rw-r--r--meta/packages/meta/meta-toolchain.bb72
6 files changed, 41 insertions, 41 deletions
diff --git a/meta-moblin/conf/distro/moblin.conf b/meta-moblin/conf/distro/moblin.conf
index 71a951c0e8..1d5fe795ca 100644
--- a/meta-moblin/conf/distro/moblin.conf
+++ b/meta-moblin/conf/distro/moblin.conf
@@ -53,7 +53,7 @@ POKYLIBC ?= "glibc"
53require conf/distro/include/poky-${POKYLIBC}.inc 53require conf/distro/include/poky-${POKYLIBC}.inc
54 54
55SDK_NAME = "${DISTRO}-${POKYMODE}-${POKYLIBC}-${HOST_ARCH}-${TARGET_ARCH}" 55SDK_NAME = "${DISTRO}-${POKYMODE}-${POKYLIBC}-${HOST_ARCH}-${TARGET_ARCH}"
56SDK_PREFIX = "/usr/local/${DISTRO}/${POKYMODE}-${POKYLIBC}/${TARGET_ARCH}" 56SDKPATH = "/usr/local/${DISTRO}/${POKYMODE}-${POKYLIBC}/${TARGET_ARCH}"
57 57
58CACHE = "${TMPDIR}/cache/${POKYMODE}-${POKYLIBC}${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}" 58CACHE = "${TMPDIR}/cache/${POKYMODE}-${POKYLIBC}${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}"
59 59
diff --git a/meta/classes/sdk.bbclass b/meta/classes/sdk.bbclass
index 20670e8854..a109333113 100644
--- a/meta/classes/sdk.bbclass
+++ b/meta/classes/sdk.bbclass
@@ -27,7 +27,7 @@ CXXFLAGS = "${BUILDSDK_CFLAGS}"
27LDFLAGS = "${BUILDSDK_LDFLAGS}" 27LDFLAGS = "${BUILDSDK_LDFLAGS}"
28 28
29# Path prefixes 29# Path prefixes
30prefix = "${SDK_PREFIX}" 30prefix = "${SDKPATH}"
31exec_prefix = "${prefix}" 31exec_prefix = "${prefix}"
32base_prefix = "${prefix}" 32base_prefix = "${prefix}"
33 33
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 59aa2efea2..b48b129fff 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -292,7 +292,7 @@ DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools"
292PKGDATA_DIR = "${TMPDIR}/pkgdata/${MULTIMACH_TARGET_SYS}" 292PKGDATA_DIR = "${TMPDIR}/pkgdata/${MULTIMACH_TARGET_SYS}"
293 293
294SDK_NAME = "${DISTRO}/${TARGET_ARCH}" 294SDK_NAME = "${DISTRO}/${TARGET_ARCH}"
295SDK_PREFIX = "/usr/local/${SDK_NAME}" 295SDKPATH = "/usr/local/${SDK_NAME}"
296 296
297################################################################## 297##################################################################
298# Kernel info. 298# Kernel info.
diff --git a/meta/conf/distro/include/poky-external.inc b/meta/conf/distro/include/poky-external.inc
index 8c6d967f2d..e3212c712d 100644
--- a/meta/conf/distro/include/poky-external.inc
+++ b/meta/conf/distro/include/poky-external.inc
@@ -4,7 +4,7 @@
4 4
5TARGET_VENDOR = "-poky" 5TARGET_VENDOR = "-poky"
6 6
7EXTERNAL_TOOLCHAIN = "${SDK_PREFIX}" 7EXTERNAL_TOOLCHAIN = "${SDKPATH}"
8 8
9PATH =. "${EXTERNAL_TOOLCHAIN}/bin:" 9PATH =. "${EXTERNAL_TOOLCHAIN}/bin:"
10 10
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index d8c29582d4..a89132f6a3 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -59,7 +59,7 @@ POKYLIBC ?= "glibc"
59require conf/distro/include/poky-${POKYLIBC}.inc 59require conf/distro/include/poky-${POKYLIBC}.inc
60 60
61SDK_NAME = "${DISTRO}-${POKYMODE}-${POKYLIBC}-${BUILD_ARCH}-${TARGET_ARCH}" 61SDK_NAME = "${DISTRO}-${POKYMODE}-${POKYLIBC}-${BUILD_ARCH}-${TARGET_ARCH}"
62SDK_PREFIX = "/usr/local/${DISTRO}/${POKYMODE}-${POKYLIBC}/${TARGET_ARCH}" 62SDKPATH = "/usr/local/${DISTRO}/${POKYMODE}-${POKYLIBC}/${TARGET_ARCH}"
63 63
64CACHE = "${TMPDIR}/cache/${POKYMODE}-${POKYLIBC}${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}" 64CACHE = "${TMPDIR}/cache/${POKYMODE}-${POKYLIBC}${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}"
65 65
diff --git a/meta/packages/meta/meta-toolchain.bb b/meta/packages/meta/meta-toolchain.bb
index f7c3726722..65b802f6b2 100644
--- a/meta/packages/meta/meta-toolchain.bb
+++ b/meta/packages/meta/meta-toolchain.bb
@@ -10,7 +10,7 @@ SDK_OUTPUT2 = "${SDK_DIR}/image-extras"
10SDK_DEPLOY = "${TMPDIR}/deploy/sdk" 10SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
11 11
12IPKG_HOST = "opkg-cl -f ${IPKGCONF_SDK} -o ${SDK_OUTPUT}" 12IPKG_HOST = "opkg-cl -f ${IPKGCONF_SDK} -o ${SDK_OUTPUT}"
13IPKG_TARGET = "opkg-cl -f ${IPKGCONF_TARGET} -o ${SDK_OUTPUT}/${SDK_PREFIX}/${TARGET_SYS}" 13IPKG_TARGET = "opkg-cl -f ${IPKGCONF_TARGET} -o ${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS}"
14 14
15TOOLCHAIN_HOST_TASK ?= "task-sdk-host" 15TOOLCHAIN_HOST_TASK ?= "task-sdk-host"
16TOOLCHAIN_TARGET_TASK ?= "task-poky-standalone-sdk-target task-poky-standalone-sdk-target-dbg" 16TOOLCHAIN_TARGET_TASK ?= "task-poky-standalone-sdk-target task-poky-standalone-sdk-target-dbg"
@@ -25,7 +25,7 @@ do_populate_sdk() {
25 rm -rf ${SDK_OUTPUT2} 25 rm -rf ${SDK_OUTPUT2}
26 mkdir -p ${SDK_OUTPUT} 26 mkdir -p ${SDK_OUTPUT}
27 mkdir -p ${SDK_OUTPUT}${layout_libdir}/opkg/ 27 mkdir -p ${SDK_OUTPUT}${layout_libdir}/opkg/
28 mkdir -p ${SDK_OUTPUT}/${SDK_PREFIX}/${TARGET_SYS}${layout_libdir}/opkg/ 28 mkdir -p ${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS}${layout_libdir}/opkg/
29 29
30 rm -f ${IPKGCONF_TARGET} 30 rm -f ${IPKGCONF_TARGET}
31 touch ${IPKGCONF_TARGET} 31 touch ${IPKGCONF_TARGET}
@@ -45,39 +45,39 @@ do_populate_sdk() {
45 ${IPKG_TARGET} update 45 ${IPKG_TARGET} update
46 ${IPKG_TARGET} install ${TOOLCHAIN_TARGET_TASK} 46 ${IPKG_TARGET} install ${TOOLCHAIN_TARGET_TASK}
47 47
48 install -d ${SDK_OUTPUT}/${SDK_PREFIX}/usr/lib/opkg 48 install -d ${SDK_OUTPUT}/${SDKPATH}/usr/lib/opkg
49 mv ${SDK_OUTPUT}/usr/lib/opkg/* ${SDK_OUTPUT}/${SDK_PREFIX}/usr/lib/opkg/ 49 mv ${SDK_OUTPUT}/usr/lib/opkg/* ${SDK_OUTPUT}/${SDKPATH}/usr/lib/opkg/
50 rm -Rf ${SDK_OUTPUT}/usr/lib 50 rm -Rf ${SDK_OUTPUT}/usr/lib
51 51
52 install -d ${SDK_OUTPUT}/${SDK_PREFIX}/${TARGET_SYS}/${layout_sysconfdir} 52 install -d ${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS}/${layout_sysconfdir}
53 install -m 0644 ${IPKGCONF_TARGET} ${IPKGCONF_SDK} ${SDK_OUTPUT}/${SDK_PREFIX}/${TARGET_SYS}/${layout_sysconfdir}/ 53 install -m 0644 ${IPKGCONF_TARGET} ${IPKGCONF_SDK} ${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS}/${layout_sysconfdir}/
54 54
55 install -d ${SDK_OUTPUT}/${SDK_PREFIX}/${sysconfdir} 55 install -d ${SDK_OUTPUT}/${SDKPATH}/${sysconfdir}
56 install -m 0644 ${IPKGCONF_SDK} ${SDK_OUTPUT}/${SDK_PREFIX}/${sysconfdir}/ 56 install -m 0644 ${IPKGCONF_SDK} ${SDK_OUTPUT}/${SDKPATH}/${sysconfdir}/
57 57
58 # extract and store ipks, pkgdata and shlibs data 58 # extract and store ipks, pkgdata and shlibs data
59 target_pkgs=`cat ${SDK_OUTPUT}/${SDK_PREFIX}/${TARGET_SYS}/usr/lib/opkg/status | grep Package: | cut -f 2 -d ' '` 59 target_pkgs=`cat ${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS}/usr/lib/opkg/status | grep Package: | cut -f 2 -d ' '`
60 mkdir -p ${SDK_OUTPUT2}/${SDK_PREFIX}/ipk/ 60 mkdir -p ${SDK_OUTPUT2}/${SDKPATH}/ipk/
61 mkdir -p ${SDK_OUTPUT2}/${SDK_PREFIX}/pkgdata/runtime/ 61 mkdir -p ${SDK_OUTPUT2}/${SDKPATH}/pkgdata/runtime/
62 mkdir -p ${SDK_OUTPUT2}/${SDK_PREFIX}/${TARGET_SYS}/shlibs/ 62 mkdir -p ${SDK_OUTPUT2}/${SDKPATH}/${TARGET_SYS}/shlibs/
63 for pkg in $target_pkgs ; do 63 for pkg in $target_pkgs ; do
64 for arch in $revipkgarchs; do 64 for arch in $revipkgarchs; do
65 pkgnames=${DEPLOY_DIR_IPK}/$arch/${pkg}_*_$arch.ipk 65 pkgnames=${DEPLOY_DIR_IPK}/$arch/${pkg}_*_$arch.ipk
66 if [ -e $pkgnames ]; then 66 if [ -e $pkgnames ]; then
67 echo "Found $pkgnames" 67 echo "Found $pkgnames"
68 cp $pkgnames ${SDK_OUTPUT2}/${SDK_PREFIX}/ipk/ 68 cp $pkgnames ${SDK_OUTPUT2}/${SDKPATH}/ipk/
69 orig_pkg=`opkg-list-fields $pkgnames | grep OE: | cut -d ' ' -f2` 69 orig_pkg=`opkg-list-fields $pkgnames | grep OE: | cut -d ' ' -f2`
70 pkg_subdir=$arch${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]} 70 pkg_subdir=$arch${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}
71 mkdir -p ${SDK_OUTPUT2}/${SDK_PREFIX}/pkgdata/$pkg_subdir/runtime 71 mkdir -p ${SDK_OUTPUT2}/${SDKPATH}/pkgdata/$pkg_subdir/runtime
72 cp ${TMPDIR}/pkgdata/$pkg_subdir/$orig_pkg ${SDK_OUTPUT2}/${SDK_PREFIX}/pkgdata/$pkg_subdir/ 72 cp ${TMPDIR}/pkgdata/$pkg_subdir/$orig_pkg ${SDK_OUTPUT2}/${SDKPATH}/pkgdata/$pkg_subdir/
73 subpkgs=`cat ${TMPDIR}/pkgdata/$pkg_subdir/$orig_pkg | grep PACKAGES: | cut -b 10-` 73 subpkgs=`cat ${TMPDIR}/pkgdata/$pkg_subdir/$orig_pkg | grep PACKAGES: | cut -b 10-`
74 for subpkg in $subpkgs; do 74 for subpkg in $subpkgs; do
75 cp ${TMPDIR}/pkgdata/$pkg_subdir/runtime/$subpkg ${SDK_OUTPUT2}/${SDK_PREFIX}/pkgdata/$pkg_subdir/runtime/ 75 cp ${TMPDIR}/pkgdata/$pkg_subdir/runtime/$subpkg ${SDK_OUTPUT2}/${SDKPATH}/pkgdata/$pkg_subdir/runtime/
76 if [ -e ${TMPDIR}/pkgdata/$pkg_subdir/runtime/$subpkg.packaged ];then 76 if [ -e ${TMPDIR}/pkgdata/$pkg_subdir/runtime/$subpkg.packaged ];then
77 cp ${TMPDIR}/pkgdata/$pkg_subdir/runtime/$subpkg.packaged ${SDK_OUTPUT2}/${SDK_PREFIX}/pkgdata/$pkg_subdir/runtime/ 77 cp ${TMPDIR}/pkgdata/$pkg_subdir/runtime/$subpkg.packaged ${SDK_OUTPUT2}/${SDKPATH}/pkgdata/$pkg_subdir/runtime/
78 fi 78 fi
79 if [ -e ${STAGING_DIR_TARGET}/shlibs/$subpkg.list ]; then 79 if [ -e ${STAGING_DIR_TARGET}/shlibs/$subpkg.list ]; then
80 cp ${STAGING_DIR_TARGET}/shlibs/$subpkg.* ${SDK_OUTPUT2}/${SDK_PREFIX}/${TARGET_SYS}/shlibs/ 80 cp ${STAGING_DIR_TARGET}/shlibs/$subpkg.* ${SDK_OUTPUT2}/${SDKPATH}/${TARGET_SYS}/shlibs/
81 fi 81 fi
82 done 82 done
83 break 83 break
@@ -86,43 +86,43 @@ do_populate_sdk() {
86 done 86 done
87 87
88 # Fix or remove broken .la files 88 # Fix or remove broken .la files
89 for i in `find ${SDK_OUTPUT}/${SDK_PREFIX}/${TARGET_SYS} -name \*.la`; do 89 for i in `find ${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS} -name \*.la`; do
90 sed -i -e "/^dependency_libs=/s,\([[:space:]']\)${layout_base_libdir},\1${SDK_PREFIX}/${TARGET_SYS}${layout_base_libdir},g" \ 90 sed -i -e "/^dependency_libs=/s,\([[:space:]']\)${layout_base_libdir},\1${SDKPATH}/${TARGET_SYS}${layout_base_libdir},g" \
91 -e "/^dependency_libs=/s,\([[:space:]']\)${layout_libdir},\1${SDK_PREFIX}/${TARGET_SYS}${layout_libdir},g" \ 91 -e "/^dependency_libs=/s,\([[:space:]']\)${layout_libdir},\1${SDKPATH}/${TARGET_SYS}${layout_libdir},g" \
92 -e "/^dependency_libs=/s,\-\([LR]\)${layout_base_libdir},-\1${SDK_PREFIX}/${TARGET_SYS}${layout_base_libdir},g" \ 92 -e "/^dependency_libs=/s,\-\([LR]\)${layout_base_libdir},-\1${SDKPATH}/${TARGET_SYS}${layout_base_libdir},g" \
93 -e "/^dependency_libs=/s,\-\([LR]\)${layout_libdir},-\1${SDK_PREFIX}/${TARGET_SYS}${layout_libdir},g" \ 93 -e "/^dependency_libs=/s,\-\([LR]\)${layout_libdir},-\1${SDKPATH}/${TARGET_SYS}${layout_libdir},g" \
94 -e 's/^installed=yes$/installed=no/' $i 94 -e 's/^installed=yes$/installed=no/' $i
95 done 95 done
96 rm -f ${SDK_OUTPUT}/${SDK_PREFIX}/lib/*.la 96 rm -f ${SDK_OUTPUT}/${SDKPATH}/lib/*.la
97 97
98 # Setup site file for external use 98 # Setup site file for external use
99 siteconfig=${SDK_OUTPUT}/${SDK_PREFIX}/site-config 99 siteconfig=${SDK_OUTPUT}/${SDKPATH}/site-config
100 touch $siteconfig 100 touch $siteconfig
101 for sitefile in ${CONFIG_SITE} ; do 101 for sitefile in ${CONFIG_SITE} ; do
102 cat $sitefile >> $siteconfig 102 cat $sitefile >> $siteconfig
103 done 103 done
104 104
105 # Create environment setup script 105 # Create environment setup script
106 script=${SDK_OUTPUT}/${SDK_PREFIX}/environment-setup 106 script=${SDK_OUTPUT}/${SDKPATH}/environment-setup
107 touch $script 107 touch $script
108 echo 'export PATH=${SDK_PREFIX}/bin:$PATH' >> $script 108 echo 'export PATH=${SDKPATH}/bin:$PATH' >> $script
109 echo 'export PKG_CONFIG_SYSROOT_DIR=${SDK_PREFIX}/${TARGET_SYS}' >> $script 109 echo 'export PKG_CONFIG_SYSROOT_DIR=${SDKPATH}/${TARGET_SYS}' >> $script
110 echo 'export PKG_CONFIG_PATH=${SDK_PREFIX}/${TARGET_SYS}${layout_libdir}/pkgconfig' >> $script 110 echo 'export PKG_CONFIG_PATH=${SDKPATH}/${TARGET_SYS}${layout_libdir}/pkgconfig' >> $script
111 echo 'export CONFIG_SITE=${SDK_PREFIX}/site-config' >> $script 111 echo 'export CONFIG_SITE=${SDKPATH}/site-config' >> $script
112 echo 'export CC=${TARGET_PREFIX}gcc' >> $script 112 echo 'export CC=${TARGET_PREFIX}gcc' >> $script
113 echo 'export CONFIGURE_FLAGS="--target=${TARGET_SYS} --host=${TARGET_SYS} --build=${BUILD_SYS}"' >> $script 113 echo 'export CONFIGURE_FLAGS="--target=${TARGET_SYS} --host=${TARGET_SYS} --build=${BUILD_SYS}"' >> $script
114 if [ "${TARGET_OS}" = "darwin8" ]; then 114 if [ "${TARGET_OS}" = "darwin8" ]; then
115 echo 'export TARGET_CFLAGS="-I${SDK_PREFIX}/${TARGET_SYS}${layout_includedir}"' >> $script 115 echo 'export TARGET_CFLAGS="-I${SDKPATH}/${TARGET_SYS}${layout_includedir}"' >> $script
116 echo 'export TARGET_LDFLAGS="-L${SDK_PREFIX}/${TARGET_SYS}${layout_libdir}"' >> $script 116 echo 'export TARGET_LDFLAGS="-L${SDKPATH}/${TARGET_SYS}${layout_libdir}"' >> $script
117 # Workaround darwin toolchain sysroot path problems 117 # Workaround darwin toolchain sysroot path problems
118 cd ${SDK_OUTPUT}${SDK_PREFIX}/${TARGET_SYS}/usr 118 cd ${SDK_OUTPUT}${SDKPATH}/${TARGET_SYS}/usr
119 ln -s /usr/local local 119 ln -s /usr/local local
120 fi 120 fi
121 echo "alias opkg='LD_LIBRARY_PATH=${SDK_PREFIX}/lib ${SDK_PREFIX}/bin/opkg-cl -f ${SDK_PREFIX}/${sysconfdir}/opkg-sdk.conf -o ${SDK_PREFIX}'" >> $script 121 echo "alias opkg='LD_LIBRARY_PATH=${SDKPATH}/lib ${SDKPATH}/bin/opkg-cl -f ${SDKPATH}/${sysconfdir}/opkg-sdk.conf -o ${SDKPATH}'" >> $script
122 echo "alias opkg-target='LD_LIBRARY_PATH=${SDK_PREFIX}/lib ${SDK_PREFIX}/bin/opkg-cl -f ${SDK_PREFIX}/${TARGET_SYS}${layout_sysconfdir}/opkg.conf -o ${SDK_PREFIX}/${TARGET_SYS}'" >> $script 122 echo "alias opkg-target='LD_LIBRARY_PATH=${SDKPATH}/lib ${SDKPATH}/bin/opkg-cl -f ${SDKPATH}/${TARGET_SYS}${layout_sysconfdir}/opkg.conf -o ${SDKPATH}/${TARGET_SYS}'" >> $script
123 123
124 # Add version information 124 # Add version information
125 versionfile=${SDK_OUTPUT}/${SDK_PREFIX}/version 125 versionfile=${SDK_OUTPUT}/${SDKPATH}/version
126 touch $versionfile 126 touch $versionfile
127 echo 'Distro: ${DISTRO}' >> $versionfile 127 echo 'Distro: ${DISTRO}' >> $versionfile
128 echo 'Distro Version: ${DISTRO_VERSION}' >> $versionfile 128 echo 'Distro Version: ${DISTRO_VERSION}' >> $versionfile