diff options
-rw-r--r-- | meta/packages/meta/meta-toolchain.bb | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/meta/packages/meta/meta-toolchain.bb b/meta/packages/meta/meta-toolchain.bb index 9ac24bb3aa..40d27b56e1 100644 --- a/meta/packages/meta/meta-toolchain.bb +++ b/meta/packages/meta/meta-toolchain.bb | |||
@@ -6,6 +6,7 @@ inherit sdk meta | |||
6 | 6 | ||
7 | SDK_DIR = "${WORKDIR}/sdk" | 7 | SDK_DIR = "${WORKDIR}/sdk" |
8 | SDK_OUTPUT = "${SDK_DIR}/image" | 8 | SDK_OUTPUT = "${SDK_DIR}/image" |
9 | SDK_OUTPUT2 = "${SDK_DIR}/image-extras" | ||
9 | SDK_DEPLOY = "${TMPDIR}/deploy/sdk" | 10 | SDK_DEPLOY = "${TMPDIR}/deploy/sdk" |
10 | 11 | ||
11 | IPKG_HOST = "ipkg-cl -f ${IPKGCONF_SDK} -o ${SDK_OUTPUT}" | 12 | IPKG_HOST = "ipkg-cl -f ${IPKGCONF_SDK} -o ${SDK_OUTPUT}" |
@@ -65,27 +66,27 @@ do_populate_sdk() { | |||
65 | 66 | ||
66 | # extract and store ipks, pkgdata and shlibs data | 67 | # extract and store ipks, pkgdata and shlibs data |
67 | target_pkgs=`cat ${SDK_OUTPUT}/${prefix}/package-status | grep Package: | cut -f 2 -d ' '` | 68 | target_pkgs=`cat ${SDK_OUTPUT}/${prefix}/package-status | grep Package: | cut -f 2 -d ' '` |
68 | mkdir -p ${SDK_OUTPUT}/${prefix}/ipk/ | 69 | mkdir -p ${SDK_OUTPUT2}/${prefix}/ipk/ |
69 | mkdir -p ${SDK_OUTPUT}/${prefix}/pkgdata/runtime/ | 70 | mkdir -p ${SDK_OUTPUT2}/${prefix}/pkgdata/runtime/ |
70 | mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/shlibs/ | 71 | mkdir -p ${SDK_OUTPUT2}/${prefix}/${TARGET_SYS}/shlibs/ |
71 | for pkg in $target_pkgs ; do | 72 | for pkg in $target_pkgs ; do |
72 | for arch in $revipkgarchs; do | 73 | for arch in $revipkgarchs; do |
73 | pkgnames=${DEPLOY_DIR_IPK}/$arch/${pkg}_*_$arch.ipk | 74 | pkgnames=${DEPLOY_DIR_IPK}/$arch/${pkg}_*_$arch.ipk |
74 | if [ -e $pkgnames ]; then | 75 | if [ -e $pkgnames ]; then |
75 | echo "Found $pkgnames" | 76 | echo "Found $pkgnames" |
76 | cp $pkgnames ${SDK_OUTPUT}/${prefix}/ipk/ | 77 | cp $pkgnames ${SDK_OUTPUT2}/${prefix}/ipk/ |
77 | orig_pkg=`ipkg-list-fields $pkgnames | grep OE: | cut -d ' ' -f2` | 78 | orig_pkg=`ipkg-list-fields $pkgnames | grep OE: | cut -d ' ' -f2` |
78 | pkg_subdir=$arch${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]} | 79 | pkg_subdir=$arch${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]} |
79 | mkdir -p ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/runtime | 80 | mkdir -p ${SDK_OUTPUT2}/${prefix}/pkgdata/$pkg_subdir/runtime |
80 | cp ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/ | 81 | cp ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg ${SDK_OUTPUT2}/${prefix}/pkgdata/$pkg_subdir/ |
81 | subpkgs=`cat ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg | grep PACKAGES: | cut -b 10-` | 82 | subpkgs=`cat ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg | grep PACKAGES: | cut -b 10-` |
82 | for subpkg in $subpkgs; do | 83 | for subpkg in $subpkgs; do |
83 | cp ${STAGING_DIR}/pkgdata/$pkg_subdir/runtime/$subpkg ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/runtime/ | 84 | cp ${STAGING_DIR}/pkgdata/$pkg_subdir/runtime/$subpkg ${SDK_OUTPUT2}/${prefix}/pkgdata/$pkg_subdir/runtime/ |
84 | if [ -e ${STAGING_DIR}/pkgdata/$pkg_subdir/runtime/$subpkg.packaged ];then | 85 | if [ -e ${STAGING_DIR}/pkgdata/$pkg_subdir/runtime/$subpkg.packaged ];then |
85 | cp ${STAGING_DIR}/pkgdata/$pkg_subdir/runtime/$subpkg.packaged ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/runtime/ | 86 | cp ${STAGING_DIR}/pkgdata/$pkg_subdir/runtime/$subpkg.packaged ${SDK_OUTPUT2}/${prefix}/pkgdata/$pkg_subdir/runtime/ |
86 | fi | 87 | fi |
87 | if [ -e ${STAGING_DIR_TARGET}/shlibs/$subpkg.list ]; then | 88 | if [ -e ${STAGING_DIR_TARGET}/shlibs/$subpkg.list ]; then |
88 | cp ${STAGING_DIR_TARGET}/shlibs/$subpkg.* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/shlibs/ | 89 | cp ${STAGING_DIR_TARGET}/shlibs/$subpkg.* ${SDK_OUTPUT2}/${prefix}/${TARGET_SYS}/shlibs/ |
89 | fi | 90 | fi |
90 | done | 91 | done |
91 | break | 92 | break |
@@ -120,6 +121,8 @@ do_populate_sdk() { | |||
120 | mkdir -p ${SDK_DEPLOY} | 121 | mkdir -p ${SDK_DEPLOY} |
121 | cd ${SDK_OUTPUT} | 122 | cd ${SDK_OUTPUT} |
122 | fakeroot tar cfj ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 . | 123 | fakeroot tar cfj ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 . |
124 | cd ${SDK_OUTPUT2} | ||
125 | fakeroot tar cfj ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}-extras.tar.bz2 . | ||
123 | } | 126 | } |
124 | 127 | ||
125 | do_populate_sdk[nostamp] = "1" | 128 | do_populate_sdk[nostamp] = "1" |