summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-12-10 16:57:21 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-12-10 16:57:21 +0000
commit05053efa86e457fd08785d1401365bd763342477 (patch)
tree2edeee0081b42a34b13dffce6ed4678d2f11ec3f /meta/classes
parent88ee037741b7e21ff50976a6c5b85278499655ca (diff)
downloadpoky-05053efa86e457fd08785d1401365bd763342477.tar.gz
cross-canadian: Update after PN changes to include TARGET_ARCH
This patch massively simplifies the canadian packaging and allows multiple toolchain targets to be parallel installed into the same nativesdk sysroot without package name conflits. Since we now do this, we can simplify cross-canadian to become more like nativesdk. This is a first pass over this task, similar changes would be desireable to cross and the whole MULTIMACH_ARCH mess can then probably be similified much further. Signed-off-by: Richgard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/cross-canadian.bbclass34
-rw-r--r--meta/classes/package_ipk.bbclass6
2 files changed, 22 insertions, 18 deletions
diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass
index 7971147cbe..9edce31cb5 100644
--- a/meta/classes/cross-canadian.bbclass
+++ b/meta/classes/cross-canadian.bbclass
@@ -1,23 +1,35 @@
1#
2# NOTE - When using this class the user is repsonsible for ensuring that
3# TRANSLATED_TARGET_ARCH is added into PN. This ensures that if the TARGET_ARCH
4# is changed, another nativesdk xxx-canadian-cross can be installed
5#
6
7
1# SDK packages are built either explicitly by the user, 8# SDK packages are built either explicitly by the user,
2# or indirectly via dependency. No need to be in 'world'. 9# or indirectly via dependency. No need to be in 'world'.
3EXCLUDE_FROM_WORLD = "1" 10EXCLUDE_FROM_WORLD = "1"
4 11
5STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${SDK_ARCH}${SDK_VENDOR}-${SDK_OS}:${STAGING_DIR_NATIVE}${bindir_native}/${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}" 12STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${SDK_ARCH}${SDK_VENDOR}-${SDK_OS}:${STAGING_DIR_NATIVE}${bindir_native}/${OLD_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
6 13
7# Save MULTIMACH_ARCH 14#
15# Update BASE_PACKAGE_ARCH and PACKAGE_ARCHS
16#
8OLD_MULTIMACH_ARCH := "${MULTIMACH_ARCH}" 17OLD_MULTIMACH_ARCH := "${MULTIMACH_ARCH}"
9# Save PACKAGE_ARCH 18OLD_PACKAGE_ARCH := ${BASE_PACKAGE_ARCH}
10OLD_PACKAGE_ARCH := ${PACKAGE_ARCH} 19BASE_PACKAGE_ARCH = "${SDK_ARCH}-nativesdk"
11PACKAGE_ARCH = "${SDK_ARCH}-${TARGET_ARCH}-canadian" 20python () {
12PACKAGE_ARCHS = "${PACKAGE_ARCH}" 21 archs = bb.data.getVar('PACKAGE_ARCHS', d, True).split()
13# Also save BASE_PACKAGE_ARCH since HOST_ARCH can influence it 22 sdkarchs = []
14OLD_BASE_PACKAGE_ARCH := "${BASE_PACKAGE_ARCH}" 23 for arch in archs:
15BASE_PACKAGE_ARCH = "${OLD_BASE_PACKAGE_ARCH}" 24 sdkarchs.append(arch + '-nativesdk')
25 bb.data.setVar('PACKAGE_ARCHS', " ".join(sdkarchs), d)
26}
27MULTIMACH_TARGET_SYS = "${MULTIMACH_ARCH}${HOST_VENDOR}-${HOST_OS}"
16 28
17INHIBIT_DEFAULT_DEPS = "1" 29INHIBIT_DEFAULT_DEPS = "1"
18 30
19STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_SYS}-nativesdk" 31STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_SYS}-nativesdk"
20STAGING_DIR_TARGET = "${STAGING_DIR}/${BASEPKG_TARGET_SYS}" 32STAGING_DIR_TARGET = "${STAGING_DIR}/${OLD_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
21 33
22TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}" 34TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}"
23 35
@@ -69,5 +81,3 @@ export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}"
69# Cross-canadian packages need to pull in nativesdk dynamic libs 81# Cross-canadian packages need to pull in nativesdk dynamic libs
70SHLIBSDIR = "${STAGING_DIR}/${SDK_ARCH}-nativesdk${SDK_VENDOR}-${BUILD_OS}/shlibs" 82SHLIBSDIR = "${STAGING_DIR}/${SDK_ARCH}-nativesdk${SDK_VENDOR}-${BUILD_OS}/shlibs"
71 83
72# handle x86_64 TARGET_ARCH name
73TRANSLATED_TARGET_ARCH ?= ${TARGET_ARCH}
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index c1393fa764..5ddd6c66ea 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -79,8 +79,6 @@ package_update_index_ipk () {
79 packagedirs="$packagedirs ${DEPLOY_DIR_IPK}/$arch ${DEPLOY_DIR_IPK}/$sdkarch-nativesdk" 79 packagedirs="$packagedirs ${DEPLOY_DIR_IPK}/$arch ${DEPLOY_DIR_IPK}/$sdkarch-nativesdk"
80 done 80 done
81 81
82 packagedirs="$packagedirs ${DEPLOY_DIR_IPK}/${SDK_ARCH}-${TARGET_ARCH}-canadian"
83
84 for pkgdir in $packagedirs; do 82 for pkgdir in $packagedirs; do
85 if [ -e $pkgdir/ ]; then 83 if [ -e $pkgdir/ ]; then
86 touch $pkgdir/Packages 84 touch $pkgdir/Packages
@@ -112,9 +110,6 @@ package_generate_ipkg_conf () {
112 echo "src oe-$sdkarch$extension file:${DEPLOY_DIR_IPK}/$sdkarch$extension" >> ${IPKGCONF_SDK} 110 echo "src oe-$sdkarch$extension file:${DEPLOY_DIR_IPK}/$sdkarch$extension" >> ${IPKGCONF_SDK}
113 fi 111 fi
114 done 112 done
115 if [ -e ${DEPLOY_DIR_IPK}/${SDK_ARCH}-${TARGET_ARCH}-canadian/Packages ] ; then
116 echo "src oe-${SDK_ARCH}-${TARGET_ARCH}-canadian file:${DEPLOY_DIR_IPK}/${SDK_ARCH}-${TARGET_ARCH}-canadian" >> ${IPKGCONF_SDK}
117 fi
118} 113}
119 114
120package_generate_archlist () { 115package_generate_archlist () {
@@ -130,7 +125,6 @@ package_generate_archlist () {
130 echo "arch $sdkarch$extension $priority" >> ${IPKGCONF_SDK} 125 echo "arch $sdkarch$extension $priority" >> ${IPKGCONF_SDK}
131 priority=$(expr $priority + 5) 126 priority=$(expr $priority + 5)
132 done 127 done
133 echo "arch ${SDK_ARCH}-${TARGET_ARCH}-canadian $priority" >> ${IPKGCONF_SDK}
134} 128}
135 129
136python do_package_ipk () { 130python do_package_ipk () {