diff options
| author | Junqian Gordon Xu <xjqian@gmail.com> | 2008-03-19 04:27:49 +0000 |
|---|---|---|
| committer | Junqian Gordon Xu <xjqian@gmail.com> | 2008-03-19 04:27:49 +0000 |
| commit | ebc0c581d446761ece1729a4b9b2c66359eb20dc (patch) | |
| tree | 27f604403ad94491fb31e383d46b3dc9d344fe15 /classes/packaged-staging.bbclass | |
| parent | 776b2b1a7bfdedb15ad376e28c098f76c9526f33 (diff) | |
| parent | c2af9efd62f1cf1dc2aafa39fdd68cfb8a14ac1e (diff) | |
merge of '173acf0910a1de8997f933a70422e802d5cea267'
and '26409b38a6c1f3c87a0e717bac4510cd2c57d12e'
Diffstat (limited to 'classes/packaged-staging.bbclass')
| -rw-r--r-- | classes/packaged-staging.bbclass | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass index bd7255d610..1c717b415e 100644 --- a/classes/packaged-staging.bbclass +++ b/classes/packaged-staging.bbclass @@ -26,6 +26,8 @@ PSTAGE_NATIVEDEPENDS = "\ pkgconfig-native \ autoconf-native \ automake-native \ + curl-native \ + zlib-native \ libtool-native \ gnu-config-native \ shasum-native \ @@ -33,7 +35,7 @@ PSTAGE_NATIVEDEPENDS = "\ automake-native \ update-alternatives-cworth-native \ ipkg-utils-native \ - ipkg-native \ + opkg-native \ m4-native \ quilt-native \ stagemanager-native \ @@ -70,7 +72,7 @@ python () { bb.data.setVarFlag('do_populate_staging', 'depends', deps, d) deps = bb.data.getVarFlag('do_prepackaged_stage', 'depends', d) or "" - deps += " ipkg-native:do_populate_staging ipkg-utils-native:do_populate_staging" + deps += " opkg-native:do_populate_staging ipkg-utils-native:do_populate_staging" bb.data.setVarFlag('do_prepackaged_stage', 'depends', deps, d) bb.data.setVar("PSTAGING_ACTIVE", "1", d) else: @@ -78,13 +80,13 @@ python () { } DEPLOY_DIR_PSTAGE = "${DEPLOY_DIR}/pstage" -PSTAGE_MACHCONFIG = "${DEPLOY_DIR_PSTAGE}/ipkg.conf" +PSTAGE_MACHCONFIG = "${DEPLOY_DIR_PSTAGE}/opkg.conf" PSTAGE_BUILD_CMD = "${IPKGBUILDCMD}" -PSTAGE_INSTALL_CMD = "ipkg-cl install -force-depends -f ${PSTAGE_MACHCONFIG} -o ${TMPDIR}" -PSTAGE_UPDATE_CMD = "ipkg-cl update -f ${PSTAGE_MACHCONFIG} -o ${TMPDIR}" -PSTAGE_REMOVE_CMD = "ipkg-cl remove -force-depends -f ${PSTAGE_MACHCONFIG} -o ${TMPDIR}" -PSTAGE_LIST_CMD = "ipkg-cl list_installed -f ${PSTAGE_MACHCONFIG} -o ${TMPDIR}" +PSTAGE_INSTALL_CMD = "opkg-cl install -force-depends -f ${PSTAGE_MACHCONFIG} -o ${TMPDIR}" +PSTAGE_UPDATE_CMD = "opkg-cl update -f ${PSTAGE_MACHCONFIG} -o ${TMPDIR}" +PSTAGE_REMOVE_CMD = "opkg-cl remove -force-depends -f ${PSTAGE_MACHCONFIG} -o ${TMPDIR}" +PSTAGE_LIST_CMD = "opkg-cl list_installed -f ${PSTAGE_MACHCONFIG} -o ${TMPDIR}" PSTAGE_TMPDIR_STAGE = "${WORKDIR}/staging-pkg" @@ -106,7 +108,7 @@ do_clean_append() { } staging_helper () { - # Assemble appropriate ipkg.conf + # Assemble appropriate opkg.conf conffile=${PSTAGE_MACHCONFIG} mkdir -p ${DEPLOY_DIR_PSTAGE}/pstaging_lists if [ ! -e $conffile ]; then |