From 5a6a21a74a4c24dc6577f97eb902864dc32f1c8b Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Wed, 23 Apr 2008 13:12:05 +0000
Subject: openmoko: remove ipkg.  replace by opkg.

---
 conf/distro/include/angstrom-2007-for-openmoko.inc | 2 +-
 conf/distro/openmoko.conf                          | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'conf')

diff --git a/conf/distro/include/angstrom-2007-for-openmoko.inc b/conf/distro/include/angstrom-2007-for-openmoko.inc
index ef2131eed6..e38a3abd06 100644
--- a/conf/distro/include/angstrom-2007-for-openmoko.inc
+++ b/conf/distro/include/angstrom-2007-for-openmoko.inc
@@ -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} \
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index 73fcf20066..80192ea4d1 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -14,7 +14,6 @@ DISTRO_NAME = "Openmoko"
 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}"
-- 
cgit v1.2.3