diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-09-17 13:18:48 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-09-17 22:25:25 +0100 |
commit | 3fbbc44cfd0d68c67bda0f6180773922431cca0e (patch) | |
tree | 3323fd0f69941ea8036e5c01ac166fd7f608d656 /meta/classes/package_ipk.bbclass | |
parent | 1c1305d15ced383ff23ede8fa9117db75a61b8b9 (diff) | |
download | poky-3fbbc44cfd0d68c67bda0f6180773922431cca0e.tar.gz |
nativesdk/package_ipk.bbclass: Clean up sdk package architectures
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/classes/package_ipk.bbclass')
-rw-r--r-- | meta/classes/package_ipk.bbclass | 19 |
1 files changed, 14 insertions, 5 deletions
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 | ||
109 | package_generate_archlist () { | 116 | package_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 | ||
119 | python do_package_ipk () { | 128 | python do_package_ipk () { |