Remove redundant dependencies upon opkg and opkg-collateral.

rootfs_ipk.bbclass already pulls these in, so avoid some confusion.

This is totally untested.

Signed-off-by: Graham Gower <graham.gower@gmail.com>
Acked-by: Chris Larson <clarson@kergoth.com>
Acked-by: Martin Jansa <Martin.Jansa@gmail.com>

diff --git a/recipes/images/base-image.bb b/recipes/images/base-image.bb
index ee1f115..51d6d34 100644 (file)
--- a/recipes/images/base-image.bb
+++ b/recipes/images/base-image.bb
@@ -20,9 +20,6 @@ IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
 
 DISTRO_SSH_DAEMON ?= "dropbear"
 
-IPKG_VARIANT ?= "opkg"
-DISTRO_PACKAGE_MANAGER ?= "${IPKG_VARIANT}"
-
 # FIXME: We need a distro-indendent way of specifying feed configs.
 # Once the RFC for the DISTRO_FEED_CONFIGS variable name is approved,
 # we can remove this default definition and set it in the distro config.
@@ -31,7 +28,6 @@ DISTRO_FEED_CONFIGS ?= "${ANGSTROM_FEED_CONFIGS}"
 DEPENDS = "\
        task-boot \
        ${DISTRO_SSH_DAEMON} \
-       ${DISTRO_PACKAGE_MANAGER} \
        ${DISTRO_FEED_CONFIGS} \
        ${@base_contains('MACHINE_FEATURES', 'ext2', 'task-base-ext2', '', d)} \
        ${@base_contains('MACHINE_FEATURES', 'usbhost', 'task-base-usbhost', '', d)} \
@@ -40,7 +36,6 @@ DEPENDS = "\
 IMAGE_INSTALL = "\
        task-boot \
        ${DISTRO_SSH_DAEMON} \
-       ${DISTRO_PACKAGE_MANAGER} \
        ${DISTRO_FEED_CONFIGS} \
        ${@base_contains('MACHINE_FEATURES', 'ext2', 'task-base-ext2', '', d)} \
        ${@base_contains('MACHINE_FEATURES', 'usbhost', 'task-base-usbhost', '', d)} \

diff --git a/recipes/images/minimal-gpe-image.bb b/recipes/images/minimal-gpe-image.bb
index 0c5c863..b8ddacb 100644 (file)
--- a/recipes/images/minimal-gpe-image.bb
+++ b/recipes/images/minimal-gpe-image.bb
@@ -17,7 +17,6 @@ IMAGE_INSTALL = "\
     matchbox-wm \
     gpe-terminal \
     angstrom-feed-configs \
-    opkg opkg-collateral \
     ${SPLASH} \
     "
 

diff --git a/recipes/images/nas-server-image.bb b/recipes/images/nas-server-image.bb
index 61e8296..f26a357 100644 (file)
--- a/recipes/images/nas-server-image.bb
+++ b/recipes/images/nas-server-image.bb
@@ -20,14 +20,12 @@
 # intended to be distro-agnostic.
 
 DISTRO_SSH_DAEMON ?= "dropbear"
-DISTRO_PACKAGE_MANAGER ?= "opkg opkg-collateral"
 
 DEPENDS = "\
        task-boot \
        ${@base_contains('MACHINE_FEATURES', 'apex', 'task-base-apex', '', d)} \
        task-distro-base task-machine-base \
        ${DISTRO_SSH_DAEMON} \
-       ${DISTRO_PACKAGE_MANAGER} \
        ${@base_contains('MACHINE_FEATURES', 'ext2', 'task-base-ext2', '', d)} \
        ${@base_contains('MACHINE_FEATURES', 'usbhost', 'task-base-usbhost', '', d)} \
        task-nas-server-everything \
@@ -41,7 +39,6 @@ IMAGE_INSTALL = "\
        task-boot \
        ${@base_contains('MACHINE_FEATURES', 'apex', 'task-base-apex', '', d)} \
        ${DISTRO_SSH_DAEMON} \
-       ${DISTRO_PACKAGE_MANAGER} \
        ${@base_contains('MACHINE_FEATURES', 'ext2', 'task-base-ext2', '', d)} \
        ${@base_contains('MACHINE_FEATURES', 'usbhost', 'task-base-usbhost', '', d)} \
        ${IMAGE_INSTALL_TASKS} \

diff --git a/recipes/images/x11-sato-image.bb b/recipes/images/x11-sato-image.bb
index c2ed50e..f79beae 100644 (file)
--- a/recipes/images/x11-sato-image.bb
+++ b/recipes/images/x11-sato-image.bb
@@ -1,5 +1,4 @@
 DISTRO_SSH_DAEMON ?= "dropbear"
-DISTRO_PACKAGE_MANAGER ?= "opkg opkg-collateral"
 
 XSERVER ?= "xserver-kdrive-fbdev"
 
@@ -8,7 +7,6 @@ IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
 IMAGE_INSTALL = "\
        task-base-extended \
        ${DISTRO_SSH_DAEMON} \
-       ${DISTRO_PACKAGE_MANAGER} \
        pointercal \
        matchbox-wm \
        matchbox-keyboard matchbox-keyboard-applet matchbox-keyboard-im \

diff --git a/recipes/tasks/task-slugos.bb b/recipes/tasks/task-slugos.bb
index c007779..297d6f0 100644 (file)
--- a/recipes/tasks/task-slugos.bb
+++ b/recipes/tasks/task-slugos.bb
@@ -133,7 +133,6 @@ RDEPENDS_${PN} += "\
         busybox initscripts-slugos slugos-init \
         update-modules sysvinit udev \
        module-init-tools modutils-initscripts \
-        opkg-collateral ${IPKG_VARIANT} \
        libgcc \
        beep \
        util-linux-mount \