aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/images
diff options
context:
space:
mode:
authorGraham Gower <graham.gower@gmail.com>2010-11-25 10:59:26 +1030
committerKhem Raj <raj.khem@gmail.com>2010-11-24 22:42:18 -0800
commita1bba89847bac62d1cbfe28e3b8059f0fcafa7d1 (patch)
tree05b99b360de3326951d475fa95fd64a2dcc507b0 /recipes/images
parentb86e4f9c8757cf2379836a3b500480771693ee20 (diff)
downloadopenembedded-a1bba89847bac62d1cbfe28e3b8059f0fcafa7d1.tar.gz
Remove use of ipkg{,-collateral,-link}.
No one should be using these any longer. * Opkg conflicts with ipkg. * There is opkg, opkg-collateral and ipkg-utils contains ipkg-link. Signed-off-by: Graham Gower <graham.gower@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes/images')
-rw-r--r--recipes/images/openprotium-image.bb2
-rw-r--r--recipes/images/opie-image-16mb.bb1
-rw-r--r--recipes/images/x11-jvm-image.bb3
3 files changed, 1 insertions, 5 deletions
diff --git a/recipes/images/openprotium-image.bb b/recipes/images/openprotium-image.bb
index 0f64ba2052..3c31a8030a 100644
--- a/recipes/images/openprotium-image.bb
+++ b/recipes/images/openprotium-image.bb
@@ -22,7 +22,7 @@ IMAGE_PREPROCESS_COMMAND += "echo /dev/md >> ${IMAGE_ROOTFS}/etc/udev/mount.blac
IMAGE_PREPROCESS_COMMAND += "echo /dev/hd >> ${IMAGE_ROOTFS}/etc/udev/mount.blacklist;"
IMAGE_PREPROCESS_COMMAND += "echo /dev/mtd3 0x30000 0x10000 0x10000 > ${IMAGE_ROOTFS}/etc/fw_env.config;"
-ROOTFS_POSTPROCESS_COMMAND += "ipkg-cl ${IPKG_ARGS} -force-depends \
+ROOTFS_POSTPROCESS_COMMAND += "opkg-cl ${IPKG_ARGS} -force-depends \
remove ${PACKAGE_REMOVE};"
inherit image concatenated-image
diff --git a/recipes/images/opie-image-16mb.bb b/recipes/images/opie-image-16mb.bb
index b4a0e03e16..8569e952a7 100644
--- a/recipes/images/opie-image-16mb.bb
+++ b/recipes/images/opie-image-16mb.bb
@@ -4,7 +4,6 @@ DEPENDS = "task-boot task-opie-16mb"
ANGSTROM_EXTRA_INSTALL ?= ""
IMAGE_INSTALL = "task-boot \
- ipkg ipkg-collateral \
dropbear \
task-opie-16mb-base \
task-opie-16mb-applets \
diff --git a/recipes/images/x11-jvm-image.bb b/recipes/images/x11-jvm-image.bb
index fd0e5f09ad..9fed202aea 100644
--- a/recipes/images/x11-jvm-image.bb
+++ b/recipes/images/x11-jvm-image.bb
@@ -19,9 +19,6 @@ ADD_JVM = "\
jamvm \
cacao "
-ADD_OTHER = "\
- ipkg "
-
IMAGE_INSTALL = "\
${XSERVER} \
task-base-extended \