diff options
| author | Tom Rini <trini@embeddedalley.com> | 2009-01-28 19:21:21 -0500 |
|---|---|---|
| committer | Tom Rini <trini@embeddedalley.com> | 2009-01-28 19:21:21 -0500 |
| commit | 70ac9ba6487fc109318507a4bd36adc58faebdff (patch) | |
| tree | d52bc492874ad2426d113267aef211928de5a8bc /classes | |
| parent | faaf61b6d4a8efc2e0b90a5d2dc08661db63b3d3 (diff) | |
| parent | 6638d03ac6f88d30dfc904a1e20f9d3c5d73fa70 (diff) | |
Merge branch 'trini/canadian-final-merge' into org.openembedded.dev
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/package_ipk.bbclass | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index a20b6bbef6..3a977291ff 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -5,6 +5,7 @@ IMAGE_PKGTYPE ?= "ipk" IPKGCONF_TARGET = "${STAGING_ETCDIR_NATIVE}/opkg.conf" IPKGCONF_SDK = "${STAGING_ETCDIR_NATIVE}/opkg-sdk.conf" +IPKGCONF_CANSDK = "${STAGING_ETCDIR_NATIVE}/opkg-canadian-sdk.conf" python package_ipk_fn () { from bb import data @@ -90,6 +91,10 @@ package_update_index_ipk () { touch ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages ipkg-make-index -r ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages -p ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages -l ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages.filelist -m ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/ fi + if [ -e ${DEPLOY_DIR_IPK}/${SDK_SYS}-sdk-$arch/ ] ; then + touch ${DEPLOY_DIR_IPK}/${SDK_SYS}-sdk-$arch/Packages + ipkg-make-index -r ${DEPLOY_DIR_IPK}/${SDK_SYS}-sdk-$arch/Packages -p ${DEPLOY_DIR_IPK}/${SDK_SYS}-sdk-$arch/Packages -l ${DEPLOY_DIR_IPK}/${SDK_SYS}-sdk-$arch/Packages.filelist -m ${DEPLOY_DIR_IPK}/${SDK_SYS}-sdk-$arch/ + fi done } @@ -102,11 +107,13 @@ package_generate_ipkg_conf () { mkdir -p ${STAGING_ETCDIR_NATIVE}/ echo "src oe file:${DEPLOY_DIR_IPK}" > ${IPKGCONF_TARGET} echo "src oe file:${DEPLOY_DIR_IPK}" > ${IPKGCONF_SDK} + echo "src oe file:${DEPLOY_DIR_IPK}" > ${IPKGCONF_CANSDK} ipkgarchs="${PACKAGE_ARCHS}" priority=1 for arch in $ipkgarchs; do echo "arch $arch $priority" >> ${IPKGCONF_TARGET} echo "arch ${BUILD_ARCH}-$arch-sdk $priority" >> ${IPKGCONF_SDK} + echo "arch ${SDK_SYS}-sdk-$arch $priority" >> ${IPKGCONF_CANSDK} priority=$(expr $priority + 5) if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${IPKGCONF_TARGET} @@ -114,6 +121,9 @@ package_generate_ipkg_conf () { if [ -e ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages ] ; then echo "src oe-${BUILD_ARCH}-$arch-sdk file:${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk" >> ${IPKGCONF_SDK} fi + if [ -e ${DEPLOY_DIR_IPK}/${SDK_SYS}-sdk-$arch/Packages ] ; then + echo "src oe-${SDK_SYS}-sdk-$arch file:${DEPLOY_DIR_IPK}/${SDK_SYS}-sdk-$arch" >> ${IPKGCONF_CANSDK} + fi done } |