diff options
| author |   Graham Gower <graham.gower@gmail.com> | 2010-06-29 18:54:00 +0000 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2010-08-03 13:02:24 -0700 |
| commit | 11d08db8106e173599cf5efec58d2710c66bba51 (patch) | |
| tree | 8319aa1b07152198f386fb8707d2b137734caf12 /conf/distro/kaeilos.conf | |
| parent | 060285f9fdb9bc0065f119a41edb15e0182c069c (diff) | |
| download | openembedded-11d08db8106e173599cf5efec58d2710c66bba51.tar.gz | |
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 <graham.gower@gmail.com>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'conf/distro/kaeilos.conf')
| -rw-r--r-- | conf/distro/kaeilos.conf | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf index b1412805d1..78a69f110f 100644 --- a/conf/distro/kaeilos.conf +++ b/conf/distro/kaeilos.conf @@ -128,7 +128,7 @@ require conf/distro/include/arm-thumb.inc PREFERRED_PROVIDER_dbus-glib = "dbus-glib" PREFERRED_PROVIDER_hotplug = "udev" -PREFERRED_PROVIDER_opkg ?= "opkg-nogpg-nocurl" +PREFERRED_PROVIDER_opkg ?= "opkg" # see recipes/bluez/bluez4*.bb for further dependencies of this setting ANGSTROM_BLACKLIST_pn-bluez-libs = "bluez-libs 3.x has been replaced by bluez4" @@ -138,12 +138,12 @@ ANGSTROM_BLACKLIST_pn-fso-apm = "regular apmd is good enough" require conf/distro/include/kaeilos.inc -# If we're using an .ipk based rootfs, we want to have opkg-nogpg installed so postinst script can run +# If we're using an .ipk based rootfs, we want to have opkg installed so postinst script can run # We also take this opportunity to inject angstrom-version and the feed configs into the rootfs -IPKG_VARIANT = "opkg-nogpg-nocurl angstrom-version ${ANGSTROM_FEED_CONFIGS}" +IPKG_VARIANT = "opkg angstrom-version ${ANGSTROM_FEED_CONFIGS}" # we need the same provider for opkg and u-a -PREFERRED_PROVIDER_virtual/update-alternatives = "opkg-nogpg-nocurl" +PREFERRED_PROVIDER_virtual/update-alternatives = "opkg" # Select xserver-xorg as default, since kdrive has been EOL'ed XSERVER ?= "xserver-xorg xf86-input-evdev xf86-input-keyboard xf86-input-mouse xf86-video-fbdev" @@ -168,7 +168,7 @@ DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace procps" DISTRO_EXTRA_RDEPENDS += "\ update-modules \ kaeilos-version \ - opkg-nogpg opkg-collateral ${ANGSTROM_FEED_CONFIGS} \ + opkg opkg-collateral ${ANGSTROM_FEED_CONFIGS} \ util-linux-ng-mount util-linux-ng-umount \ ${DEBUG_APPS} angstrom-libc-fixup-hack \ " |