aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-01-24 16:45:09 -0800
committerMartin Jansa <Martin.Jansa@gmail.com>2011-04-22 19:41:14 +0200
commit7048ec2364dacb570f82c470c9b669c8f2628860 (patch)
tree54a9507f1cff9c4695b74822fbdd37f36105badf
parent46ec2cd14e512c0f88a5453772aa1670b48ae039 (diff)
downloadopenembedded-7048ec2364dacb570f82c470c9b669c8f2628860.tar.gz
openembedded-7048ec2364dacb570f82c470c9b669c8f2628860.tar.bz2
openembedded-7048ec2364dacb570f82c470c9b669c8f2628860.zip
classes: Replace ipkg-make-index with opkg-make-index
* STAGE_PKGMANAGER use opkg * rename IPKGBUILDCMD to OPKGBUILDCMD * Use opkg-build instead of ipkg-build Signed-off-by: Khem Raj <raj.khem@gmail.com> Acked-by: Koen Kooi <koen@openembedded.org> Acked-by: Graham Gower <graham.gower@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--classes/package_ipk.bbclass14
-rw-r--r--classes/packaged-staging.bbclass4
-rw-r--r--classes/sourceipk.bbclass4
3 files changed, 11 insertions, 11 deletions
diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass
index 56d0eaba76..28aadc24fd 100644
--- a/classes/package_ipk.bbclass
+++ b/classes/package_ipk.bbclass
@@ -54,7 +54,7 @@ python package_ipk_install () {
if (not os.access(os.path.join(ipkdir,"Packages"), os.R_OK) or
not os.access(os.path.join(tmpdir, "stamps", "IPK_PACKAGE_INDEX_CLEAN"),os.R_OK)):
- ret = os.system('ipkg-make-index -p %s %s ' % (os.path.join(ipkdir, "Packages"), ipkdir))
+ ret = os.system('opkg-make-index -p %s %s ' % (os.path.join(ipkdir, "Packages"), ipkdir))
if (ret != 0 ):
raise bb.build.FuncFailed
f = open(os.path.join(tmpdir, "stamps", "IPK_PACKAGE_INDEX_CLEAN"),"w")
@@ -86,20 +86,20 @@ do_package_update_index_ipk () {
mkdir -p ${DEPLOY_DIR_IPK}
touch ${DEPLOY_DIR_IPK}/Packages
- ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK}
+ opkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK}
for arch in $ipkgarchs; do
if [ -e ${DEPLOY_DIR_IPK}/$arch/ ] ; then
touch ${DEPLOY_DIR_IPK}/$arch/Packages
- ipkg-make-index -r ${DEPLOY_DIR_IPK}/$arch/Packages -p ${DEPLOY_DIR_IPK}/$arch/Packages -l ${DEPLOY_DIR_IPK}/$arch/Packages.filelist -m ${DEPLOY_DIR_IPK}/$arch/
+ opkg-make-index -r ${DEPLOY_DIR_IPK}/$arch/Packages -p ${DEPLOY_DIR_IPK}/$arch/Packages -l ${DEPLOY_DIR_IPK}/$arch/Packages.filelist -m ${DEPLOY_DIR_IPK}/$arch/
fi
if [ -e ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/ ] ; then
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/
+ opkg-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/
+ opkg-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
}
@@ -293,10 +293,10 @@ python do_package_ipk () {
os.chdir(basedir)
ret = os.system("PATH=\"%s\" %s %s %s" % (bb.data.getVar("PATH", localdata, 1),
- bb.data.getVar("IPKGBUILDCMD",d,1), pkg, pkgoutdir))
+ bb.data.getVar("OPKGBUILDCMD",d,1), pkg, pkgoutdir))
if ret != 0:
bb.utils.unlockfile(lf)
- raise bb.build.FuncFailed("ipkg-build execution failed")
+ raise bb.build.FuncFailed("opkg-build execution failed")
bb.utils.prunedir(controldir)
bb.utils.unlockfile(lf)
diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass
index f35026d5e9..d3b095ceda 100644
--- a/classes/packaged-staging.bbclass
+++ b/classes/packaged-staging.bbclass
@@ -96,9 +96,9 @@ python __anonymous() {
PSTAGE_MACHCONFIG = "${PSTAGE_WORKDIR}/opkg.conf"
-PSTAGE_PKGMANAGER = "stage-manager-ipkg"
+PSTAGE_PKGMANAGER = "stage-manager-opkg"
-PSTAGE_BUILD_CMD = "stage-manager-ipkg-build -o 0 -g 0"
+PSTAGE_BUILD_CMD = "stage-manager-opkg-build -o 0 -g 0"
PSTAGE_INSTALL_CMD = "${PSTAGE_PKGMANAGER} -f ${PSTAGE_MACHCONFIG} -force-depends -o ${TMPDIR} install"
PSTAGE_UPDATE_CMD = "${PSTAGE_PKGMANAGER} -f ${PSTAGE_MACHCONFIG} -o ${TMPDIR} update"
PSTAGE_REMOVE_CMD = "${PSTAGE_PKGMANAGER} -f ${PSTAGE_MACHCONFIG} -force-depends -o ${TMPDIR} remove"
diff --git a/classes/sourceipk.bbclass b/classes/sourceipk.bbclass
index 4a1f863cac..db584246ca 100644
--- a/classes/sourceipk.bbclass
+++ b/classes/sourceipk.bbclass
@@ -31,13 +31,13 @@
# CREATE_SRCIPK_pn-<package name> = "1" in your local.conf
#
#TODO:
-# Need to figure out how to use ipkg-build in this class.
+# Need to figure out how to use opkg-build in this class.
# I tried adding it as a dependency for the do_create_srcipk
# task using:
# do_create_srcipk[depends] += "opkg-utils-native:do_populate_sysroot"
# But then there is a circular dependency between sourcipk.bbclass and
# opkg-utils-native. Until I can figure out how to resolve this
-# circular dependency I am extracting the needed pieces from ipkg-build
+# circular dependency I am extracting the needed pieces from opkg-build
# into this class and building the source ipk myself.