summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/cross-canadian.bbclass16
-rw-r--r--meta/classes/crosssdk.bbclass2
-rw-r--r--meta/classes/nativesdk.bbclass5
-rw-r--r--meta/classes/package_ipk.bbclass19
4 files changed, 20 insertions, 22 deletions
diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass
index 334f12cdae..bd738ecd4d 100644
--- a/meta/classes/cross-canadian.bbclass
+++ b/meta/classes/cross-canadian.bbclass
@@ -6,7 +6,8 @@ EXCLUDE_FROM_WORLD = "1"
6OLD_MULTIMACH_ARCH := "${MULTIMACH_ARCH}" 6OLD_MULTIMACH_ARCH := "${MULTIMACH_ARCH}"
7# Save PACKAGE_ARCH 7# Save PACKAGE_ARCH
8OLD_PACKAGE_ARCH := ${PACKAGE_ARCH} 8OLD_PACKAGE_ARCH := ${PACKAGE_ARCH}
9PACKAGE_ARCH = "${HOST_ARCH}-${OLD_PACKAGE_ARCH}-nativesdk" 9PACKAGE_ARCH = "${SDK_ARCH}-${TARGET_ARCH}-canadian"
10PACKAGE_ARCHS = "${PACKAGE_ARCH}"
10# Also save BASE_PACKAGE_ARCH since HOST_ARCH can influence it 11# Also save BASE_PACKAGE_ARCH since HOST_ARCH can influence it
11OLD_BASE_PACKAGE_ARCH := "${BASE_PACKAGE_ARCH}" 12OLD_BASE_PACKAGE_ARCH := "${BASE_PACKAGE_ARCH}"
12BASE_PACKAGE_ARCH = "${OLD_BASE_PACKAGE_ARCH}" 13BASE_PACKAGE_ARCH = "${OLD_BASE_PACKAGE_ARCH}"
@@ -17,7 +18,7 @@ STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_SYS}-nativesdk"
17STAGING_DIR_TARGET = "${STAGING_DIR}/${BASEPKG_TARGET_SYS}" 18STAGING_DIR_TARGET = "${STAGING_DIR}/${BASEPKG_TARGET_SYS}"
18 19
19PATH_append = ":${TMPDIR}/cross/${HOST_ARCH}/${bindir_cross}" 20PATH_append = ":${TMPDIR}/cross/${HOST_ARCH}/${bindir_cross}"
20PKGDATA_DIR = "${TMPDIR}/pkgdata/${MULTIMACH_HOST_SYS}" 21PKGDATA_DIR = "${TMPDIR}/pkgdata/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}"
21 22
22HOST_ARCH = "${SDK_ARCH}" 23HOST_ARCH = "${SDK_ARCH}"
23HOST_VENDOR = "${SDK_VENDOR}" 24HOST_VENDOR = "${SDK_VENDOR}"
@@ -43,14 +44,3 @@ FILES_${PN}-dbg += "${prefix}/.debug \
43export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${layout_libdir}/pkgconfig" 44export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${layout_libdir}/pkgconfig"
44export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}" 45export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}"
45 46
46python () {
47 barch = bb.data.getVar('HOST_ARCH', d, True)
48 archs = bb.data.getVar('PACKAGE_ARCHS', d, True).split()
49 sdkarchs = []
50 for arch in archs:
51 sdkarchs.append(barch + '-' + arch + '-nativesdk')
52 bb.data.setVar('PACKAGE_ARCHS', " ".join(sdkarchs), d)
53}
54
55
56
diff --git a/meta/classes/crosssdk.bbclass b/meta/classes/crosssdk.bbclass
index 66be3ee216..0b1af8fc2f 100644
--- a/meta/classes/crosssdk.bbclass
+++ b/meta/classes/crosssdk.bbclass
@@ -4,7 +4,7 @@ PACKAGES = ""
4 4
5BASE_PACKAGE_ARCH = "${SDK_ARCH}" 5BASE_PACKAGE_ARCH = "${SDK_ARCH}"
6PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}" 6PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}"
7STAGING_DIR_TARGET = "${STAGING_DIR}/${SDK_ARCH}-${TARGET_ARCH}-nativesdk${TARGET_VENDOR}-${TARGET_OS}" 7STAGING_DIR_TARGET = "${STAGING_DIR}/${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}"
8 8
9TARGET_ARCH = "${SDK_ARCH}" 9TARGET_ARCH = "${SDK_ARCH}"
10TARGET_VENDOR = "${SDK_VENDOR}" 10TARGET_VENDOR = "${SDK_VENDOR}"
diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass
index 964d39955b..b0273ace0f 100644
--- a/meta/classes/nativesdk.bbclass
+++ b/meta/classes/nativesdk.bbclass
@@ -6,13 +6,12 @@ EXCLUDE_FROM_WORLD = "1"
6# Update BASE_PACKAGE_ARCH and PACKAGE_ARCHS 6# Update BASE_PACKAGE_ARCH and PACKAGE_ARCHS
7# 7#
8OLD_PACKAGE_ARCH := ${BASE_PACKAGE_ARCH} 8OLD_PACKAGE_ARCH := ${BASE_PACKAGE_ARCH}
9BASE_PACKAGE_ARCH = "${HOST_ARCH}-${OLD_PACKAGE_ARCH}-nativesdk" 9BASE_PACKAGE_ARCH = "${SDK_ARCH}-nativesdk"
10python () { 10python () {
11 barch = bb.data.getVar('HOST_ARCH', d, True)
12 archs = bb.data.getVar('PACKAGE_ARCHS', d, True).split() 11 archs = bb.data.getVar('PACKAGE_ARCHS', d, True).split()
13 sdkarchs = [] 12 sdkarchs = []
14 for arch in archs: 13 for arch in archs:
15 sdkarchs.append(barch + '-' + arch + '-nativesdk') 14 sdkarchs.append(arch + '-nativesdk')
16 bb.data.setVar('PACKAGE_ARCHS', " ".join(sdkarchs), d) 15 bb.data.setVar('PACKAGE_ARCHS', " ".join(sdkarchs), d)
17} 16}
18 17
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index ebd8320a2c..68a8b5c40b 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -37,7 +37,7 @@ python package_ipk_install () {
37 bb.error("PACKAGE_ARCHS missing") 37 bb.error("PACKAGE_ARCHS missing")
38 raise FuncFailed 38 raise FuncFailed
39 ipkg_archs = ipkg_archs.split() 39 ipkg_archs = ipkg_archs.split()
40 arch_priority = 1 40 arch_priority = 1na
41 41
42 f = open(conffile,"w") 42 f = open(conffile,"w")
43 for arch in ipkg_archs: 43 for arch in ipkg_archs:
@@ -75,9 +75,12 @@ package_update_index_ipk () {
75 75
76 packagedirs="${DEPLOY_DIR_IPK}" 76 packagedirs="${DEPLOY_DIR_IPK}"
77 for arch in $ipkgarchs; do 77 for arch in $ipkgarchs; do
78 packagedirs="$packagedirs ${DEPLOY_DIR_IPK}/$arch ${DEPLOY_DIR_IPK}/${SDK_ARCH}-$arch-nativesdk" 78 sdkarch=`echo $arch | sed -e 's/${HOST_ARCH}/${SDK_ARCH}/'`
79 packagedirs="$packagedirs ${DEPLOY_DIR_IPK}/$arch ${DEPLOY_DIR_IPK}/$sdkarch-nativesdk"
79 done 80 done
80 81
82 packagedirs="$packagedirs ${DEPLOY_DIR_IPK}/${SDK_ARCH}-${TARGET_ARCH}-canadian"
83
81 for pkgdir in $packagedirs; do 84 for pkgdir in $packagedirs; do
82 if [ -e $pkgdir/ ]; then 85 if [ -e $pkgdir/ ]; then
83 touch $pkgdir/Packages 86 touch $pkgdir/Packages
@@ -100,20 +103,26 @@ package_generate_ipkg_conf () {
100 if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then 103 if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then
101 echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${IPKGCONF_TARGET} 104 echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${IPKGCONF_TARGET}
102 fi 105 fi
103 if [ -e ${DEPLOY_DIR_IPK}/${SDK_ARCH}-$arch-nativesdk/Packages ] ; then 106 sdkarch=`echo $arch | sed -e 's/${HOST_ARCH}/${SDK_ARCH}/'`
104 echo "src oe-${SDK_ARCH}-$arch-nativesdk file:${DEPLOY_DIR_IPK}/${SDK_ARCH}-$arch-nativesdk" >> ${IPKGCONF_SDK} 107 if [ -e ${DEPLOY_DIR_IPK}/$sdkarch-nativesdk/Packages ] ; then
108 echo "src oe-$sdkarch-nativesdk file:${DEPLOY_DIR_IPK}/$sdkarch-nativesdk" >> ${IPKGCONF_SDK}
105 fi 109 fi
106 done 110 done
111 if [ -e ${DEPLOY_DIR_IPK}/${SDK_ARCH}-${TARGET_ARCH}-canadian/Packages ] ; then
112 echo "src oe-${SDK_ARCH}-${TARGET_ARCH}-canadian file:${DEPLOY_DIR_IPK}/${SDK_ARCH}-${TARGET_ARCH}-canadian" >> ${IPKGCONF_SDK}
113 fi
107} 114}
108 115
109package_generate_archlist () { 116package_generate_archlist () {
110 ipkgarchs="${PACKAGE_ARCHS}" 117 ipkgarchs="${PACKAGE_ARCHS}"
111 priority=1 118 priority=1
112 for arch in $ipkgarchs; do 119 for arch in $ipkgarchs; do
120 sdkarch=`echo $arch | sed -e 's/${HOST_ARCH}/${SDK_ARCH}/'`
113 echo "arch $arch $priority" >> ${IPKGCONF_TARGET} 121 echo "arch $arch $priority" >> ${IPKGCONF_TARGET}
114 echo "arch ${SDK_ARCH}-$arch-nativesdk $priority" >> ${IPKGCONF_SDK} 122 echo "arch $sdkarch-nativesdk $priority" >> ${IPKGCONF_SDK}
115 priority=$(expr $priority + 5) 123 priority=$(expr $priority + 5)
116 done 124 done
125 echo "arch ${SDK_ARCH}-${TARGET_ARCH}-canadian $priority" >> ${IPKGCONF_SDK}
117} 126}
118 127
119python do_package_ipk () { 128python do_package_ipk () {