diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/package_ipk.bbclass | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index abb679830d..4f669aba8e 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass | |||
| @@ -1,11 +1,10 @@ | |||
| 1 | inherit package | 1 | inherit package |
| 2 | 2 | ||
| 3 | BOOTSTRAP_EXTRA_RDEPENDS += "ipkg-collateral ipkg ipkg-link" | 3 | DISTRO_EXTRA_RDEPENDS += "opkg-collateral opkg" |
| 4 | DISTRO_EXTRA_RDEPENDS += "ipkg-collateral ipkg ipkg-link" | ||
| 5 | IMAGE_PKGTYPE ?= "ipk" | 4 | IMAGE_PKGTYPE ?= "ipk" |
| 6 | 5 | ||
| 7 | IPKGCONF_TARGET = "${STAGING_ETCDIR_NATIVE}/ipkg.conf" | 6 | IPKGCONF_TARGET = "${STAGING_ETCDIR_NATIVE}/opkg.conf" |
| 8 | IPKGCONF_SDK = "${STAGING_ETCDIR_NATIVE}/ipkg-sdk.conf" | 7 | IPKGCONF_SDK = "${STAGING_ETCDIR_NATIVE}/opkg-sdk.conf" |
| 9 | 8 | ||
| 10 | python package_ipk_fn () { | 9 | python package_ipk_fn () { |
| 11 | from bb import data | 10 | from bb import data |
| @@ -57,8 +56,8 @@ python package_ipk_install () { | |||
| 57 | f = open(os.path.join(tmpdir, "stamps", "IPK_PACKAGE_INDEX_CLEAN"),"w") | 56 | f = open(os.path.join(tmpdir, "stamps", "IPK_PACKAGE_INDEX_CLEAN"),"w") |
| 58 | f.close() | 57 | f.close() |
| 59 | 58 | ||
| 60 | ret = os.system('ipkg-cl -o %s -f %s update' % (rootfs, conffile)) | 59 | ret = os.system('opkg-cl -o %s -f %s update' % (rootfs, conffile)) |
| 61 | ret = os.system('ipkg-cl -o %s -f %s install %s' % (rootfs, conffile, pkgfn)) | 60 | ret = os.system('opkg-cl -o %s -f %s install %s' % (rootfs, conffile, pkgfn)) |
| 62 | if (ret != 0 ): | 61 | if (ret != 0 ): |
| 63 | raise bb.build.FuncFailed | 62 | raise bb.build.FuncFailed |
| 64 | } | 63 | } |
