diff options
| -rw-r--r-- | meta/classes/package_ipk.bbclass | 14 | ||||
| -rw-r--r-- | meta/classes/rootfs_ipk.bbclass | 2 | ||||
| -rw-r--r-- | meta/conf/bitbake.conf | 4 | ||||
| -rw-r--r-- | meta/conf/distro/poky.conf | 1 | ||||
| -rw-r--r-- | meta/packages/meta/meta-toolchain.bb | 4 |
5 files changed, 13 insertions, 12 deletions
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index f6c71a250..790bba0fd 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass @@ -49,7 +49,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") @@ -74,16 +74,16 @@ package_update_index_ipk () { fi 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 done } @@ -280,10 +280,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") for script in ["preinst", "postinst", "prerm", "postrm", "control" ]: scriptfile = os.path.join(controldir, script) @@ -302,7 +302,7 @@ python () { import bb if bb.data.getVar('PACKAGES', d, True) != '': deps = (bb.data.getVarFlag('do_package_write_ipk', 'depends', d) or "").split() - deps.append('ipkg-utils-native:do_populate_staging') + deps.append('opkg-utils-native:do_populate_staging') deps.append('fakeroot-native:do_populate_staging') bb.data.setVarFlag('do_package_write_ipk', 'depends', " ".join(deps), d) } diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass index 7db2ecb2f..5e8a9c720 100644 --- a/meta/classes/rootfs_ipk.bbclass +++ b/meta/classes/rootfs_ipk.bbclass @@ -8,7 +8,7 @@ ROOTFS_PKGMANAGE = "opkg opkg-collateral" ROOTFS_PKGMANAGE_BOOTSTRAP = "run-postinsts" -do_rootfs[depends] += "opkg-native:do_populate_staging ipkg-utils-native:do_populate_staging" +do_rootfs[depends] += "opkg-native:do_populate_staging opkg-utils-native:do_populate_staging" do_rootfs[recrdeptask] += "do_package_write_ipk" IPKG_ARGS = "-f ${IPKGCONF_TARGET} -o ${IMAGE_ROOTFS}" diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index d51f9d9e7..49bb6f096 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -512,9 +512,9 @@ MKTEMPCMD = "mktemp -q ${TMPBASE}" export PATCH_GET="0" -# Program to be used to build ipkg packages +# Program to be used to build opkg packages -IPKGBUILDCMD = "ipkg-build -o 0 -g 0" +OPKGBUILDCMD = "opkg-build -o 0 -g 0" ################################################################## # Not sure about the rest of this yet. diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index 2a6927371..99d20287b 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf @@ -112,6 +112,7 @@ EXCLUDE_FROM_WORLD_pn-libopensync-plugin-irmc-sync = "1" EXCLUDE_FROM_WORLD_pn-libopensync-plugin-file-sync = "1" # Needs python EXCLUDE_FROM_WORLD_pn-ipkg-utils = "1" +EXCLUDE_FROM_WORLD_pn-opkg-utils = "1" # Needs gcc 3.x EXCLUDE_FROM_WORLD_pn-qemu = "1" # temporary diff --git a/meta/packages/meta/meta-toolchain.bb b/meta/packages/meta/meta-toolchain.bb index de82cab76..4a383293b 100644 --- a/meta/packages/meta/meta-toolchain.bb +++ b/meta/packages/meta/meta-toolchain.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Meta package for building a installable toolchain" LICENSE = "MIT" -DEPENDS = "opkg-native ipkg-utils-native fakeroot-native sed-native" +DEPENDS = "opkg-native opkg-utils-native fakeroot-native sed-native" inherit sdk meta @@ -58,7 +58,7 @@ do_populate_sdk() { if [ -e $pkgnames ]; then echo "Found $pkgnames" cp $pkgnames ${SDK_OUTPUT2}/${prefix}/ipk/ - orig_pkg=`ipkg-list-fields $pkgnames | grep OE: | cut -d ' ' -f2` + orig_pkg=`opkg-list-fields $pkgnames | grep OE: | cut -d ' ' -f2` pkg_subdir=$arch${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]} mkdir -p ${SDK_OUTPUT2}/${prefix}/pkgdata/$pkg_subdir/runtime cp ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg ${SDK_OUTPUT2}/${prefix}/pkgdata/$pkg_subdir/ |