[oe-commits] org.oe.dev openmoko: remove ipkg. replace by opkg.

[john_lee commit]

openmoko: remove ipkg.  replace by opkg.

Author: john_lee at openembedded.org
Branch: org.openembedded.dev
Revision: ac84454ebc080384a852b517dce55132fbfdd568
ViewMTN: http://monotone.openembedded.org/revision/info/ac84454ebc080384a852b517dce55132fbfdd568
Files:
1
conf/distro/include/angstrom-2007-for-openmoko.inc
conf/distro/openmoko.conf
packages/tasks/task-base.bb
Diffs:

#
# mt diff -rcad1cb51c00a272c9b0231e567d9c547c523ce34 -rac84454ebc080384a852b517dce55132fbfdd568
#
#
#
# patch "conf/distro/include/angstrom-2007-for-openmoko.inc"
#  from [f614e2171eb6387b440ff2a24e70a3cf85bd4fdc]
#    to [a717aa544a7276462523eba422c16b077bee6039]
# 
# patch "conf/distro/openmoko.conf"
#  from [6006ac4f1c0c6b81df41cd7b518e4db18dbe59e3]
#    to [a8060f6771d31c1ba369637729e3123ddecb2dc3]
# 
# patch "packages/tasks/task-base.bb"
#  from [745232fdeea50cbc68dde52ff209ad625bdd84b0]
#    to [50285a37437adccf62033cd89c0d329f69d4e191]
#
============================================================
--- conf/distro/include/angstrom-2007-for-openmoko.inc	f614e2171eb6387b440ff2a24e70a3cf85bd4fdc
+++ conf/distro/include/angstrom-2007-for-openmoko.inc	a717aa544a7276462523eba422c16b077bee6039
@@ -240,7 +240,7 @@ DISTRO_EXTRA_RDEPENDS += "\
     update-modules \
     ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \   
     angstrom-version \
-    ipkg ipkg-collateral ${ANGSTROM_FEED_CONFIGS} \
+    opkg opkg-collateral ${ANGSTROM_FEED_CONFIGS} \
     util-linux-mount util-linux-umount \
     ${EXTRA_STUFF} \
     ${DEBUG_APPS} \
============================================================
--- conf/distro/openmoko.conf	6006ac4f1c0c6b81df41cd7b518e4db18dbe59e3
+++ conf/distro/openmoko.conf	a8060f6771d31c1ba369637729e3123ddecb2dc3
@@ -14,7 +14,6 @@ DISTRO_TYPE = "debug"
 DISTRO_VERSION = "P1-Snapshot-${DATE}"
 #DISTRO_TYPE = "release"
 DISTRO_TYPE = "debug"
-DISTRO_EXTRA_RDEPENDS += "opkg-ipkg-compat"
 DISTRO = "openmoko"
 
 OVERRIDES = "local:${MACHINE}:openmoko:angstrom:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
============================================================
--- packages/tasks/task-base.bb	745232fdeea50cbc68dde52ff209ad625bdd84b0
+++ packages/tasks/task-base.bb	50285a37437adccf62033cd89c0d329f69d4e191
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro 
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r66"
+PR = "r67"
 
 inherit task