summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Lee <john_lee@openmoko.org>2008-04-23 13:12:05 +0000
committerJohn Lee <john_lee@openmoko.org>2008-04-23 13:12:05 +0000
commit5a6a21a74a4c24dc6577f97eb902864dc32f1c8b (patch)
tree2bc16e4cd95dd4880b34a347378ec9f125605aaa
parent4d4b1800fc8fd73ca936c923db9eb6adad4014ab (diff)
openmoko: remove ipkg. replace by opkg.
-rw-r--r--conf/distro/include/angstrom-2007-for-openmoko.inc2
-rw-r--r--conf/distro/openmoko.conf1
-rw-r--r--packages/tasks/task-base.bb2
3 files changed, 2 insertions, 3 deletions
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}"
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index c378817d40..c3ada840e2 100644
--- 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 = "r66"
+PR = "r67"
inherit task