diff options
-rw-r--r-- | meta/packages/meta/meta-toolchain.bb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/packages/meta/meta-toolchain.bb b/meta/packages/meta/meta-toolchain.bb index 36c1479b68..16e48a0c56 100644 --- a/meta/packages/meta/meta-toolchain.bb +++ b/meta/packages/meta/meta-toolchain.bb | |||
@@ -75,10 +75,10 @@ do_populate_sdk() { | |||
75 | mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/shlibs/ | 75 | mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/shlibs/ |
76 | for pkg in $target_pkgs ; do | 76 | for pkg in $target_pkgs ; do |
77 | for arch in $revipkgarchs; do | 77 | for arch in $revipkgarchs; do |
78 | if [ -e ${DEPLOY_DIR_IPK}/${pkg}_*_$arch.ipk ]; then | 78 | if [ -e ${DEPLOY_DIR_IPK}/$arch/${pkg}_*_$arch.ipk ]; then |
79 | echo "Found ${DEPLOY_DIR_IPK}/${pkg}_$arch.ipk" | 79 | echo "Found ${DEPLOY_DIR_IPK}/$arch/${pkg}_$arch.ipk" |
80 | cp ${DEPLOY_DIR_IPK}/${pkg}_*_$arch.ipk ${SDK_OUTPUT}/${prefix}/ipk/ | 80 | cp ${DEPLOY_DIR_IPK}/$arch/${pkg}_*_$arch.ipk ${SDK_OUTPUT}/${prefix}/ipk/ |
81 | orig_pkg=`ipkg-list-fields ${DEPLOY_DIR_IPK}/${pkg}_*_$arch.ipk | grep OE: | cut -d ' ' -f2` | 81 | orig_pkg=`ipkg-list-fields ${DEPLOY_DIR_IPK}/$arch/${pkg}_*_$arch.ipk | grep OE: | cut -d ' ' -f2` |
82 | pkg_subdir=$arch${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]} | 82 | pkg_subdir=$arch${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]} |
83 | mkdir -p ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/runtime | 83 | mkdir -p ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/runtime |
84 | cp ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/ | 84 | cp ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/ |
@@ -109,7 +109,7 @@ do_populate_sdk() { | |||
109 | 109 | ||
110 | mkdir -p ${SDK_DEPLOY} | 110 | mkdir -p ${SDK_DEPLOY} |
111 | cd ${SDK_OUTPUT} | 111 | cd ${SDK_OUTPUT} |
112 | fakeroot tar cfj ${SDK_DEPLOY}/${DISTRO}-${DISTRO_VERSION}-${TARGET_ARCH}-toolchain.tar.bz2 . | 112 | fakeroot tar cfj ${SDK_DEPLOY}/${SDK_NAME}-toolchain-${DISTRO_VERSION}.tar.bz2 . |
113 | } | 113 | } |
114 | 114 | ||
115 | do_populate_sdk[nostamp] = "1" | 115 | do_populate_sdk[nostamp] = "1" |