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.
---

v2:
 A stray missing double quote makes the last patch a no go.

---
 conf/compatibility-providers.conf                 |    1 - conf/distro/angstrom-2008.1.conf                  |    8 +- conf/distro/include/preferred-slugos-versions.inc |   10 --- conf/distro/jlime-2010.1.conf                     |    2 +- conf/distro/kaeilos-2010.conf                     |   10 ++-- conf/distro/kaeilos.conf                          |   10 ++-- conf/distro/micro.conf                            |    2 +- conf/distro/minimal.conf                          |    8 +- conf/distro/nylon.conf                            |    2 +- recipes/angstrom/angstrom-feed-configs.bb         |    2 +- recipes/images/minimal-gpe-image.bb               |    2 +- recipes/images/nas-server-image.bb                |    2 +- recipes/images/x11-sato-image.bb                  |    2 +- recipes/meta/meta-toolchain-arago.bb              |    2 +- recipes/opkg/files/fix_endianness.patch           |   12 ---- recipes/opkg/files/isatty.patch                   |   64 +++++++++++++++++++++ recipes/opkg/files/opkg-intercept-cleanup.patch   |   47 +++++++++++++++ recipes/opkg/files/opkg-libdir.patch              |   11 ---- recipes/opkg/opkg-native_svn.bb                   |   11 +--- recipes/opkg/opkg-nogpg-nocurl-slugos_svn.bb      |   29 +++++++--- recipes/opkg/opkg-nogpg-nocurl_svn.bb             |   15 ----- recipes/opkg/opkg-nogpg_svn.bb                    |   25 -------- recipes/opkg/opkg-sdk_svn.bb                      |    2 +- recipes/opkg/opkg.inc                             |   16 ++--- recipes/opkg/opkg/isatty.patch                    |   64 --------------------- recipes/opkg/opkg/opkg-intercept-cleanup.patch    |   47 --------------- recipes/opkg/opkg_svn.bb                          |    6 -- recipes/tasks/task-arago-toolchain-target.bb      |    2 +- recipes/tasks/task-sdk-sbox.bb                    |    2 +-

 29 files changed, 168 insertions(+), 248 deletions(-)

 delete mode 100644 recipes/opkg/files/fix_endianness.patch create mode 100644 recipes/opkg/files/isatty.patch create mode 100644 recipes/opkg/files/opkg-intercept-cleanup.patch delete mode 100644 recipes/opkg/files/opkg-libdir.patch delete mode 100644 recipes/opkg/opkg-nogpg-nocurl_svn.bb delete mode 100644 recipes/opkg/opkg-nogpg_svn.bb delete mode 100644 recipes/opkg/opkg/isatty.patch delete mode 100644 recipes/opkg/opkg/opkg-intercept-cleanup.patch

conf/compatibility-providers.conf +0 -0

index 350521a..58a0ad1 100644
@@ -46,7 +46,6 @@ PREFERRED_PROVIDER_libxss ?= "libxss"

 PREFERRED_PROVIDER_ntp ?= "ntp" PREFERRED_PROVIDER_openmoko-alsa-scenarios ?= "fsodeviced" PREFERRED_PROVIDER_opkg ?= "opkg" -#PREFERRED_PROVIDER_opkg ?= "opkg-nogpg" PREFERRED_PROVIDER_qemu-native ?= "qemu-native" PREFERRED_PROVIDER_qt4-embedded ?= "qt4-embedded" PREFERRED_PROVIDER_qt4-x11-free ?= "qt4-x11-free"

conf/distro/angstrom-2008.1.conf +0 -0

index 7c70c84..e86ced3 100644
@@ -139,7 +139,7 @@ require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc
 

 PREFERRED_PROVIDER_dbus-glib             = "dbus-glib" PREFERRED_PROVIDER_hotplug               = "udev"

conf/distro/angstrom-2008.1.conf +1 -1

-PREFERRED_PROVIDER_opkg                 ?= "opkg-nogpg-nocurl"
+PREFERRED_PROVIDER_opkg                 ?= "opkg"

 ANGSTROM_BLACKLIST_pn-bluez-libs       = "bluez-libs 3.x has been replaced by bluez4" ANGSTROM_BLACKLIST_pn-bluez-utils      = "bluez-utils 3.x has been replaced by bluez4"

conf/distro/angstrom-2008.1.conf +0 -0

@@ -151,12 +151,12 @@ require conf/distro/include/angstrom.inc
  # Set DISTRO_FEED_CONFIGS to our config var, assigned in the above .inc

 DISTRO_FEED_CONFIGS = "${ANGSTROM_FEED_CONFIGS}"

conf/distro/angstrom-2008.1.conf +1 -1

-# 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

conf/distro/angstrom-2008.1.conf +1 -1

-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

conf/distro/angstrom-2008.1.conf +1 -1

-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"

conf/distro/include/preferred-slugos-versions.inc +0 -10

index 84b1381..a8909d0 100644
@@ -15,16 +15,6 @@ PREFERRED_VERSION_linux-ixp4xx = "2.6.27.8+svnr${SRCREV_pn-linux-ixp4xx}"
  #
  #===============================================================================#
  #===============================================================================#
-#                              NOTE NOTE NOTE
-#
-# Override the sane-srcrev file with regard to the opkg versions - this should
-# be removed as soon as opkg starts to work correctly again as newer opkg
-# versions fix a number of bugs and add some desireable features.
-#
-OPKG_SRCREV = "160"
-#
-#===============================================================================#
-#===============================================================================#
 
  ### Standard package preferred versions go here, sorted
  ### alphabetically.  Note that the main slugos.inc file

conf/distro/jlime-2010.1.conf +0 -0

index 3ec3e86..f62ca99 100644
@@ -40,7 +40,7 @@ SPLASH = "psplash"

 INHERIT += "debian package_tar package_ipk src_distribute_local" SRC_DIST_LOCAL ?= "symlink"
 IMAGE_FSTYPES = "tar.gz tar.bz2 jffs2"

conf/distro/jlime-2010.1.conf +1 -1

-PREFERRED_PROVIDER_virtual/update-alternatives = "opkg-nogpg-nocurl"
+PREFERRED_PROVIDER_virtual/update-alternatives = "opkg"

 #
 # Kernel

conf/distro/kaeilos-2010.conf +0 -0

index 4bb637c..58d7a57 100644
@@ -64,7 +64,7 @@ require conf/distro/include/kaeilos-2010.inc
  # Select packaging system

 IMAGE_FSTYPES ?= "tar.gz jffs2"
 PREFERRED_PKG_FORMAT = "ipk"

conf/distro/kaeilos-2010.conf +1 -1

-IPKG_VARIANT = "opkg-nogpg"
+IPKG_VARIANT = "opkg"

@@ -99,11 +99,11 @@ require conf/distro/include/sane-toolchain.inc
 

 PREFERRED_PROVIDER_dbus-glib             = "dbus-glib" PREFERRED_PROVIDER_hotplug               = "udev"

conf/distro/kaeilos-2010.conf +1 -1

-PREFERRED_PROVIDER_opkg                 ?= "opkg-nogpg-nocurl"
+PREFERRED_PROVIDER_opkg                 ?= "opkg"

 # PREFERRED VERSIONS

conf/distro/kaeilos-2010.conf +2 -2

-PREFERRED_PROVIDER_opkg ?= "opkg-nogpg"
-PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg-nogpg"
+PREFERRED_PROVIDER_opkg ?= "opkg"
+PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg"

 # Select xserver-xorg as default, since kdrive has been EOL'ed

conf/distro/kaeilos-2010.conf +1 -1

@@ -128,7 +128,7 @@ DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace procps"
  DISTRO_EXTRA_RDEPENDS += "\
     update-modules \
     kaeilos-version \
-    opkg-nogpg opkg-collateral \
+    opkg opkg-collateral \
     util-linux-ng-mount util-linux-ng-umount \
     ${DEBUG_APPS} \

    "

conf/distro/kaeilos.conf +0 -0

index eb12d2e..c1c2e36 100644
@@ -127,7 +127,7 @@ require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc
 

 PREFERRED_PROVIDER_dbus-glib             = "dbus-glib" PREFERRED_PROVIDER_hotplug               = "udev"

conf/distro/kaeilos.conf +1 -1

-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"

conf/distro/kaeilos.conf +0 -0

@@ -137,12 +137,12 @@ ANGSTROM_BLACKLIST_pn-fso-apm       = "regular apmd is good enough"
 

 require conf/distro/include/kaeilos.inc

conf/distro/kaeilos.conf +1 -1

-# 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

conf/distro/kaeilos.conf +1 -1

-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

conf/distro/kaeilos.conf +1 -1

-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"

conf/distro/kaeilos.conf +1 -1

@@ -167,7 +167,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 \

    "

conf/distro/micro.conf +0 -0

index 9885425..5c58ce2 100644
@@ -32,7 +32,7 @@ INHERIT += "debian"
  #############################################################################
  # Select packaging system

 PREFERRED_PKG_FORMAT = "ipk"

conf/distro/micro.conf +1 -1

-IPKG_VARIANT = "opkg-nogpg"
+IPKG_VARIANT = "opkg"

 require conf/distro/include/sane-feed.inc
 require conf/distro/include/sane-feed-${PREFERRED_PKG_FORMAT}.inc

conf/distro/minimal.conf +0 -0

index 1e72efd..1fa3c5e 100644
@@ -58,8 +58,8 @@ PREFERRED_PKG_FORMAT ?= "ipk"

 INHERIT += "src_distribute_local"
 SRC_DIST_LOCAL ?= "symlink"

conf/distro/minimal.conf +2 -2

-# If we're using an .ipk based rootfs, we want to have opkg-nogpg installed so postinst script can run
-IPKG_VARIANT = "opkg-nogpg"
+# If we're using an .ipk based rootfs, we want to have opkg installed so postinst script can run
+IPKG_VARIANT = "opkg"

 #############################################################################
 # IMAGES

conf/distro/minimal.conf +0 -0

@@ -101,8 +101,8 @@ require conf/distro/include/preferred-e-versions.inc

 require conf/distro/include/preferred-opie-versions-1.2.4.inc require conf/distro/include/preferred-xorg-versions-X11R7.5.inc

conf/distro/minimal.conf +2 -2

-PREFERRED_PROVIDER_opkg ?= "opkg-nogpg"
-PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg-nogpg"
+PREFERRED_PROVIDER_opkg ?= "opkg"
+PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg"

 #############################################################################
 # CONTENTS

conf/distro/nylon.conf +0 -0

index 7ab7b35..ae8d064 100644
@@ -86,4 +86,4 @@ PREFERRED_VERSION_e2fsprogs-libs = "1.41.8"

 PREFERRED_VERSION_dbus = "1.2.1"

 PREFERRED_PROVIDER_hotplug = "linux-hotplug"

conf/distro/nylon.conf +1 -1

-PREFERRED_PROVIDER_opkg = "opkg-nogpg"
+PREFERRED_PROVIDER_opkg = "opkg"

recipes/angstrom/angstrom-feed-configs.bb +0 -0

index d25cba7..cad2b8b 100644
@@ -1,6 +1,6 @@

 DESCRIPTION = "Configuration files for online package repositories aka feeds"

recipes/angstrom/angstrom-feed-configs.bb +1 -1

-RRECOMMENDS_${PN} += "opkg-nogpg-nocurl"
+RRECOMMENDS_${PN} += "opkg"

 #PV = "${DISTRO_VERSION}"
 PR = "r11"

recipes/images/minimal-gpe-image.bb +1 -1

index c37225d..0c5c863 100644
@@ -17,7 +17,7 @@ IMAGE_INSTALL = "\
     matchbox-wm \
     gpe-terminal \
     angstrom-feed-configs \
-    opkg-nogpg opkg-collateral \
+    opkg opkg-collateral \
     ${SPLASH} \

    "

recipes/images/nas-server-image.bb +0 -0

index 85b2bae..61e8296 100644
@@ -20,7 +20,7 @@
  # intended to be distro-agnostic.
 

 DISTRO_SSH_DAEMON ?= "dropbear"

recipes/images/nas-server-image.bb +1 -1

-DISTRO_PACKAGE_MANAGER ?= "opkg-nogpg opkg-collateral"
+DISTRO_PACKAGE_MANAGER ?= "opkg opkg-collateral"

 DEPENDS = "\
       task-boot \

recipes/images/x11-sato-image.bb +0 -0

index 0a127f8..c2ed50e 100644
@@ -1,5 +1,5 @@

 DISTRO_SSH_DAEMON ?= "dropbear"

recipes/images/x11-sato-image.bb +1 -1

-DISTRO_PACKAGE_MANAGER ?= "opkg-nogpg opkg-collateral"
+DISTRO_PACKAGE_MANAGER ?= "opkg opkg-collateral"

 XSERVER ?= "xserver-kdrive-fbdev"

recipes/meta/meta-toolchain-arago.bb +1 -1

index 0478e97..425af6d 100644
@@ -15,7 +15,7 @@ TOOLCHAIN_TARGET_EXCLUDE += "\
     libthread-db1 \
     sln \
     curl \
-    opkg-nogpg \
+    opkg \
     alsa-conf-base \
     update-rc.d \
     update-rc.d-dev \

recipes/opkg/files/fix_endianness.patch deleted +0 -12

deleted file mode 100644
index 8632ce5..0000000
@@ -1,12 +0,0 @@
-diff -urN opkg.orig/configure.ac opkg/configure.ac
---- opkg.orig/configure.ac     2008-03-20 13:29:09.000000000 +0100
-+++ opkg/configure.ac  2008-03-25 09:39:52.000000000 +0100
-@@ -94,7 +94,7 @@
- AC_CHECK_MEMBERS([struct stat.st_rdev])
-
- # Checks endianness
--AC_C_BIGENDIAN(ENDIAN_CFLAGS="-DWORDS_BIGENDIAN=1",)
-+AC_C_BIGENDIAN(BIGENDIAN_CFLAGS="-DWORDS_BIGENDIAN=1",)
- AC_SUBST(BIGENDIAN_CFLAGS)
-
- # Don't do annoying tests that don't work when cross-compiling, just trust them.

recipes/opkg/files/isatty.patch new file +64 -0

new file mode 100644
index 0000000..c935f15
@@ -0,0 +1,64 @@
+Copyright (c) 2009 MontaVista Software, Inc.  All rights reserved.
+
+Don't prompt for user input from stdin if it's not a tty.  Fixes a minor
+memory leak while we're at it, as the code was strdup'ing the malloc'd string
+read from stdin without ever freeing the original.
+---
+ libopkg/libopkg.c      |   13 ++++++++-----
+ libopkg/opkg_install.c |    3 +++
+ libopkg/user.c         |   10 +++++++---
+ 3 files changed, 18 insertions(+), 8 deletions(-)
+
+--- trunk.orig/libopkg/libopkg.c
++++ trunk/libopkg/libopkg.c
+@@ -71,11 +71,14 @@ int default_opkg_status_callback(char *n
+ char* default_opkg_response_callback(char *question)
+ {
+      char *response = NULL;
+-     printf("%s",question);
+-     fflush(stdout);
+-     do {
+-        response = (char *)file_read_line_alloc(stdin);
+-     } while (response == NULL);
++     if (isatty(fileno(stdin)))
++     {
++        printf("%s",question);
++        fflush(stdout);
++        do {
++             response = (char *)file_read_line_alloc(stdin);
++        } while (response == NULL);
++     }
+      return response;
+ }
+
+--- trunk.orig/libopkg/user.c
++++ trunk/libopkg/user.c
+@@ -44,9 +44,13 @@ char *get_user_response(const char *form
+         len = vsnprintf(question,question_len,format,ap);
+           va_end(ap);
+      } while (len > question_len);
+-     response = strdup(opkg_cb_response(question));
+-     str_chomp(response);
+-     str_tolower(response);
++
++     response = opkg_cb_response(question);
++     if (response)
++     {
++         str_chomp(response);
++         str_tolower(response);
++     }
+
+      return response;
+ }
+--- trunk.orig/libopkg/opkg_install.c
++++ trunk/libopkg/opkg_install.c
+@@ -1613,6 +1613,9 @@ static int user_prefers_old_conffile(con
+                                      "          D     : show the differences between the versions (if diff is installed)\n"
+                                      "     The default action is to keep your current version.\n"
+                                      "    *** %s (Y/I/N/O/D) [default=N] ? ", file_name, short_file_name);
++        if (!response)
++             return 1;
++
+         if (strcmp(response, "y") == 0
+             || strcmp(response, "i") == 0
+             || strcmp(response, "yes") == 0) {

recipes/opkg/files/opkg-intercept-cleanup.patch new file +47 -0

new file mode 100644
index 0000000..12893e3
@@ -0,0 +1,47 @@
+---
+ libopkg/opkg_cmd.c |   13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+--- trunk.orig/libopkg/opkg_cmd.c
++++ trunk/libopkg/opkg_cmd.c
+@@ -19,6 +19,7 @@
+ #include "includes.h"
+ #include <dirent.h>
+ #include <glob.h>
++#include <unistd.h>
+
+ #include "opkg_conf.h"
+ #include "opkg_cmd.h"
+@@ -350,7 +351,6 @@ static opkg_intercept_t opkg_prep_interc
+
+ static int opkg_finalize_intercepts(opkg_intercept_t ctx)
+ {
+-    char *cmd;
+     DIR *dir;
+     int err = 0;
+
+@@ -376,6 +376,10 @@ static int opkg_finalize_intercepts(opkg
+                   err = errno;
+                   perror (de->d_name);
+               }
++              if (unlink (path)) {
++                  err = errno;
++                  perror (path);
++              }
+           }
+           free (path);
+       }
+@@ -383,9 +387,10 @@ static int opkg_finalize_intercepts(opkg
+     } else
+       perror (ctx->statedir);
+
+-    sprintf_alloc (&cmd, "rm -rf %s", ctx->statedir);
+-    err = system (cmd);
+-    free (cmd);
++    if (rmdir (ctx->statedir)) {
++      err = errno;
++      perror (ctx->statedir);
++    }
+
+     free (ctx->statedir);
+     free (ctx);

recipes/opkg/files/opkg-libdir.patch deleted +0 -11

deleted file mode 100644
index 1d48b9a..0000000
@@ -1,11 +0,0 @@
---- trunk/utils/update-alternatives.orig       2009-06-23 15:33:56.000000000 -0300
-+++ trunk/utils/update-alternatives    2009-06-23 15:34:10.000000000 -0300
-@@ -21,7 +21,7 @@
- set -e
-
- # admin dir
--ad="$OPKG_OFFLINE_ROOT/usr/lib/opkg/alternatives"
-+ad="$OPKG_OFFLINE_ROOT/${libdir}/opkg/alternatives"
-
- usage() {
-       echo "update-alternatives: $*

recipes/opkg/opkg-native_svn.bb +0 -0

index fe3ed4e..33d84ff 100644
@@ -1,19 +1,10 @@

 require opkg.inc

-DEPENDS = "curl-native openssl-native"
 PR = "${INC_PR}"
 PROVIDES =+ "virtual/update-alternatives-native"

recipes/opkg/opkg-native_svn.bb +0 -2

-SRC_URI += "file://opkg-libdir.patch;maxrev=342"
-

 target_libdir := "${libdir}"

 inherit native

recipes/opkg/opkg-native_svn.bb +1 -7

-# The nogpg version isn't getting much love and has an unused variable which trips up -Werror
-do_configure_prepend() {
-        sed -i -e s:-Werror::g ${S}/libopkg/Makefile.am
-}
-
-
-EXTRA_OECONF += "--with-opkglibdir=${target_libdir} --disable-gpg"
+EXTRA_OECONF += "--with-opkglibdir=${target_libdir}"

recipes/opkg/opkg-nogpg-nocurl-slugos_svn.bb +8 -3

index 4d49dff..cda5115 100644
@@ -2,7 +2,7 @@
  # recipe, intended for temporary use by the SlugOS distro.
 
  # DO NOT USE this recipe for anything other than SlugOS and svn version 160
-# of the opkg sources.  Also note that This recipe will be removed without
+# of the opkg sources.  Also note that this recipe will be removed without
  # notice when the unfortunate commits to the original opkg-nogpg-nocurl_svn.bb
  # recipe are repaired, the small-memory patches updated to a newer opkg svn
  # version, and appropriate testing confirms that the resulting binary actually

@@ -10,12 +10,23 @@
 
  # DO NOT CHANGE THIS RECIPE!
 
-require opkg.inc
+DESCRIPTION = "Opkg Package Manager"
+DESCRIPTION_libopkg = "Opkg Package Manager Library"
+SECTION = "base"
+LICENSE = "GPLv2"
+SRCREV = "160"
+PV = "0.1.6+svnr${SRCPV}"
+PR = "r22"
 
-DEPENDS = ""

 PROVIDES += "opkg"

recipes/opkg/opkg-nogpg-nocurl-slugos_svn.bb +3 -0

+S = "${WORKDIR}/trunk"
+
+inherit autotools pkgconfig

 SRC_URI += " \
+           svn://opkg.googlecode.com/svn;module=trunk;proto=http \
+           file://opkg_unarchive.patch;maxrev=201 \
+           file://opkg-intercept-cleanup.patch;maxrev=241 \
           file://isatty.patch \
           file://opkg_wget.patch;maxrev=180 \
           file://reduce-nogpg-noise.patch;maxrev=180 \

recipes/opkg/opkg-nogpg-nocurl-slugos_svn.bb +1 -0

@@ -23,11 +34,16 @@ SRC_URI += " \
            file://opkg_wget_nogpg_02_use_vfork_system.patch \
            file://opkg_wget_nogpg_03_fix_tmpdirs.patch \
            file://opkg_wget_nogpg_04_default_tmpdir.patch \
+           file://configure \

          "
-PR = "${INC_PR}"

 EXTRA_OECONF += "--disable-gpg --enable-static --disable-shared"

recipes/opkg/opkg-nogpg-nocurl-slugos_svn.bb +5 -0

+do_install_prepend() {
+  install -d ${D}${sysconfdir}/rcS.d
+  install -m 0755 ${WORKDIR}/configure ${D}${sysconfdir}/rcS.d/S98configure
+}
+

 # Not sure this is needed; needs to be investigated and removed if not do_stage() {
       autotools_stage_all

recipes/opkg/opkg-nogpg-nocurl-slugos_svn.bb +0 -0

@@ -44,11 +60,6 @@ FILES_libopkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
  # not happens automatically for opkg-nogpg:

 FILES_${PN} += "${datadir}/opkg/intercept"

recipes/opkg/opkg-nogpg-nocurl-slugos_svn.bb +0 -5

-# Define a variable to allow distros to run configure earlier.
-# (for example, to enable loading of ethernet kernel modules before networking starts)
-OPKG_INIT_POSITION = "98"
-OPKG_INIT_POSITION_slugos = "41"
-

 pkg_postinst_${PN} () {
  update-alternatives --install ${bindir}/opkg opkg ${bindir}/opkg-cl 100 }

recipes/opkg/opkg-nogpg-nocurl_svn.bb deleted +0 -15

deleted file mode 100644
index 66e8dbc..0000000
@@ -1,15 +0,0 @@
-require opkg-nogpg_svn.bb
-
-DEPENDS = ""
-PROVIDES += "opkg"
-
-PR = "${INC_PR}"
-
-EXTRA_OECONF += " --disable-curl --enable-static --disable-shared"
-
-# The nogpg version isn't getting much love and has an unused variable which trips up -Werror
-do_configure_prepend() {
-       sed -i -e s:-Werror::g ${S}/libopkg/Makefile.am
-}
-
-DEFAULT_PREFERENCE = "-1"

recipes/opkg/opkg-nogpg_svn.bb deleted +0 -25

deleted file mode 100644
index bee639f..0000000
@@ -1,25 +0,0 @@
-require opkg_svn.bb
-
-DEPENDS = "curl"
-PROVIDES += "opkg"
-
-PR = "${INC_PR}.1"
-
-EXTRA_OECONF += " --disable-gpg \
-                  --disable-openssl \
-                  --disable-ssl-curl \
-                  --enable-gpg=no \
-                  --enable-ssl-curl=no \
-                  --enable-openssl=no"
-
-LDFLAGS_append = " -Wl,--as-needed"
-
-# The nogpg version isn't getting much love and has an unused variable which trips up -Werror
-do_configure_prepend() {
-       sed -i -e s:-Werror::g ${S}/libopkg/Makefile.am
-}
-do_configure_prepend_nylon() {
-       LDFLAGS="`echo "$LDFLAGS" | sed "s/ -Wl,--as-needed//"`"
-}
-
-DEFAULT_PREFERENCE = "-1"

recipes/opkg/opkg-sdk_svn.bb +0 -0

index f7f9c9e..5970f8e 100644
@@ -5,4 +5,4 @@ PR = "${INC_PR}"

 target_libdir := "${libdir}"
 inherit sdk

recipes/opkg/opkg-sdk_svn.bb +1 -1

-EXTRA_OECONF += "--with-opkglibdir=${target_libdir} --disable-gpg"
+EXTRA_OECONF += "--with-opkglibdir=${target_libdir}"

recipes/opkg/opkg.inc +0 -0

index 1149b72..b88ae4b 100644
@@ -2,20 +2,14 @@ DESCRIPTION = "Opkg Package Manager"

 DESCRIPTION_libopkg = "Opkg Package Manager Library" SECTION = "base"
 LICENSE = "GPLv2"
-DEPENDS = "curl gpgme openssl"
 SRCREV = ${OPKG_SRCREV}

recipes/opkg/opkg.inc +2 -4

-PV = "0.1.6+svnr${SRCPV}"
-INC_PR = "r21"
-
-FILESPATHPKG =. "opkg:"
+PV = "0.1.8+svnr${SRCPV}"
+INC_PR = "r0"

 SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \
-       file://opkg_unarchive.patch;maxrev=201 \
-       file://opkg-intercept-cleanup.patch;maxrev=241 \
+          file://configure \
 "

recipes/opkg/opkg.inc +0 -2

-SRC_URI += "file://configure"
-

 S = "${WORKDIR}/trunk"

 inherit autotools pkgconfig

recipes/opkg/opkg.inc +0 -0

@@ -25,3 +19,7 @@ do_install_prepend() {

  install -m 0755 ${WORKDIR}/configure ${D}${sysconfdir}/rcS.d/S98configure }

recipes/opkg/opkg.inc +4 -0

+EXTRA_OECONF += " --disable-gpg \
+                  --disable-openssl \
+                  --disable-ssl-curl \
+                  --disable-curl"

recipes/opkg/opkg/isatty.patch deleted +0 -64

deleted file mode 100644
index c935f15..0000000
@@ -1,64 +0,0 @@
-Copyright (c) 2009 MontaVista Software, Inc.  All rights reserved.
-
-Don't prompt for user input from stdin if it's not a tty.  Fixes a minor
-memory leak while we're at it, as the code was strdup'ing the malloc'd string
-read from stdin without ever freeing the original.
----
- libopkg/libopkg.c      |   13 ++++++++-----
- libopkg/opkg_install.c |    3 +++
- libopkg/user.c         |   10 +++++++---
- 3 files changed, 18 insertions(+), 8 deletions(-)
-
---- trunk.orig/libopkg/libopkg.c
-+++ trunk/libopkg/libopkg.c
-@@ -71,11 +71,14 @@ int default_opkg_status_callback(char *n
- char* default_opkg_response_callback(char *question)
- {
-      char *response = NULL;
--     printf("%s",question);
--     fflush(stdout);
--     do {
--        response = (char *)file_read_line_alloc(stdin);
--     } while (response == NULL);
-+     if (isatty(fileno(stdin)))
-+     {
-+        printf("%s",question);
-+        fflush(stdout);
-+        do {
-+             response = (char *)file_read_line_alloc(stdin);
-+        } while (response == NULL);
-+     }
-      return response;
- }
-
---- trunk.orig/libopkg/user.c
-+++ trunk/libopkg/user.c
-@@ -44,9 +44,13 @@ char *get_user_response(const char *form
-         len = vsnprintf(question,question_len,format,ap);
-           va_end(ap);
-      } while (len > question_len);
--     response = strdup(opkg_cb_response(question));
--     str_chomp(response);
--     str_tolower(response);
-+
-+     response = opkg_cb_response(question);
-+     if (response)
-+     {
-+         str_chomp(response);
-+         str_tolower(response);
-+     }
-
-      return response;
- }
---- trunk.orig/libopkg/opkg_install.c
-+++ trunk/libopkg/opkg_install.c
-@@ -1613,6 +1613,9 @@ static int user_prefers_old_conffile(con
-                                      "          D     : show the differences between the versions (if diff is installed)\n"
-                                      "     The default action is to keep your current version.\n"
-                                      "    *** %s (Y/I/N/O/D) [default=N] ? ", file_name, short_file_name);
-+        if (!response)
-+             return 1;
-+
-         if (strcmp(response, "y") == 0
-             || strcmp(response, "i") == 0
-             || strcmp(response, "yes") == 0) {

recipes/opkg/opkg/opkg-intercept-cleanup.patch deleted +0 -47

deleted file mode 100644
index 12893e3..0000000
@@ -1,47 +0,0 @@
----
- libopkg/opkg_cmd.c |   13 +++++++++----
- 1 file changed, 9 insertions(+), 4 deletions(-)
-
---- trunk.orig/libopkg/opkg_cmd.c
-+++ trunk/libopkg/opkg_cmd.c
-@@ -19,6 +19,7 @@
- #include "includes.h"
- #include <dirent.h>
- #include <glob.h>
-+#include <unistd.h>
-
- #include "opkg_conf.h"
- #include "opkg_cmd.h"
-@@ -350,7 +351,6 @@ static opkg_intercept_t opkg_prep_interc
-
- static int opkg_finalize_intercepts(opkg_intercept_t ctx)
- {
--    char *cmd;
-     DIR *dir;
-     int err = 0;
-
-@@ -376,6 +376,10 @@ static int opkg_finalize_intercepts(opkg
-                   err = errno;
-                   perror (de->d_name);
-               }
-+              if (unlink (path)) {
-+                  err = errno;
-+                  perror (path);
-+              }
-           }
-           free (path);
-       }
-@@ -383,9 +387,10 @@ static int opkg_finalize_intercepts(opkg
-     } else
-       perror (ctx->statedir);
-
--    sprintf_alloc (&cmd, "rm -rf %s", ctx->statedir);
--    err = system (cmd);
--    free (cmd);
-+    if (rmdir (ctx->statedir)) {
-+      err = errno;
-+      perror (ctx->statedir);
-+    }
-
-     free (ctx->statedir);
-     free (ctx);

recipes/opkg/opkg_svn.bb +0 -0

index 5138458..b193d7c 100644
@@ -8,14 +8,8 @@ PACKAGES =+ "libopkg-dev libopkg"
 

 FILES_libopkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so" FILES_libopkg = "${libdir}/*.so.*"
-# not happens automatically for opkg-nogpg:
 FILES_${PN} += "${datadir}/opkg/intercept"

recipes/opkg/opkg_svn.bb +0 -5

-# Define a variable to allow distros to run configure earlier.
-# (for example, to enable loading of ethernet kernel modules before networking starts)
-OPKG_INIT_POSITION = "98"
-OPKG_INIT_POSITION_slugos = "41"
-

 pkg_postinst_${PN} () {
  update-alternatives --install ${bindir}/opkg opkg ${bindir}/opkg-cl 100 }

recipes/tasks/task-arago-toolchain-target.bb +1 -1

index e22ac2b..8f85a89 100644
@@ -30,6 +30,6 @@ RDEPENDS_${PN} = "\
     zlib-dev \
     mtd-utils-dev \
     ncurses-dev \
-    opkg-nogpg-dev \
+    opkg-dev \
     sysvinit-dev \

    "

recipes/tasks/task-sdk-sbox.bb +1 -1

index bf75402..25829cc 100644
@@ -8,6 +8,6 @@ RDEPENDS_${PN} = "\
     gdb \
     sbrsh \
     fakeroot \
-    opkg-nogpg \
+    opkg \
     opkg-utils \

    "
--
1.7.1

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

None of the distros in OE

appear to want/need gpg or curl support in opkg; so have opkg.inc remove them by default.

Quoted 1 line · Graham Gower

None of the distros in OE

At least the openmoko SHR distribution fetches ipkg from network and requires curl support hence.

Quoted 2 lines

appear to want/need gpg or curl support in opkg; so have opkg.inc remove them by default.

I do not think that supporting only offline mode (due to removal of curl support) is a good idea. Although the opportunistic signature verification is not secure, it would be imo bad to remove gpg support completely because updating embedded devices in a secure manner is important.

A better way might be to conditionalize your '--disable-*' options resp. make them depend on some DISTRO_FEATURE.

Quoted 2 lines

A better way might be to conditionalize your '--disable-*' options resp. make them depend on some DISTRO_FEATURE.

Introducing USE flags would be a step backwards, so NAK on that.

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 5 lines · Enrico Scholz

Quoted 1 line · Graham Gower

None of the distros in OE

At least the openmoko SHR distribution fetches ipkg from network and requires curl support hence.

That's not true, with curl disabled, it calls (busybox) wget.

Quoted 8 lines

Quoted 2 lines

appear to want/need gpg or curl support in opkg; so have opkg.inc remove them by default.

I do not think that supporting only offline mode (due to removal of curl support) is a good idea. Although the opportunistic signature verification is not secure, it would be imo bad to remove gpg support completely because updating embedded devices in a secure manner is important.

Quoted 2 lines

A better way might be to conditionalize your '--disable-*' options resp. make them depend on some DISTRO_FEATURE.

Introducing USE flags would be a step backwards, so NAK on that.

Quoted 4 lines · Koen Kooi

Quoted 2 lines

A better way might be to conditionalize your '--disable-*' options resp. make them depend on some DISTRO_FEATURE.

Introducing USE flags would be a step backwards, so NAK on that.

how would you reenable gpg and curl for https support then?

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 6 lines · Enrico Scholz

Quoted 4 lines · Koen Kooi

Quoted 2 lines

A better way might be to conditionalize your '--disable-*' options resp. make them depend on some DISTRO_FEATURE.

Introducing USE flags would be a step backwards, so NAK on that.

Quoted 2 lines

how would you reenable gpg and curl for https support then?

By keeping the existing recipes?

Quoted 10 lines · Koen Kooi

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 6 lines · Enrico Scholz

Quoted 4 lines · Koen Kooi

Quoted 2 lines

A better way might be to conditionalize your '--disable-*' options resp. make them depend on some DISTRO_FEATURE.

Introducing USE flags would be a step backwards, so NAK on that.

I don't like the idea of USE flags either. Every time you see one you would have to grep -r your tree to find out its impact.

Quoted 3 lines

Quoted 2 lines

how would you reenable gpg and curl for https support then?

Quoted 1 line

By keeping the existing recipes?

Or, by extending the defautl opkg_svn.bb recipe I have left behind.

e.g. an opkg-fullyloaded.bb containing
include opkg_svn.bb
EXTRA_CFLAGS=""

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.
---

v2:
 A stray missing double quote makes the last patch a no go.

---
 conf/compatibility-providers.conf                 |    1 - conf/distro/angstrom-2008.1.conf                  |    8 +- conf/distro/include/preferred-slugos-versions.inc |   10 --- conf/distro/jlime-2010.1.conf                     |    2 +- conf/distro/kaeilos-2010.conf                     |   10 ++-- conf/distro/kaeilos.conf                          |   10 ++-- conf/distro/micro.conf                            |    2 +- conf/distro/minimal.conf                          |    8 +- conf/distro/nylon.conf                            |    2 +- recipes/angstrom/angstrom-feed-configs.bb         |    2 +- recipes/images/minimal-gpe-image.bb               |    2 +- recipes/images/nas-server-image.bb                |    2 +- recipes/images/x11-sato-image.bb                  |    2 +- recipes/meta/meta-toolchain-arago.bb              |    2 +- recipes/opkg/files/fix_endianness.patch           |   12 ---- recipes/opkg/files/isatty.patch                   |   64 +++++++++++++++++++++ recipes/opkg/files/opkg-intercept-cleanup.patch   |   47 +++++++++++++++ recipes/opkg/files/opkg-libdir.patch              |   11 ---- recipes/opkg/opkg-native_svn.bb                   |   11 +--- recipes/opkg/opkg-nogpg-nocurl-slugos_svn.bb      |   29 +++++++--- recipes/opkg/opkg-nogpg-nocurl_svn.bb             |   15 ----- recipes/opkg/opkg-nogpg_svn.bb                    |   25 -------- recipes/opkg/opkg-sdk_svn.bb                      |    2 +- recipes/opkg/opkg.inc                             |   16 ++--- recipes/opkg/opkg/isatty.patch                    |   64 --------------------- recipes/opkg/opkg/opkg-intercept-cleanup.patch    |   47 --------------- recipes/opkg/opkg_svn.bb                          |    6 -- recipes/tasks/task-arago-toolchain-target.bb      |    2 +- recipes/tasks/task-sdk-sbox.bb                    |    2 +-

 29 files changed, 168 insertions(+), 248 deletions(-)

 delete mode 100644 recipes/opkg/files/fix_endianness.patch create mode 100644 recipes/opkg/files/isatty.patch create mode 100644 recipes/opkg/files/opkg-intercept-cleanup.patch delete mode 100644 recipes/opkg/files/opkg-libdir.patch delete mode 100644 recipes/opkg/opkg-nogpg-nocurl_svn.bb delete mode 100644 recipes/opkg/opkg-nogpg_svn.bb delete mode 100644 recipes/opkg/opkg/isatty.patch delete mode 100644 recipes/opkg/opkg/opkg-intercept-cleanup.patch

conf/compatibility-providers.conf +0 -0

index 350521a..58a0ad1 100644
@@ -46,7 +46,6 @@ PREFERRED_PROVIDER_libxss ?= "libxss"

 PREFERRED_PROVIDER_ntp ?= "ntp" PREFERRED_PROVIDER_openmoko-alsa-scenarios ?= "fsodeviced" PREFERRED_PROVIDER_opkg ?= "opkg" -#PREFERRED_PROVIDER_opkg ?= "opkg-nogpg" PREFERRED_PROVIDER_qemu-native ?= "qemu-native" PREFERRED_PROVIDER_qt4-embedded ?= "qt4-embedded" PREFERRED_PROVIDER_qt4-x11-free ?= "qt4-x11-free"

conf/distro/angstrom-2008.1.conf +0 -0

index 7c70c84..e86ced3 100644
@@ -139,7 +139,7 @@ require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc
 

 PREFERRED_PROVIDER_dbus-glib             = "dbus-glib" PREFERRED_PROVIDER_hotplug               = "udev"

conf/distro/angstrom-2008.1.conf +1 -1

-PREFERRED_PROVIDER_opkg                 ?= "opkg-nogpg-nocurl"
+PREFERRED_PROVIDER_opkg                 ?= "opkg"

 ANGSTROM_BLACKLIST_pn-bluez-libs       = "bluez-libs 3.x has been replaced by bluez4" ANGSTROM_BLACKLIST_pn-bluez-utils      = "bluez-utils 3.x has been replaced by bluez4"

conf/distro/angstrom-2008.1.conf +0 -0

@@ -151,12 +151,12 @@ require conf/distro/include/angstrom.inc
  # Set DISTRO_FEED_CONFIGS to our config var, assigned in the above .inc

 DISTRO_FEED_CONFIGS = "${ANGSTROM_FEED_CONFIGS}"

conf/distro/angstrom-2008.1.conf +1 -1

-# 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

conf/distro/angstrom-2008.1.conf +1 -1

-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

conf/distro/angstrom-2008.1.conf +1 -1

-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"

conf/distro/include/preferred-slugos-versions.inc +0 -10

index 84b1381..a8909d0 100644
@@ -15,16 +15,6 @@ PREFERRED_VERSION_linux-ixp4xx = "2.6.27.8+svnr${SRCREV_pn-linux-ixp4xx}"
  #
  #===============================================================================#
  #===============================================================================#
-#                              NOTE NOTE NOTE
-#
-# Override the sane-srcrev file with regard to the opkg versions - this should
-# be removed as soon as opkg starts to work correctly again as newer opkg
-# versions fix a number of bugs and add some desireable features.
-#
-OPKG_SRCREV = "160"
-#
-#===============================================================================#
-#===============================================================================#
 
  ### Standard package preferred versions go here, sorted
  ### alphabetically.  Note that the main slugos.inc file

conf/distro/jlime-2010.1.conf +0 -0

index 3ec3e86..f62ca99 100644
@@ -40,7 +40,7 @@ SPLASH = "psplash"

 INHERIT += "debian package_tar package_ipk src_distribute_local" SRC_DIST_LOCAL ?= "symlink"
 IMAGE_FSTYPES = "tar.gz tar.bz2 jffs2"

conf/distro/jlime-2010.1.conf +1 -1

-PREFERRED_PROVIDER_virtual/update-alternatives = "opkg-nogpg-nocurl"
+PREFERRED_PROVIDER_virtual/update-alternatives = "opkg"

 #
 # Kernel

conf/distro/kaeilos-2010.conf +0 -0

index 4bb637c..58d7a57 100644
@@ -64,7 +64,7 @@ require conf/distro/include/kaeilos-2010.inc
  # Select packaging system

 IMAGE_FSTYPES ?= "tar.gz jffs2"
 PREFERRED_PKG_FORMAT = "ipk"

conf/distro/kaeilos-2010.conf +1 -1

-IPKG_VARIANT = "opkg-nogpg"
+IPKG_VARIANT = "opkg"

@@ -99,11 +99,11 @@ require conf/distro/include/sane-toolchain.inc
 

 PREFERRED_PROVIDER_dbus-glib             = "dbus-glib" PREFERRED_PROVIDER_hotplug               = "udev"

conf/distro/kaeilos-2010.conf +1 -1

-PREFERRED_PROVIDER_opkg                 ?= "opkg-nogpg-nocurl"
+PREFERRED_PROVIDER_opkg                 ?= "opkg"

 # PREFERRED VERSIONS

conf/distro/kaeilos-2010.conf +2 -2

-PREFERRED_PROVIDER_opkg ?= "opkg-nogpg"
-PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg-nogpg"
+PREFERRED_PROVIDER_opkg ?= "opkg"
+PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg"

 # Select xserver-xorg as default, since kdrive has been EOL'ed

conf/distro/kaeilos-2010.conf +1 -1

@@ -128,7 +128,7 @@ DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace procps"
  DISTRO_EXTRA_RDEPENDS += "\
     update-modules \
     kaeilos-version \
-    opkg-nogpg opkg-collateral \
+    opkg opkg-collateral \
     util-linux-ng-mount util-linux-ng-umount \
     ${DEBUG_APPS} \

    "

conf/distro/kaeilos.conf +0 -0

index eb12d2e..c1c2e36 100644
@@ -127,7 +127,7 @@ require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc
 

 PREFERRED_PROVIDER_dbus-glib             = "dbus-glib" PREFERRED_PROVIDER_hotplug               = "udev"

conf/distro/kaeilos.conf +1 -1

-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"

conf/distro/kaeilos.conf +0 -0

@@ -137,12 +137,12 @@ ANGSTROM_BLACKLIST_pn-fso-apm       = "regular apmd is good enough"
 

 require conf/distro/include/kaeilos.inc

conf/distro/kaeilos.conf +1 -1

-# 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

conf/distro/kaeilos.conf +1 -1

-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

conf/distro/kaeilos.conf +1 -1

-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"

conf/distro/kaeilos.conf +1 -1

@@ -167,7 +167,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 \

    "

conf/distro/micro.conf +0 -0

index 9885425..5c58ce2 100644
@@ -32,7 +32,7 @@ INHERIT += "debian"
  #############################################################################
  # Select packaging system

 PREFERRED_PKG_FORMAT = "ipk"

conf/distro/micro.conf +1 -1

-IPKG_VARIANT = "opkg-nogpg"
+IPKG_VARIANT = "opkg"

 require conf/distro/include/sane-feed.inc
 require conf/distro/include/sane-feed-${PREFERRED_PKG_FORMAT}.inc

conf/distro/minimal.conf +0 -0

index 1e72efd..1fa3c5e 100644
@@ -58,8 +58,8 @@ PREFERRED_PKG_FORMAT ?= "ipk"

 INHERIT += "src_distribute_local"
 SRC_DIST_LOCAL ?= "symlink"

conf/distro/minimal.conf +2 -2

-# If we're using an .ipk based rootfs, we want to have opkg-nogpg installed so postinst script can run
-IPKG_VARIANT = "opkg-nogpg"
+# If we're using an .ipk based rootfs, we want to have opkg installed so postinst script can run
+IPKG_VARIANT = "opkg"

 #############################################################################
 # IMAGES

conf/distro/minimal.conf +0 -0

@@ -101,8 +101,8 @@ require conf/distro/include/preferred-e-versions.inc

 require conf/distro/include/preferred-opie-versions-1.2.4.inc require conf/distro/include/preferred-xorg-versions-X11R7.5.inc

conf/distro/minimal.conf +2 -2

-PREFERRED_PROVIDER_opkg ?= "opkg-nogpg"
-PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg-nogpg"
+PREFERRED_PROVIDER_opkg ?= "opkg"
+PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg"

 #############################################################################
 # CONTENTS

conf/distro/nylon.conf +0 -0

index 7ab7b35..ae8d064 100644
@@ -86,4 +86,4 @@ PREFERRED_VERSION_e2fsprogs-libs = "1.41.8"

 PREFERRED_VERSION_dbus = "1.2.1"

 PREFERRED_PROVIDER_hotplug = "linux-hotplug"

conf/distro/nylon.conf +1 -1

-PREFERRED_PROVIDER_opkg = "opkg-nogpg"
+PREFERRED_PROVIDER_opkg = "opkg"

recipes/angstrom/angstrom-feed-configs.bb +0 -0

index d25cba7..cad2b8b 100644
@@ -1,6 +1,6 @@

 DESCRIPTION = "Configuration files for online package repositories aka feeds"

recipes/angstrom/angstrom-feed-configs.bb +1 -1

-RRECOMMENDS_${PN} += "opkg-nogpg-nocurl"
+RRECOMMENDS_${PN} += "opkg"

 #PV = "${DISTRO_VERSION}"
 PR = "r11"

recipes/images/minimal-gpe-image.bb +1 -1

index c37225d..0c5c863 100644
@@ -17,7 +17,7 @@ IMAGE_INSTALL = "\
     matchbox-wm \
     gpe-terminal \
     angstrom-feed-configs \
-    opkg-nogpg opkg-collateral \
+    opkg opkg-collateral \
     ${SPLASH} \

    "

recipes/images/nas-server-image.bb +0 -0

index 85b2bae..61e8296 100644
@@ -20,7 +20,7 @@
  # intended to be distro-agnostic.
 

 DISTRO_SSH_DAEMON ?= "dropbear"

recipes/images/nas-server-image.bb +1 -1

-DISTRO_PACKAGE_MANAGER ?= "opkg-nogpg opkg-collateral"
+DISTRO_PACKAGE_MANAGER ?= "opkg opkg-collateral"

 DEPENDS = "\
       task-boot \

recipes/images/x11-sato-image.bb +0 -0

index 0a127f8..c2ed50e 100644
@@ -1,5 +1,5 @@

 DISTRO_SSH_DAEMON ?= "dropbear"

recipes/images/x11-sato-image.bb +1 -1

-DISTRO_PACKAGE_MANAGER ?= "opkg-nogpg opkg-collateral"
+DISTRO_PACKAGE_MANAGER ?= "opkg opkg-collateral"

 XSERVER ?= "xserver-kdrive-fbdev"

recipes/meta/meta-toolchain-arago.bb +1 -1

index 0478e97..425af6d 100644
@@ -15,7 +15,7 @@ TOOLCHAIN_TARGET_EXCLUDE += "\
     libthread-db1 \
     sln \
     curl \
-    opkg-nogpg \
+    opkg \
     alsa-conf-base \
     update-rc.d \
     update-rc.d-dev \

recipes/opkg/files/fix_endianness.patch deleted +0 -12

deleted file mode 100644
index 8632ce5..0000000
@@ -1,12 +0,0 @@
-diff -urN opkg.orig/configure.ac opkg/configure.ac
---- opkg.orig/configure.ac     2008-03-20 13:29:09.000000000 +0100
-+++ opkg/configure.ac  2008-03-25 09:39:52.000000000 +0100
-@@ -94,7 +94,7 @@
- AC_CHECK_MEMBERS([struct stat.st_rdev])
-
- # Checks endianness
--AC_C_BIGENDIAN(ENDIAN_CFLAGS="-DWORDS_BIGENDIAN=1",)
-+AC_C_BIGENDIAN(BIGENDIAN_CFLAGS="-DWORDS_BIGENDIAN=1",)
- AC_SUBST(BIGENDIAN_CFLAGS)
-
- # Don't do annoying tests that don't work when cross-compiling, just trust them.

recipes/opkg/files/isatty.patch new file +64 -0

new file mode 100644
index 0000000..c935f15
@@ -0,0 +1,64 @@
+Copyright (c) 2009 MontaVista Software, Inc.  All rights reserved.
+
+Don't prompt for user input from stdin if it's not a tty.  Fixes a minor
+memory leak while we're at it, as the code was strdup'ing the malloc'd string
+read from stdin without ever freeing the original.
+---
+ libopkg/libopkg.c      |   13 ++++++++-----
+ libopkg/opkg_install.c |    3 +++
+ libopkg/user.c         |   10 +++++++---
+ 3 files changed, 18 insertions(+), 8 deletions(-)
+
+--- trunk.orig/libopkg/libopkg.c
++++ trunk/libopkg/libopkg.c
+@@ -71,11 +71,14 @@ int default_opkg_status_callback(char *n
+ char* default_opkg_response_callback(char *question)
+ {
+      char *response = NULL;
+-     printf("%s",question);
+-     fflush(stdout);
+-     do {
+-        response = (char *)file_read_line_alloc(stdin);
+-     } while (response == NULL);
++     if (isatty(fileno(stdin)))
++     {
++        printf("%s",question);
++        fflush(stdout);
++        do {
++             response = (char *)file_read_line_alloc(stdin);
++        } while (response == NULL);
++     }
+      return response;
+ }
+
+--- trunk.orig/libopkg/user.c
++++ trunk/libopkg/user.c
+@@ -44,9 +44,13 @@ char *get_user_response(const char *form
+         len = vsnprintf(question,question_len,format,ap);
+           va_end(ap);
+      } while (len > question_len);
+-     response = strdup(opkg_cb_response(question));
+-     str_chomp(response);
+-     str_tolower(response);
++
++     response = opkg_cb_response(question);
++     if (response)
++     {
++         str_chomp(response);
++         str_tolower(response);
++     }
+
+      return response;
+ }
+--- trunk.orig/libopkg/opkg_install.c
++++ trunk/libopkg/opkg_install.c
+@@ -1613,6 +1613,9 @@ static int user_prefers_old_conffile(con
+                                      "          D     : show the differences between the versions (if diff is installed)\n"
+                                      "     The default action is to keep your current version.\n"
+                                      "    *** %s (Y/I/N/O/D) [default=N] ? ", file_name, short_file_name);
++        if (!response)
++             return 1;
++
+         if (strcmp(response, "y") == 0
+             || strcmp(response, "i") == 0
+             || strcmp(response, "yes") == 0) {

recipes/opkg/files/opkg-intercept-cleanup.patch new file +47 -0

new file mode 100644
index 0000000..12893e3
@@ -0,0 +1,47 @@
+---
+ libopkg/opkg_cmd.c |   13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+--- trunk.orig/libopkg/opkg_cmd.c
++++ trunk/libopkg/opkg_cmd.c
+@@ -19,6 +19,7 @@
+ #include "includes.h"
+ #include <dirent.h>
+ #include <glob.h>
++#include <unistd.h>
+
+ #include "opkg_conf.h"
+ #include "opkg_cmd.h"
+@@ -350,7 +351,6 @@ static opkg_intercept_t opkg_prep_interc
+
+ static int opkg_finalize_intercepts(opkg_intercept_t ctx)
+ {
+-    char *cmd;
+     DIR *dir;
+     int err = 0;
+
+@@ -376,6 +376,10 @@ static int opkg_finalize_intercepts(opkg
+                   err = errno;
+                   perror (de->d_name);
+               }
++              if (unlink (path)) {
++                  err = errno;
++                  perror (path);
++              }
+           }
+           free (path);
+       }
+@@ -383,9 +387,10 @@ static int opkg_finalize_intercepts(opkg
+     } else
+       perror (ctx->statedir);
+
+-    sprintf_alloc (&cmd, "rm -rf %s", ctx->statedir);
+-    err = system (cmd);
+-    free (cmd);
++    if (rmdir (ctx->statedir)) {
++      err = errno;
++      perror (ctx->statedir);
++    }
+
+     free (ctx->statedir);
+     free (ctx);

recipes/opkg/files/opkg-libdir.patch deleted +0 -11

deleted file mode 100644
index 1d48b9a..0000000
@@ -1,11 +0,0 @@
---- trunk/utils/update-alternatives.orig       2009-06-23 15:33:56.000000000 -0300
-+++ trunk/utils/update-alternatives    2009-06-23 15:34:10.000000000 -0300
-@@ -21,7 +21,7 @@
- set -e
-
- # admin dir
--ad="$OPKG_OFFLINE_ROOT/usr/lib/opkg/alternatives"
-+ad="$OPKG_OFFLINE_ROOT/${libdir}/opkg/alternatives"
-
- usage() {
-       echo "update-alternatives: $*

recipes/opkg/opkg-native_svn.bb +0 -0

index fe3ed4e..33d84ff 100644
@@ -1,19 +1,10 @@

 require opkg.inc

-DEPENDS = "curl-native openssl-native"
 PR = "${INC_PR}"
 PROVIDES =+ "virtual/update-alternatives-native"

recipes/opkg/opkg-native_svn.bb +0 -2

-SRC_URI += "file://opkg-libdir.patch;maxrev=342"
-

 target_libdir := "${libdir}"

 inherit native

recipes/opkg/opkg-native_svn.bb +1 -7

-# The nogpg version isn't getting much love and has an unused variable which trips up -Werror
-do_configure_prepend() {
-        sed -i -e s:-Werror::g ${S}/libopkg/Makefile.am
-}
-
-
-EXTRA_OECONF += "--with-opkglibdir=${target_libdir} --disable-gpg"
+EXTRA_OECONF += "--with-opkglibdir=${target_libdir}"

recipes/opkg/opkg-nogpg-nocurl-slugos_svn.bb +8 -3

index 4d49dff..cda5115 100644
@@ -2,7 +2,7 @@
  # recipe, intended for temporary use by the SlugOS distro.
 
  # DO NOT USE this recipe for anything other than SlugOS and svn version 160
-# of the opkg sources.  Also note that This recipe will be removed without
+# of the opkg sources.  Also note that this recipe will be removed without
  # notice when the unfortunate commits to the original opkg-nogpg-nocurl_svn.bb
  # recipe are repaired, the small-memory patches updated to a newer opkg svn
  # version, and appropriate testing confirms that the resulting binary actually

@@ -10,12 +10,23 @@
 
  # DO NOT CHANGE THIS RECIPE!
 
-require opkg.inc
+DESCRIPTION = "Opkg Package Manager"
+DESCRIPTION_libopkg = "Opkg Package Manager Library"
+SECTION = "base"
+LICENSE = "GPLv2"
+SRCREV = "160"
+PV = "0.1.6+svnr${SRCPV}"
+PR = "r22"
 
-DEPENDS = ""

 PROVIDES += "opkg"

recipes/opkg/opkg-nogpg-nocurl-slugos_svn.bb +3 -0

+S = "${WORKDIR}/trunk"
+
+inherit autotools pkgconfig

 SRC_URI += " \
+           svn://opkg.googlecode.com/svn;module=trunk;proto=http \
+           file://opkg_unarchive.patch;maxrev=201 \
+           file://opkg-intercept-cleanup.patch;maxrev=241 \
           file://isatty.patch \
           file://opkg_wget.patch;maxrev=180 \
           file://reduce-nogpg-noise.patch;maxrev=180 \

recipes/opkg/opkg-nogpg-nocurl-slugos_svn.bb +1 -0

@@ -23,11 +34,16 @@ SRC_URI += " \
            file://opkg_wget_nogpg_02_use_vfork_system.patch \
            file://opkg_wget_nogpg_03_fix_tmpdirs.patch \
            file://opkg_wget_nogpg_04_default_tmpdir.patch \
+           file://configure \

          "
-PR = "${INC_PR}"

 EXTRA_OECONF += "--disable-gpg --enable-static --disable-shared"

recipes/opkg/opkg-nogpg-nocurl-slugos_svn.bb +5 -0

+do_install_prepend() {
+  install -d ${D}${sysconfdir}/rcS.d
+  install -m 0755 ${WORKDIR}/configure ${D}${sysconfdir}/rcS.d/S98configure
+}
+

 # Not sure this is needed; needs to be investigated and removed if not do_stage() {
       autotools_stage_all

recipes/opkg/opkg-nogpg-nocurl-slugos_svn.bb +0 -0

@@ -44,11 +60,6 @@ FILES_libopkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
  # not happens automatically for opkg-nogpg:

 FILES_${PN} += "${datadir}/opkg/intercept"

recipes/opkg/opkg-nogpg-nocurl-slugos_svn.bb +0 -5

-# Define a variable to allow distros to run configure earlier.
-# (for example, to enable loading of ethernet kernel modules before networking starts)
-OPKG_INIT_POSITION = "98"
-OPKG_INIT_POSITION_slugos = "41"
-

 pkg_postinst_${PN} () {
  update-alternatives --install ${bindir}/opkg opkg ${bindir}/opkg-cl 100 }

recipes/opkg/opkg-nogpg-nocurl_svn.bb deleted +0 -15

deleted file mode 100644
index 66e8dbc..0000000
@@ -1,15 +0,0 @@
-require opkg-nogpg_svn.bb
-
-DEPENDS = ""
-PROVIDES += "opkg"
-
-PR = "${INC_PR}"
-
-EXTRA_OECONF += " --disable-curl --enable-static --disable-shared"
-
-# The nogpg version isn't getting much love and has an unused variable which trips up -Werror
-do_configure_prepend() {
-       sed -i -e s:-Werror::g ${S}/libopkg/Makefile.am
-}
-
-DEFAULT_PREFERENCE = "-1"

recipes/opkg/opkg-nogpg_svn.bb deleted +0 -25

deleted file mode 100644
index bee639f..0000000
@@ -1,25 +0,0 @@
-require opkg_svn.bb
-
-DEPENDS = "curl"
-PROVIDES += "opkg"
-
-PR = "${INC_PR}.1"
-
-EXTRA_OECONF += " --disable-gpg \
-                  --disable-openssl \
-                  --disable-ssl-curl \
-                  --enable-gpg=no \
-                  --enable-ssl-curl=no \
-                  --enable-openssl=no"
-
-LDFLAGS_append = " -Wl,--as-needed"
-
-# The nogpg version isn't getting much love and has an unused variable which trips up -Werror
-do_configure_prepend() {
-       sed -i -e s:-Werror::g ${S}/libopkg/Makefile.am
-}
-do_configure_prepend_nylon() {
-       LDFLAGS="`echo "$LDFLAGS" | sed "s/ -Wl,--as-needed//"`"
-}
-
-DEFAULT_PREFERENCE = "-1"

recipes/opkg/opkg-sdk_svn.bb +0 -0

index f7f9c9e..5970f8e 100644
@@ -5,4 +5,4 @@ PR = "${INC_PR}"

 target_libdir := "${libdir}"
 inherit sdk

recipes/opkg/opkg-sdk_svn.bb +1 -1

-EXTRA_OECONF += "--with-opkglibdir=${target_libdir} --disable-gpg"
+EXTRA_OECONF += "--with-opkglibdir=${target_libdir}"

recipes/opkg/opkg.inc +0 -0

index 1149b72..b88ae4b 100644
@@ -2,20 +2,14 @@ DESCRIPTION = "Opkg Package Manager"

 DESCRIPTION_libopkg = "Opkg Package Manager Library" SECTION = "base"
 LICENSE = "GPLv2"
-DEPENDS = "curl gpgme openssl"
 SRCREV = ${OPKG_SRCREV}

recipes/opkg/opkg.inc +2 -4

-PV = "0.1.6+svnr${SRCPV}"
-INC_PR = "r21"
-
-FILESPATHPKG =. "opkg:"
+PV = "0.1.8+svnr${SRCPV}"
+INC_PR = "r0"

 SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \
-       file://opkg_unarchive.patch;maxrev=201 \
-       file://opkg-intercept-cleanup.patch;maxrev=241 \
+          file://configure \
 "

recipes/opkg/opkg.inc +0 -2

-SRC_URI += "file://configure"
-

 S = "${WORKDIR}/trunk"

 inherit autotools pkgconfig

recipes/opkg/opkg.inc +0 -0

@@ -25,3 +19,7 @@ do_install_prepend() {

  install -m 0755 ${WORKDIR}/configure ${D}${sysconfdir}/rcS.d/S98configure }

recipes/opkg/opkg.inc +4 -0

+EXTRA_OECONF += " --disable-gpg \
+                  --disable-openssl \
+                  --disable-ssl-curl \
+                  --disable-curl"

recipes/opkg/opkg/isatty.patch deleted +0 -64

deleted file mode 100644
index c935f15..0000000
@@ -1,64 +0,0 @@
-Copyright (c) 2009 MontaVista Software, Inc.  All rights reserved.
-
-Don't prompt for user input from stdin if it's not a tty.  Fixes a minor
-memory leak while we're at it, as the code was strdup'ing the malloc'd string
-read from stdin without ever freeing the original.
----
- libopkg/libopkg.c      |   13 ++++++++-----
- libopkg/opkg_install.c |    3 +++
- libopkg/user.c         |   10 +++++++---
- 3 files changed, 18 insertions(+), 8 deletions(-)
-
---- trunk.orig/libopkg/libopkg.c
-+++ trunk/libopkg/libopkg.c
-@@ -71,11 +71,14 @@ int default_opkg_status_callback(char *n
- char* default_opkg_response_callback(char *question)
- {
-      char *response = NULL;
--     printf("%s",question);
--     fflush(stdout);
--     do {
--        response = (char *)file_read_line_alloc(stdin);
--     } while (response == NULL);
-+     if (isatty(fileno(stdin)))
-+     {
-+        printf("%s",question);
-+        fflush(stdout);
-+        do {
-+             response = (char *)file_read_line_alloc(stdin);
-+        } while (response == NULL);
-+     }
-      return response;
- }
-
---- trunk.orig/libopkg/user.c
-+++ trunk/libopkg/user.c
-@@ -44,9 +44,13 @@ char *get_user_response(const char *form
-         len = vsnprintf(question,question_len,format,ap);
-           va_end(ap);
-      } while (len > question_len);
--     response = strdup(opkg_cb_response(question));
--     str_chomp(response);
--     str_tolower(response);
-+
-+     response = opkg_cb_response(question);
-+     if (response)
-+     {
-+         str_chomp(response);
-+         str_tolower(response);
-+     }
-
-      return response;
- }
---- trunk.orig/libopkg/opkg_install.c
-+++ trunk/libopkg/opkg_install.c
-@@ -1613,6 +1613,9 @@ static int user_prefers_old_conffile(con
-                                      "          D     : show the differences between the versions (if diff is installed)\n"
-                                      "     The default action is to keep your current version.\n"
-                                      "    *** %s (Y/I/N/O/D) [default=N] ? ", file_name, short_file_name);
-+        if (!response)
-+             return 1;
-+
-         if (strcmp(response, "y") == 0
-             || strcmp(response, "i") == 0
-             || strcmp(response, "yes") == 0) {

recipes/opkg/opkg/opkg-intercept-cleanup.patch deleted +0 -47

deleted file mode 100644
index 12893e3..0000000
@@ -1,47 +0,0 @@
----
- libopkg/opkg_cmd.c |   13 +++++++++----
- 1 file changed, 9 insertions(+), 4 deletions(-)
-
---- trunk.orig/libopkg/opkg_cmd.c
-+++ trunk/libopkg/opkg_cmd.c
-@@ -19,6 +19,7 @@
- #include "includes.h"
- #include <dirent.h>
- #include <glob.h>
-+#include <unistd.h>
-
- #include "opkg_conf.h"
- #include "opkg_cmd.h"
-@@ -350,7 +351,6 @@ static opkg_intercept_t opkg_prep_interc
-
- static int opkg_finalize_intercepts(opkg_intercept_t ctx)
- {
--    char *cmd;
-     DIR *dir;
-     int err = 0;
-
-@@ -376,6 +376,10 @@ static int opkg_finalize_intercepts(opkg
-                   err = errno;
-                   perror (de->d_name);
-               }
-+              if (unlink (path)) {
-+                  err = errno;
-+                  perror (path);
-+              }
-           }
-           free (path);
-       }
-@@ -383,9 +387,10 @@ static int opkg_finalize_intercepts(opkg
-     } else
-       perror (ctx->statedir);
-
--    sprintf_alloc (&cmd, "rm -rf %s", ctx->statedir);
--    err = system (cmd);
--    free (cmd);
-+    if (rmdir (ctx->statedir)) {
-+      err = errno;
-+      perror (ctx->statedir);
-+    }
-
-     free (ctx->statedir);
-     free (ctx);

recipes/opkg/opkg_svn.bb +0 -0

index 5138458..b193d7c 100644
@@ -8,14 +8,8 @@ PACKAGES =+ "libopkg-dev libopkg"
 

 FILES_libopkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so" FILES_libopkg = "${libdir}/*.so.*"
-# not happens automatically for opkg-nogpg:
 FILES_${PN} += "${datadir}/opkg/intercept"

recipes/opkg/opkg_svn.bb +0 -5

-# Define a variable to allow distros to run configure earlier.
-# (for example, to enable loading of ethernet kernel modules before networking starts)
-OPKG_INIT_POSITION = "98"
-OPKG_INIT_POSITION_slugos = "41"
-

 pkg_postinst_${PN} () {
  update-alternatives --install ${bindir}/opkg opkg ${bindir}/opkg-cl 100 }

recipes/tasks/task-arago-toolchain-target.bb +1 -1

index e22ac2b..8f85a89 100644
@@ -30,6 +30,6 @@ RDEPENDS_${PN} = "\
     zlib-dev \
     mtd-utils-dev \
     ncurses-dev \
-    opkg-nogpg-dev \
+    opkg-dev \
     sysvinit-dev \

    "

recipes/tasks/task-sdk-sbox.bb +1 -1

index bf75402..25829cc 100644
@@ -8,6 +8,6 @@ RDEPENDS_${PN} = "\
     gdb \
     sbrsh \
     fakeroot \
-    opkg-nogpg \
+    opkg \
     opkg-utils \

    "
--
1.7.1

Bump.

Quoted 9 lines

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.

Quoted 6 lines

Build tested for qemumipsel/minimal-image and nslu2/slugos-image. minimal-image builds 10% quicker in my setup and is 1mb smaller.
---

v2:
 A stray missing double quote makes the last patch a no go.

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.

Quoted 9 lines · Graham Gower

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.

Quoted 2 lines

Build tested for qemumipsel/minimal-image and nslu2/slugos-image. minimal-image builds 10% quicker in my setup and is 1mb smaller.

Tested on SHR/om-gta02

Acked-by Martin Jansa <[email protected]>

--
Martin 'JaMa' Jansa     jabber: [email protected]

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel