diff options
-rw-r--r-- | meta/packages/meta/meta-toolchain.bb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/meta/packages/meta/meta-toolchain.bb b/meta/packages/meta/meta-toolchain.bb index 91d8f16cb8..1c5f40235e 100644 --- a/meta/packages/meta/meta-toolchain.bb +++ b/meta/packages/meta/meta-toolchain.bb | |||
@@ -79,7 +79,6 @@ EOF | |||
79 | rm ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/$fn | 79 | rm ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/$fn |
80 | ln -s $bname ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/$fn | 80 | ln -s $bname ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/$fn |
81 | fi | 81 | fi |
82 | |||
83 | fi | 82 | fi |
84 | done | 83 | done |
85 | 84 | ||
@@ -97,7 +96,7 @@ EOF | |||
97 | mv ${SDK_OUTPUT}${libdir}/../${TARGET_SYS}/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status | 96 | mv ${SDK_OUTPUT}${libdir}/../${TARGET_SYS}/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status |
98 | rm -Rf ${SDK_OUTPUT}${libdir}/ipkg | 97 | rm -Rf ${SDK_OUTPUT}${libdir}/ipkg |
99 | mv ${SDK_OUTPUT}/usr/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status-host | 98 | mv ${SDK_OUTPUT}/usr/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status-host |
100 | rm -Rf ${SDK_OUTPUT}/usr/lib/ipkg | 99 | rm -Rf ${SDK_OUTPUT}/usr/lib |
101 | 100 | ||
102 | # extract and store ipks, pkgdata, pkgmaps and shlibs data | 101 | # extract and store ipks, pkgdata, pkgmaps and shlibs data |
103 | target_pkgs=`cat ${SDK_OUTPUT}/${prefix}/package-status | grep Package: | cut -f 2 -d ' '` | 102 | target_pkgs=`cat ${SDK_OUTPUT}/${prefix}/package-status | grep Package: | cut -f 2 -d ' '` |
@@ -107,14 +106,12 @@ EOF | |||
107 | mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/shlibs/ | 106 | mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/shlibs/ |
108 | for pkg in $target_pkgs ; do | 107 | for pkg in $target_pkgs ; do |
109 | for arch in $ipkgarchs; do | 108 | for arch in $ipkgarchs; do |
110 | echo "Looking for ${DEPLOY_DIR_IPK}/${pkg}_$arch.ipk" | ||
111 | if [ -e ${DEPLOY_DIR_IPK}/${pkg}_*_$arch.ipk ]; then | 109 | if [ -e ${DEPLOY_DIR_IPK}/${pkg}_*_$arch.ipk ]; then |
110 | echo "Found ${DEPLOY_DIR_IPK}/${pkg}_$arch.ipk" | ||
112 | cp ${DEPLOY_DIR_IPK}/${pkg}_*_$arch.ipk ${SDK_OUTPUT}/${prefix}/ipk/ | 111 | cp ${DEPLOY_DIR_IPK}/${pkg}_*_$arch.ipk ${SDK_OUTPUT}/${prefix}/ipk/ |
113 | orig_pkg=`ipkg-list-fields ${DEPLOY_DIR_IPK}/${pkg}_*_$arch.ipk | grep OE: | cut -d ' ' -f2` | 112 | orig_pkg=`ipkg-list-fields ${DEPLOY_DIR_IPK}/${pkg}_*_$arch.ipk | grep OE: | cut -d ' ' -f2` |
114 | echo $orig_pkg | ||
115 | cp ${STAGING_DIR}/pkgdata/$orig_pkg ${SDK_OUTPUT}/${prefix}/pkgdata/ | 113 | cp ${STAGING_DIR}/pkgdata/$orig_pkg ${SDK_OUTPUT}/${prefix}/pkgdata/ |
116 | subpkgs=`cat ${STAGING_DIR}/pkgdata/$orig_pkg | grep PACKAGES: | cut -b 10-` | 114 | subpkgs=`cat ${STAGING_DIR}/pkgdata/$orig_pkg | grep PACKAGES: | cut -b 10-` |
117 | echo $subpkgs | ||
118 | for subpkg in $subpkgs; do | 115 | for subpkg in $subpkgs; do |
119 | cp ${STAGING_DIR}/pkgdata/runtime/$subpkg ${SDK_OUTPUT}/${prefix}/pkgdata/runtime/ | 116 | cp ${STAGING_DIR}/pkgdata/runtime/$subpkg ${SDK_OUTPUT}/${prefix}/pkgdata/runtime/ |
120 | if [ -e ${STAGING_DIR}/pkgdata/runtime/$subpkg.packaged ];then | 117 | if [ -e ${STAGING_DIR}/pkgdata/runtime/$subpkg.packaged ];then |