summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/package_ipk.bbclass14
-rw-r--r--meta/classes/rootfs_ipk.bbclass2
-rw-r--r--meta/conf/bitbake.conf4
-rw-r--r--meta/conf/distro/poky.conf1
-rw-r--r--meta/packages/meta/meta-toolchain.bb4
5 files changed, 13 insertions, 12 deletions
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index f6c71a250d..790bba0fd0 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -49,7 +49,7 @@ python package_ipk_install () {
49 49
50 if (not os.access(os.path.join(ipkdir,"Packages"), os.R_OK) or 50 if (not os.access(os.path.join(ipkdir,"Packages"), os.R_OK) or
51 not os.access(os.path.join(tmpdir, "stamps", "IPK_PACKAGE_INDEX_CLEAN"),os.R_OK): 51 not os.access(os.path.join(tmpdir, "stamps", "IPK_PACKAGE_INDEX_CLEAN"),os.R_OK):
52 ret = os.system('ipkg-make-index -p %s %s ' % (os.path.join(ipkdir, "Packages"), ipkdir)) 52 ret = os.system('opkg-make-index -p %s %s ' % (os.path.join(ipkdir, "Packages"), ipkdir))
53 if (ret != 0 ): 53 if (ret != 0 ):
54 raise bb.build.FuncFailed 54 raise bb.build.FuncFailed
55 f = open(os.path.join(tmpdir, "stamps", "IPK_PACKAGE_INDEX_CLEAN"),"w") 55 f = open(os.path.join(tmpdir, "stamps", "IPK_PACKAGE_INDEX_CLEAN"),"w")
@@ -74,16 +74,16 @@ package_update_index_ipk () {
74 fi 74 fi
75 75
76 touch ${DEPLOY_DIR_IPK}/Packages 76 touch ${DEPLOY_DIR_IPK}/Packages
77 ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK} 77 opkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK}
78 78
79 for arch in $ipkgarchs; do 79 for arch in $ipkgarchs; do
80 if [ -e ${DEPLOY_DIR_IPK}/$arch/ ] ; then 80 if [ -e ${DEPLOY_DIR_IPK}/$arch/ ] ; then
81 touch ${DEPLOY_DIR_IPK}/$arch/Packages 81 touch ${DEPLOY_DIR_IPK}/$arch/Packages
82 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/ 82 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/
83 fi 83 fi
84 if [ -e ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/ ] ; then 84 if [ -e ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/ ] ; then
85 touch ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages 85 touch ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages
86 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/ 86 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/
87 fi 87 fi
88 done 88 done
89} 89}
@@ -280,10 +280,10 @@ python do_package_ipk () {
280 280
281 os.chdir(basedir) 281 os.chdir(basedir)
282 ret = os.system("PATH=\"%s\" %s %s %s" % (bb.data.getVar("PATH", localdata, 1), 282 ret = os.system("PATH=\"%s\" %s %s %s" % (bb.data.getVar("PATH", localdata, 1),
283 bb.data.getVar("IPKGBUILDCMD",d,1), pkg, pkgoutdir)) 283 bb.data.getVar("OPKGBUILDCMD",d,1), pkg, pkgoutdir))
284 if ret != 0: 284 if ret != 0:
285 bb.utils.unlockfile(lf) 285 bb.utils.unlockfile(lf)
286 raise bb.build.FuncFailed("ipkg-build execution failed") 286 raise bb.build.FuncFailed("opkg-build execution failed")
287 287
288 for script in ["preinst", "postinst", "prerm", "postrm", "control" ]: 288 for script in ["preinst", "postinst", "prerm", "postrm", "control" ]:
289 scriptfile = os.path.join(controldir, script) 289 scriptfile = os.path.join(controldir, script)
@@ -302,7 +302,7 @@ python () {
302 import bb 302 import bb
303 if bb.data.getVar('PACKAGES', d, True) != '': 303 if bb.data.getVar('PACKAGES', d, True) != '':
304 deps = (bb.data.getVarFlag('do_package_write_ipk', 'depends', d) or "").split() 304 deps = (bb.data.getVarFlag('do_package_write_ipk', 'depends', d) or "").split()
305 deps.append('ipkg-utils-native:do_populate_staging') 305 deps.append('opkg-utils-native:do_populate_staging')
306 deps.append('fakeroot-native:do_populate_staging') 306 deps.append('fakeroot-native:do_populate_staging')
307 bb.data.setVarFlag('do_package_write_ipk', 'depends', " ".join(deps), d) 307 bb.data.setVarFlag('do_package_write_ipk', 'depends', " ".join(deps), d)
308} 308}
diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index 7db2ecb2f1..5e8a9c720c 100644
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/meta/classes/rootfs_ipk.bbclass
@@ -8,7 +8,7 @@
8ROOTFS_PKGMANAGE = "opkg opkg-collateral" 8ROOTFS_PKGMANAGE = "opkg opkg-collateral"
9ROOTFS_PKGMANAGE_BOOTSTRAP = "run-postinsts" 9ROOTFS_PKGMANAGE_BOOTSTRAP = "run-postinsts"
10 10
11do_rootfs[depends] += "opkg-native:do_populate_staging ipkg-utils-native:do_populate_staging" 11do_rootfs[depends] += "opkg-native:do_populate_staging opkg-utils-native:do_populate_staging"
12do_rootfs[recrdeptask] += "do_package_write_ipk" 12do_rootfs[recrdeptask] += "do_package_write_ipk"
13 13
14IPKG_ARGS = "-f ${IPKGCONF_TARGET} -o ${IMAGE_ROOTFS}" 14IPKG_ARGS = "-f ${IPKGCONF_TARGET} -o ${IMAGE_ROOTFS}"
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index d51f9d9e78..49bb6f0964 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -512,9 +512,9 @@ MKTEMPCMD = "mktemp -q ${TMPBASE}"
512 512
513export PATCH_GET="0" 513export PATCH_GET="0"
514 514
515# Program to be used to build ipkg packages 515# Program to be used to build opkg packages
516 516
517IPKGBUILDCMD = "ipkg-build -o 0 -g 0" 517OPKGBUILDCMD = "opkg-build -o 0 -g 0"
518 518
519################################################################## 519##################################################################
520# Not sure about the rest of this yet. 520# Not sure about the rest of this yet.
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 2a6927371b..99d20287bb 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"
112EXCLUDE_FROM_WORLD_pn-libopensync-plugin-file-sync = "1" 112EXCLUDE_FROM_WORLD_pn-libopensync-plugin-file-sync = "1"
113# Needs python 113# Needs python
114EXCLUDE_FROM_WORLD_pn-ipkg-utils = "1" 114EXCLUDE_FROM_WORLD_pn-ipkg-utils = "1"
115EXCLUDE_FROM_WORLD_pn-opkg-utils = "1"
115# Needs gcc 3.x 116# Needs gcc 3.x
116EXCLUDE_FROM_WORLD_pn-qemu = "1" 117EXCLUDE_FROM_WORLD_pn-qemu = "1"
117# temporary 118# temporary
diff --git a/meta/packages/meta/meta-toolchain.bb b/meta/packages/meta/meta-toolchain.bb
index de82cab765..4a383293ba 100644
--- a/meta/packages/meta/meta-toolchain.bb
+++ b/meta/packages/meta/meta-toolchain.bb
@@ -1,6 +1,6 @@
1DESCRIPTION = "Meta package for building a installable toolchain" 1DESCRIPTION = "Meta package for building a installable toolchain"
2LICENSE = "MIT" 2LICENSE = "MIT"
3DEPENDS = "opkg-native ipkg-utils-native fakeroot-native sed-native" 3DEPENDS = "opkg-native opkg-utils-native fakeroot-native sed-native"
4 4
5inherit sdk meta 5inherit sdk meta
6 6
@@ -58,7 +58,7 @@ do_populate_sdk() {
58 if [ -e $pkgnames ]; then 58 if [ -e $pkgnames ]; then
59 echo "Found $pkgnames" 59 echo "Found $pkgnames"
60 cp $pkgnames ${SDK_OUTPUT2}/${prefix}/ipk/ 60 cp $pkgnames ${SDK_OUTPUT2}/${prefix}/ipk/
61 orig_pkg=`ipkg-list-fields $pkgnames | grep OE: | cut -d ' ' -f2` 61 orig_pkg=`opkg-list-fields $pkgnames | grep OE: | cut -d ' ' -f2`
62 pkg_subdir=$arch${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]} 62 pkg_subdir=$arch${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}
63 mkdir -p ${SDK_OUTPUT2}/${prefix}/pkgdata/$pkg_subdir/runtime 63 mkdir -p ${SDK_OUTPUT2}/${prefix}/pkgdata/$pkg_subdir/runtime
64 cp ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg ${SDK_OUTPUT2}/${prefix}/pkgdata/$pkg_subdir/ 64 cp ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg ${SDK_OUTPUT2}/${prefix}/pkgdata/$pkg_subdir/