various: move over to opkg, as discussed on the mailinglist

* death to ipkg!

diff --git a/classes/image.bbclass b/classes/image.bbclass
index 67a3a4f..f8d896d 100644 (file)
--- a/classes/image.bbclass
+++ b/classes/image.bbclass
@@ -85,8 +85,6 @@ fakeroot do_rootfs () {
 
        insert_feed_uris        
 
-       rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/lists/*
-       
        ${IMAGE_PREPROCESS_COMMAND}
                
        export TOPDIR=${TOPDIR}
@@ -132,7 +130,7 @@ insert_feed_uris () {
                echo "Added $feed_name feed with URL $feed_uri"
                
                # insert new feed-sources
-               echo "src/gz $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/ipkg/${feed_name}-feed.conf
+               echo "src/gz $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/opkg/${feed_name}-feed.conf
        done                    
 
        # Allow to use package deploy directory contents as quick devel-testing
@@ -142,7 +140,7 @@ insert_feed_uris () {
        if [ -n "${FEED_DEPLOYDIR_BASE_URI}" ]; then
            for arch in ${PACKAGE_ARCHS}
            do
-               echo "src/gz local-$arch ${FEED_DEPLOYDIR_BASE_URI}/$arch" >> ${IMAGE_ROOTFS}/etc/ipkg/local-$arch-feed.conf
+               echo "src/gz local-$arch ${FEED_DEPLOYDIR_BASE_URI}/$arch" >> ${IMAGE_ROOTFS}/etc/opkg/local-$arch-feed.conf
            done
        fi
 }

diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass
index e47bc6a..f05b744 100644 (file)
--- a/classes/package_ipk.bbclass
+++ b/classes/package_ipk.bbclass
@@ -1,17 +1,17 @@
 inherit package
 
-BOOTSTRAP_EXTRA_RDEPENDS += "ipkg-collateral ipkg"
+BOOTSTRAP_EXTRA_RDEPENDS += "opkg-collateral opkg"
 IMAGE_PKGTYPE ?= "ipk"
 
-IPKGCONF_TARGET = "${STAGING_ETCDIR_NATIVE}/ipkg.conf"
-IPKGCONF_SDK =  "${STAGING_ETCDIR_NATIVE}/ipkg-sdk.conf"
+IPKGCONF_TARGET = "${STAGING_ETCDIR_NATIVE}/opkg.conf"
+IPKGCONF_SDK =  "${STAGING_ETCDIR_NATIVE}/opkg-sdk.conf"
 
 python package_ipk_fn () {
        from bb import data
        bb.data.setVar('PKGFN', bb.data.getVar('PKG',d), d)
 }
 
-python package_ipk_install () {
+python package_ipk_install () { 
        #
        # Warning - this function is not multimachine safe (see stagingdir reference)!
        #
@@ -35,7 +35,7 @@ python package_ipk_install () {
                raise bb.build.FuncFailed
 
        # Generate ipk.conf if it or the stamp doesnt exist
-       conffile = os.path.join(stagingdir,"ipkg.conf")
+       conffile = os.path.join(stagingdir,"opkg.conf")
        if not os.access(conffile, os.R_OK):
                ipkg_archs = bb.data.getVar('PACKAGE_ARCHS',d)
                if ipkg_archs is None:
@@ -60,8 +60,8 @@ python package_ipk_install () {
                f = open(os.path.join(tmpdir, "stamps", "IPK_PACKAGE_INDEX_CLEAN"),"w")
                f.close()
 
-       ret = os.system('ipkg-cl  -o %s -f %s update' % (rootfs, conffile))
-       ret = os.system('ipkg-cl  -o %s -f %s install %s' % (rootfs, conffile, pkgfn))
+       ret = os.system('opkg-cl  -o %s -f %s update' % (rootfs, conffile))
+       ret = os.system('opkg-cl  -o %s -f %s install %s' % (rootfs, conffile, pkgfn))
        if (ret != 0 ):
                raise bb.build.FuncFailed
 }

diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass
index bd7255d..1c717b4 100644 (file)
--- a/classes/packaged-staging.bbclass
+++ b/classes/packaged-staging.bbclass
@@ -26,6 +26,8 @@ PSTAGE_NATIVEDEPENDS = "\
     pkgconfig-native \
     autoconf-native \
     automake-native \
+    curl-native \
+    zlib-native \
     libtool-native \
     gnu-config-native \
     shasum-native \
@@ -33,7 +35,7 @@ PSTAGE_NATIVEDEPENDS = "\
     automake-native \
     update-alternatives-cworth-native \
     ipkg-utils-native \
-    ipkg-native \
+    opkg-native \
     m4-native \
     quilt-native \
     stagemanager-native \
@@ -70,7 +72,7 @@ python () {
         bb.data.setVarFlag('do_populate_staging', 'depends', deps, d)
 
         deps = bb.data.getVarFlag('do_prepackaged_stage', 'depends', d) or ""
-        deps += " ipkg-native:do_populate_staging ipkg-utils-native:do_populate_staging"
+        deps += " opkg-native:do_populate_staging ipkg-utils-native:do_populate_staging"
         bb.data.setVarFlag('do_prepackaged_stage', 'depends', deps, d)
         bb.data.setVar("PSTAGING_ACTIVE", "1", d)
     else:
@@ -78,13 +80,13 @@ python () {
 }
 
 DEPLOY_DIR_PSTAGE      = "${DEPLOY_DIR}/pstage"
-PSTAGE_MACHCONFIG       = "${DEPLOY_DIR_PSTAGE}/ipkg.conf"
+PSTAGE_MACHCONFIG       = "${DEPLOY_DIR_PSTAGE}/opkg.conf"
 
 PSTAGE_BUILD_CMD        = "${IPKGBUILDCMD}"
-PSTAGE_INSTALL_CMD      = "ipkg-cl install -force-depends -f ${PSTAGE_MACHCONFIG} -o ${TMPDIR}"
-PSTAGE_UPDATE_CMD      = "ipkg-cl update -f ${PSTAGE_MACHCONFIG} -o ${TMPDIR}"
-PSTAGE_REMOVE_CMD       = "ipkg-cl remove -force-depends -f ${PSTAGE_MACHCONFIG} -o ${TMPDIR}"
-PSTAGE_LIST_CMD                = "ipkg-cl list_installed -f ${PSTAGE_MACHCONFIG} -o ${TMPDIR}"
+PSTAGE_INSTALL_CMD      = "opkg-cl install -force-depends -f ${PSTAGE_MACHCONFIG} -o ${TMPDIR}"
+PSTAGE_UPDATE_CMD      = "opkg-cl update -f ${PSTAGE_MACHCONFIG} -o ${TMPDIR}"
+PSTAGE_REMOVE_CMD       = "opkg-cl remove -force-depends -f ${PSTAGE_MACHCONFIG} -o ${TMPDIR}"
+PSTAGE_LIST_CMD                = "opkg-cl list_installed -f ${PSTAGE_MACHCONFIG} -o ${TMPDIR}"
 
 PSTAGE_TMPDIR_STAGE     = "${WORKDIR}/staging-pkg"
 
@@ -106,7 +108,7 @@ do_clean_append() {
 }
 
 staging_helper () {
-       # Assemble appropriate ipkg.conf
+       # Assemble appropriate opkg.conf
        conffile=${PSTAGE_MACHCONFIG}
        mkdir -p ${DEPLOY_DIR_PSTAGE}/pstaging_lists
        if [ ! -e $conffile ]; then

diff --git a/classes/rootfs_deb.bbclass b/classes/rootfs_deb.bbclass
index 5237285..c59c75e 100644 (file)
--- a/classes/rootfs_deb.bbclass
+++ b/classes/rootfs_deb.bbclass
@@ -109,22 +109,22 @@ fakeroot rootfs_deb_do_rootfs () {
 
        set -e
 
-       # Hacks to make dpkg/ipkg coexist for now
+       # Hacks to make dpkg/opkg coexist for now
        mv ${IMAGE_ROOTFS}/var/dpkg ${IMAGE_ROOTFS}/usr/
        if [ -e ${IMAGE_ROOTFS}/usr/dpkg/alternatives ]; then
                rmdir ${IMAGE_ROOTFS}/usr/dpkg/alternatives
        fi
-        if [ ! -e ${IMAGE_ROOTFS}${libdir}/ipkg ] ; then
-                mkdir -p ${IMAGE_ROOTFS}${libdir}/ipkg
+        if [ ! -e ${IMAGE_ROOTFS}${libdir}/opkg ] ; then
+                mkdir -p ${IMAGE_ROOTFS}${libdir}/opkg
         fi
 
-        if [ ! -e ${IMAGE_ROOTFS}${sysconfdir}/ipkg ] ; then
-                mkdir -p ${IMAGE_ROOTFS}${sysconfdir}/ipkg
+        if [ ! -e ${IMAGE_ROOTFS}${sysconfdir}/opkg ] ; then
+                mkdir -p ${IMAGE_ROOTFS}${sysconfdir}/opkg
         fi
  
-       ln -sf ${libdir}/ipkg/alternatives ${IMAGE_ROOTFS}/usr/dpkg/alternatives
-       ln -sf /usr/dpkg/info ${IMAGE_ROOTFS}${libdir}/ipkg/info
-       ln -sf /usr/dpkg/status ${IMAGE_ROOTFS}${libdir}/ipkg/status
+       ln -sf ${libdir}/opkg/alternatives ${IMAGE_ROOTFS}/usr/dpkg/alternatives
+       ln -sf /usr/dpkg/info ${IMAGE_ROOTFS}${libdir}/opkg/info
+       ln -sf /usr/dpkg/status ${IMAGE_ROOTFS}${libdir}/opkg/status
 
        ${ROOTFS_POSTPROCESS_COMMAND}
 
@@ -152,6 +152,6 @@ rootfs_deb_log_check() {
 }
 
 remove_packaging_data_files() {
-       rm -rf ${IMAGE_ROOTFS}${libdir}/ipkg/
+       rm -rf ${IMAGE_ROOTFS}${libdir}/opkg/
        rm -rf ${IMAGE_ROOTFS}/usr/dpkg/
 }

diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index 28ba03d..4954fb2 100644 (file)
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -5,12 +5,12 @@
 # See image.bbclass for a usage of this.
 #
 
-do_rootfs[depends] += "ipkg-native:do_populate_staging ipkg-utils-native:do_populate_staging"
+do_rootfs[depends] += "opkg-native:do_populate_staging ipkg-utils-native:do_populate_staging"
 do_rootfs[recrdeptask] += "do_package_write_ipk"
 
 IPKG_ARGS = "-f ${IPKGCONF_TARGET} -o ${IMAGE_ROOTFS} ${@base_conditional("PACKAGE_INSTALL_NO_DEPS", "1", "-nodeps", "", d)}"
 
-DISTRO_EXTRA_RDEPENDS += " ipkg ipkg-collateral "
+DISTRO_EXTRA_RDEPENDS += " opkg opkg-collateral "
 PACKAGE_INSTALL_NO_DEPS ?= "0"
 
 fakeroot rootfs_ipk_do_rootfs () {
@@ -21,41 +21,43 @@ fakeroot rootfs_ipk_do_rootfs () {
 
        mkdir -p ${T}
 
-       ipkg-cl ${IPKG_ARGS} update
+       opkg-cl ${IPKG_ARGS} update
 
        # Uclibc builds don't provide this stuff...
        if [ x${TARGET_OS} = "xlinux" ] || [ x${TARGET_OS} = "xlinux-gnueabi" ] ; then 
                if [ ! -z "${LINGUAS_INSTALL}" ]; then
-                       ipkg-cl ${IPKG_ARGS} install glibc-localedata-i18n
+                       opkg-cl ${IPKG_ARGS} install glibc-localedata-i18n
                        for i in ${LINGUAS_INSTALL}; do
-                               ipkg-cl ${IPKG_ARGS} install $i 
+                               opkg-cl ${IPKG_ARGS} install $i 
                        done
                fi
        fi
        if [ ! -z "${PACKAGE_INSTALL}" ]; then
-               ipkg-cl ${IPKG_ARGS} install ${PACKAGE_INSTALL}
+               opkg-cl ${IPKG_ARGS} install ${PACKAGE_INSTALL}
        fi
 
        export D=${IMAGE_ROOTFS}
        export OFFLINE_ROOT=${IMAGE_ROOTFS}
        export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS}
-       mkdir -p ${IMAGE_ROOTFS}${sysconfdir}/ipkg/
-       grep "^arch" ${IPKGCONF_TARGET} >${IMAGE_ROOTFS}${sysconfdir}/ipkg/arch.conf
+       mkdir -p ${IMAGE_ROOTFS}${sysconfdir}/opkg/
+       grep "^arch" ${IPKGCONF_TARGET} >${IMAGE_ROOTFS}${sysconfdir}/opkg/arch.conf
 
-       for i in ${IMAGE_ROOTFS}${libdir}/ipkg/info/*.preinst; do
+       for i in ${IMAGE_ROOTFS}${libdir}/opkg/info/*.preinst; do
                if [ -f $i ] && ! sh $i; then
-                       ipkg-cl ${IPKG_ARGS} flag unpacked `basename $i .preinst`
+                       opkg-cl ${IPKG_ARGS} flag unpacked `basename $i .preinst`
                fi
        done
-       for i in ${IMAGE_ROOTFS}${libdir}/ipkg/info/*.postinst; do
+       for i in ${IMAGE_ROOTFS}${libdir}/opkg/info/*.postinst; do
                if [ -f $i ] && ! sh $i configure; then
-                       ipkg-cl ${IPKG_ARGS} flag unpacked `basename $i .postinst`
+                       opkg-cl ${IPKG_ARGS} flag unpacked `basename $i .postinst`
                fi
        done
 
        install -d ${IMAGE_ROOTFS}/${sysconfdir}
        echo ${BUILDNAME} > ${IMAGE_ROOTFS}/${sysconfdir}/version
 
+       rm -f ${IMAGE_ROOTFS}${libdir}/opkg/lists/*
+       
        ${ROOTFS_POSTPROCESS_COMMAND}
        
        log_check rootfs        
@@ -82,5 +84,5 @@ rootfs_ipk_log_check() {
 }
 
 remove_packaging_data_files() {
-       rm -rf ${IMAGE_ROOTFS}${libdir}/ipkg/
+       rm -rf ${IMAGE_ROOTFS}${libdir}/opkg/
 }

diff --git a/classes/testlab.bbclass b/classes/testlab.bbclass
index 5a88f3d..563a5bf 100644 (file)
--- a/classes/testlab.bbclass
+++ b/classes/testlab.bbclass
@@ -19,10 +19,10 @@
 # * add test suite to run on the target device 
 
 
-# Needs 'dot', 'ipkg-cl'
+# Needs 'dot', 'opkg-cl'
 
 do_testlab() {
-if [ -e  ${IMAGE_ROOTFS}/etc/ipkg ] ; then
+if [ -e  ${IMAGE_ROOTFS}/etc/opkg ] ; then
 
        TESTLAB_DIR="${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-testlab"
         mkdir -p ${TESTLAB_DIR}/
@@ -31,14 +31,14 @@ if [ -e  ${IMAGE_ROOTFS}/etc/ipkg ] ; then
        echo > ${TESTLAB_DIR}/installed-packages.txt
        echo -e "digraph depends {\n    node [shape=plaintext]" > ${TESTLAB_DIR}/depends.dot
 
-       for pkg in $(ipkg-cl -f ${IMAGE_ROOTFS}/etc/ipkg -o ${IMAGE_ROOTFS} list_installed | awk '{print $1}') ; do 
-               ipkg-cl -f ${IMAGE_ROOTFS}/etc/ipkg -o ${IMAGE_ROOTFS} info $pkg | grep Filename | awk -F: '{print $2}'  >> ${TESTLAB_DIR}/installed-packages.txt
+       for pkg in $(opkg-cl -f ${IMAGE_ROOTFS}/etc/opkg -o ${IMAGE_ROOTFS} list_installed | awk '{print $1}') ; do 
+               opkg-cl -f ${IMAGE_ROOTFS}/etc/opkg -o ${IMAGE_ROOTFS} info $pkg | grep Filename | awk -F: '{print $2}'  >> ${TESTLAB_DIR}/installed-packages.txt
 
-               for depends in $(ipkg-cl -f ${IMAGE_ROOTFS}/etc/ipkg -o  ${IMAGE_ROOTFS} info $pkg | grep Depends) ; do 
+               for depends in $(opkg-cl -f ${IMAGE_ROOTFS}/etc/opkg -o  ${IMAGE_ROOTFS} info $pkg | grep Depends) ; do 
                        echo "$pkg OPP $depends;" | grep -v "(" | grep -v ")" | grep -v Depends | sed -e 's:,::g' -e 's:-:_:g' -e 's:\.:_:g' -e 's:+::g' |sed 's:OPP:->:g' >> ${TESTLAB_DIR}/depends.dot
                done
                
-               for recommends in $(ipkg-cl -f ${IMAGE_ROOTFS}/etc/ipkg -o ${IMAGE_ROOTFS} info $pkg | grep Recom) ; do
+               for recommends in $(opkg-cl -f ${IMAGE_ROOTFS}/etc/opkg -o ${IMAGE_ROOTFS} info $pkg | grep Recom) ; do
                        echo "$pkg OPP $recommends [style=dotted];" | grep -v "(" | grep -v ")" | grep -v Recom | sed -e 's:,::g' -e 's:-:_:g' -e 's:\.:_:g' -e 's:+::g' |sed 's:OPP:->:g' >> ${TESTLAB_DIR}/depends.dot
                done
        done

diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 921d12e..7d69484 100644 (file)
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -210,7 +210,7 @@ DISTRO_EXTRA_RDEPENDS += "\
     update-modules \
     ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \   
     angstrom-version \
-    opkg-ipkg-compat ${ANGSTROM_FEED_CONFIGS} \
+    opkg opkg-collateral ${ANGSTROM_FEED_CONFIGS} \
     util-linux-mount util-linux-umount \
     ${DEBUG_APPS} \
     "

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index d998928..940c70a 100644 (file)
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -136,8 +136,9 @@ SRCREV_pn-openmoko-toolchain-scripts ?= "3767"
 SRCREV_pn-openmoko-worldclock2 ?= "3365"
 SRCREV_pn-openocd ?= "206"
 SRCREV_pn-openocd-native ?= "206"
-SRCREV_pn-opkg ?= "4142"
-SRCREV_pn-opkg-native ?= "4142"
+SRCREV_pn-opkg ?= "4209"
+SRCREV_pn-opkg-native ?= "4209"
+SRCREV_pn-opkg-sdk ?= "4209"
 SRCREV_pn-oprofileui ?= "160"
 SRCREV_pn-psplash ?= "249"
 SRCREV_pn-pylgrim ?= "20"

diff --git a/packages/angstrom/angstrom-feed-configs.bb b/packages/angstrom/angstrom-feed-configs.bb
index d0465b4..0b17aa6 100644 (file)
--- a/packages/angstrom/angstrom-feed-configs.bb
+++ b/packages/angstrom/angstrom-feed-configs.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Configuration files for online package repositories aka feeds"
 
 #PV = "${DISTRO_VERSION}"
-PR = "r4"
+PR = "r5"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 FEED_BASEPATH ?= "unstable/feed/"
@@ -9,37 +9,32 @@ FEED_BASEPATH ?= "unstable/feed/"
 IWMMXT_FEED = "${@base_contains('MACHINE_FEATURES', 'iwmmxt', 'iwmmxt', '',d)}"
 
 do_compile() {
-        mkdir -p ${S}/${sysconfdir}/ipkg
+        mkdir -p ${S}/${sysconfdir}/opkg
        for feed in base debug perl python gstreamer ; do
-          echo "src/gz ${feed} ${ANGSTROM_URI}/${FEED_BASEPATH}${FEED_ARCH}/${feed}" > ${S}/${sysconfdir}/ipkg/${feed}-feed.conf
+          echo "src/gz ${feed} ${ANGSTROM_URI}/${FEED_BASEPATH}${FEED_ARCH}/${feed}" > ${S}/${sysconfdir}/opkg/${feed}-feed.conf
        done
 
-        echo "src/gz ${MACHINE_ARCH} ${ANGSTROM_URI}/${FEED_BASEPATH}${FEED_ARCH}/machine/${MACHINE_ARCH}" >  ${S}/${sysconfdir}/ipkg/${MACHINE_ARCH}-feed.conf
-       echo "src/gz no-arch ${ANGSTROM_URI}/${FEED_BASEPATH}/all" > ${S}/${sysconfdir}/ipkg/noarch-feed.conf
+        echo "src/gz ${MACHINE_ARCH} ${ANGSTROM_URI}/${FEED_BASEPATH}${FEED_ARCH}/machine/${MACHINE_ARCH}" >  ${S}/${sysconfdir}/opkg/${MACHINE_ARCH}-feed.conf
+       echo "src/gz no-arch ${ANGSTROM_URI}/${FEED_BASEPATH}/all" > ${S}/${sysconfdir}/opkg/noarch-feed.conf
         
        # iwmmxt is a special case, add the iwmmxt feed for machine that have 'iwmmxt' in MACHINE_FEATURES
         if [ "${IWMMXT_FEED}" = "iwmmxt" ] ; then
-         echo "src/gz iwmmxt ${ANGSTROM_URI}/${FEED_BASEPATH}iwmmxt/base" > ${S}/${sysconfdir}/ipkg/iwmmxt-feed.conf
+         echo "src/gz iwmmxt ${ANGSTROM_URI}/${FEED_BASEPATH}iwmmxt/base" > ${S}/${sysconfdir}/opkg/iwmmxt-feed.conf
        fi  
 }
 
 
 do_install () {
-        install -d ${D}${sysconfdir}/ipkg
-       install -m 0644  ${S}/${sysconfdir}/ipkg/* ${D}${sysconfdir}/ipkg/
-        # opkg compat symlinks
         install -d ${D}${sysconfdir}/opkg
-        for feed in ${D}${sysconfdir}/ipkg/* ; do
-           ln -sf ${sysconfdir}/ipkg/$(basename $feed) ${D}${sysconfdir}/opkg/$(basename $feed)
-        done
+       install -m 0644  ${S}/${sysconfdir}/opkg/* ${D}${sysconfdir}/opkg/
 }
 
-CONFFILES_${PN} += "${sysconfdir}/ipkg/base-feed.conf \
-                    ${sysconfdir}/ipkg/debug-feed.conf \
-                    ${sysconfdir}/ipkg/perl-feed.conf \
-                    ${sysconfdir}/ipkg/python-feed.conf \
-                    ${sysconfdir}/ipkg/gstreamer-feed.conf \
-                    ${sysconfdir}/ipkg/${MACHINE_ARCH}-feed.conf \
-                    ${sysconfdir}/ipkg/noarch-feed.conf \
+CONFFILES_${PN} += "${sysconfdir}/opkg/base-feed.conf \
+                    ${sysconfdir}/opkg/debug-feed.conf \
+                    ${sysconfdir}/opkg/perl-feed.conf \
+                    ${sysconfdir}/opkg/python-feed.conf \
+                    ${sysconfdir}/opkg/gstreamer-feed.conf \
+                    ${sysconfdir}/opkg/${MACHINE_ARCH}-feed.conf \
+                    ${sysconfdir}/opkg/noarch-feed.conf \
                    "
 

diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb
index 3c92712..2bce564 100644 (file)
--- a/packages/meta/meta-toolchain.bb
+++ b/packages/meta/meta-toolchain.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Meta package for building a installable toolchain"
 LICENSE = "MIT"
-DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native"
+DEPENDS = "opkg-native ipkg-utils-native fakeroot-native sed-native"
 
 inherit sdk meta
 
@@ -9,8 +9,8 @@ SDK_OUTPUT = "${SDK_DIR}/image"
 SDK_OUTPUT2 = "${SDK_DIR}/image-extras"
 SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
 
-IPKG_HOST = "ipkg-cl -f ${IPKGCONF_SDK} -o ${SDK_OUTPUT}"
-IPKG_TARGET = "ipkg-cl -f ${IPKGCONF_TARGET} -o ${SDK_OUTPUT}/temp-target"
+IPKG_HOST = "opkg-cl -f ${IPKGCONF_SDK} -o ${SDK_OUTPUT}"
+IPKG_TARGET = "opkg-cl -f ${IPKGCONF_TARGET} -o ${SDK_OUTPUT}/temp-target"
 
 TOOLCHAIN_HOST_TASK ?= "task-sdk-host"
 TOOLCHAIN_TARGET_TASK ?= "task-sdk-bare"
@@ -40,8 +40,8 @@ do_populate_sdk() {
        mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include
        mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/.debug/
        mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/share
-       mv ${SDK_OUTPUT}/temp-target/usr/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
-       rm -rf ${SDK_OUTPUT}/temp-target/usr/lib/ipkg/
+       mv ${SDK_OUTPUT}/temp-target/usr/lib/opkg/status ${SDK_OUTPUT}/${prefix}/package-status
+       rm -rf ${SDK_OUTPUT}/temp-target/usr/lib/opkg/
        cp -pPR ${SDK_OUTPUT}/temp-target/usr/include/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/
        cp -pPR ${SDK_OUTPUT}/temp-target/usr/lib/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/
        if [ -d ${SDK_OUTPUT}/temp-target/usr/lib/.debug ]; then
@@ -69,7 +69,7 @@ do_populate_sdk() {
        echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libc.so
 
        # remove unwanted housekeeping files
-       mv ${SDK_OUTPUT}/usr/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status-host
+       mv ${SDK_OUTPUT}/usr/lib/opkg/status ${SDK_OUTPUT}/${prefix}/package-status-host
        rm -Rf ${SDK_OUTPUT}/usr/lib
 
        # extract and store ipks, pkgdata and shlibs data

diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 1583550..0607f70 100644 (file)
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r63"
+PR = "r65"
 
 inherit task