From 46ec2cd14e512c0f88a5453772aa1670b48ae039 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 24 Jan 2011 12:03:10 -0800 Subject: classes/package_ipk.bbclass,classes/sourceipk.bbclass: Use opkg-utils-native instead of ipkg-utils-native Signed-off-by: Khem Raj Acked-by: Koen Kooi Acked-by: Graham Gower Signed-off-by: Martin Jansa --- classes/package_ipk.bbclass | 4 ++-- classes/sourceipk.bbclass | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index 313559ab5b..56d0eaba76 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -70,7 +70,7 @@ do_package_update_index_ipk[lockfiles] = "${DEPLOY_DIR_IPK}.lock" do_package_update_index_ipk[nostamp] = "1" do_package_update_index_ipk[recrdeptask] += "do_package_write_ipk" do_package_update_index_ipk[recrdeptask] += "do_package_write_ipk" -do_package_update_index_ipk[depends] += "ipkg-utils-native:do_populate_sysroot" +do_package_update_index_ipk[depends] += "opkg-utils-native:do_populate_sysroot" # # Update the Packages index files in ${DEPLOY_DIR_IPK} @@ -305,7 +305,7 @@ python do_package_ipk () { python () { 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_sysroot') + deps.append('opkg-utils-native:do_populate_sysroot') deps.append('fakeroot-native:do_populate_sysroot') bb.data.setVarFlag('do_package_write_ipk', 'depends', " ".join(deps), d) } diff --git a/classes/sourceipk.bbclass b/classes/sourceipk.bbclass index 97068def0c..4a1f863cac 100644 --- a/classes/sourceipk.bbclass +++ b/classes/sourceipk.bbclass @@ -34,9 +34,9 @@ # Need to figure out how to use ipkg-build in this class. # I tried adding it as a dependency for the do_create_srcipk # task using: -# do_create_srcipk[depends] += "ipkg-utils-native:do_populate_sysroot" +# do_create_srcipk[depends] += "opkg-utils-native:do_populate_sysroot" # But then there is a circular dependency between sourcipk.bbclass and -# ipkg-utils-native. Until I can figure out how to resolve this +# opkg-utils-native. Until I can figure out how to resolve this # circular dependency I am extracting the needed pieces from ipkg-build # into this class and building the source ipk myself. -- cgit 1.2.3-korg