From 11d08db8106e173599cf5efec58d2710c66bba51 Mon Sep 17 00:00:00 2001 From: Graham Gower Date: Tue, 29 Jun 2010 18:54:00 +0000 Subject: opkg recipe overhaul - removal of opkg-nogpg and opkg-nogpg-nocurl. None of the distros in OE appear to want/need gpg or curl support in opkg; so have opkg.inc remove them by default. This diff makes things more consistent across all distros/tasks/images. The slugos recipe is kept intact and further divided from the more modern recipes. The opkg-native recipe is the sane-srcrev version even when building slugos, which should allow for changes to opkg related bbclasses without breaking the slugos build. Build tested for qemumipsel/minimal-image and nslu2/slugos-image. minimal-image builds 10% quicker in my setup and is 1mb smaller. Signed-off-by: Graham Gower Acked-by: Khem Raj Acked-by: Martin Jansa --- recipes/images/minimal-gpe-image.bb | 2 +- recipes/images/nas-server-image.bb | 2 +- recipes/images/x11-sato-image.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'recipes/images') diff --git a/recipes/images/minimal-gpe-image.bb b/recipes/images/minimal-gpe-image.bb index c37225d53c..0c5c863d84 100644 --- a/recipes/images/minimal-gpe-image.bb +++ b/recipes/images/minimal-gpe-image.bb @@ -17,7 +17,7 @@ IMAGE_INSTALL = "\ matchbox-wm \ gpe-terminal \ angstrom-feed-configs \ - opkg-nogpg opkg-collateral \ + opkg opkg-collateral \ ${SPLASH} \ " diff --git a/recipes/images/nas-server-image.bb b/recipes/images/nas-server-image.bb index 85b2bae551..61e8296c05 100644 --- a/recipes/images/nas-server-image.bb +++ b/recipes/images/nas-server-image.bb @@ -20,7 +20,7 @@ # intended to be distro-agnostic. DISTRO_SSH_DAEMON ?= "dropbear" -DISTRO_PACKAGE_MANAGER ?= "opkg-nogpg opkg-collateral" +DISTRO_PACKAGE_MANAGER ?= "opkg opkg-collateral" DEPENDS = "\ task-boot \ diff --git a/recipes/images/x11-sato-image.bb b/recipes/images/x11-sato-image.bb index 0a127f85cf..c2ed50ea54 100644 --- a/recipes/images/x11-sato-image.bb +++ b/recipes/images/x11-sato-image.bb @@ -1,5 +1,5 @@ DISTRO_SSH_DAEMON ?= "dropbear" -DISTRO_PACKAGE_MANAGER ?= "opkg-nogpg opkg-collateral" +DISTRO_PACKAGE_MANAGER ?= "opkg opkg-collateral" XSERVER ?= "xserver-kdrive-fbdev" -- cgit 1.2.3-korg