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>

11 files changed, 29 insertions, 98 deletions

diff --git a/recipes/opkg/files/fix_endianness.patch b/recipes/opkg/files/fix_endianness.patch
deleted file mode 100644
index 8632ce5658..0000000000
--- a/recipes/opkg/files/fix_endianness.patch
+++ /dev/null
@@ -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.
diff --git a/recipes/opkg/opkg/isatty.patch b/recipes/opkg/files/isatty.patch
index c935f153d1..c935f153d1 100644
--- a/recipes/opkg/opkg/isatty.patch
+++ b/recipes/opkg/files/isatty.patch
diff --git a/recipes/opkg/opkg/opkg-intercept-cleanup.patch b/recipes/opkg/files/opkg-intercept-cleanup.patch
index 12893e3852..12893e3852 100644
--- a/recipes/opkg/opkg/opkg-intercept-cleanup.patch
+++ b/recipes/opkg/files/opkg-intercept-cleanup.patch
diff --git a/recipes/opkg/files/opkg-libdir.patch b/recipes/opkg/files/opkg-libdir.patch
deleted file mode 100644
index 1d48b9a6bf..0000000000
--- a/recipes/opkg/files/opkg-libdir.patch
+++ /dev/null
@@ -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: $*
diff --git a/recipes/opkg/opkg-native_svn.bb b/recipes/opkg/opkg-native_svn.bb
index fe3ed4e7d4..33d84ff2a2 100644
--- a/recipes/opkg/opkg-native_svn.bb
+++ b/recipes/opkg/opkg-native_svn.bb
@@ -1,19 +1,10 @@
 require opkg.inc
 
-DEPENDS = "curl-native openssl-native"
 PR = "${INC_PR}"
 PROVIDES =+ "virtual/update-alternatives-native"
 
-SRC_URI += "file://opkg-libdir.patch;maxrev=342"
-
 target_libdir := "${libdir}"
 
 inherit native
 
-# 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}"
diff --git a/recipes/opkg/opkg-nogpg-nocurl-slugos_svn.bb b/recipes/opkg/opkg-nogpg-nocurl-slugos_svn.bb
index cac02fd4cc..d39e6cee7f 100644
--- a/recipes/opkg/opkg-nogpg-nocurl-slugos_svn.bb
+++ b/recipes/opkg/opkg-nogpg-nocurl-slugos_svn.bb
@@ -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"
+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 \
@@ -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"
 
+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
 
 # The nogpg version isn't getting much love and has an unused variable which trips up -Werror
@@ -41,11 +57,6 @@ FILES_libopkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
 # not happens automatically for opkg-nogpg:
 FILES_${PN} += "${datadir}/opkg/intercept"
 
-# 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
 }
diff --git a/recipes/opkg/opkg-nogpg-nocurl_svn.bb b/recipes/opkg/opkg-nogpg-nocurl_svn.bb
deleted file mode 100644
index 66e8dbcda5..0000000000
--- a/recipes/opkg/opkg-nogpg-nocurl_svn.bb
+++ /dev/null
@@ -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"
diff --git a/recipes/opkg/opkg-nogpg_svn.bb b/recipes/opkg/opkg-nogpg_svn.bb
deleted file mode 100644
index bee639ff8c..0000000000
--- a/recipes/opkg/opkg-nogpg_svn.bb
+++ /dev/null
@@ -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"
diff --git a/recipes/opkg/opkg-sdk_svn.bb b/recipes/opkg/opkg-sdk_svn.bb
index f7f9c9e20a..5970f8ec85 100644
--- a/recipes/opkg/opkg-sdk_svn.bb
+++ b/recipes/opkg/opkg-sdk_svn.bb
@@ -5,4 +5,4 @@ PR = "${INC_PR}"
 target_libdir := "${libdir}"
 inherit sdk
 
-EXTRA_OECONF += "--with-opkglibdir=${target_libdir} --disable-gpg"
+EXTRA_OECONF += "--with-opkglibdir=${target_libdir}"
diff --git a/recipes/opkg/opkg.inc b/recipes/opkg/opkg.inc
index 1149b723f7..b88ae4baaa 100644
--- a/recipes/opkg/opkg.inc
+++ b/recipes/opkg/opkg.inc
@@ -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}
-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 \
 "
 
-SRC_URI += "file://configure"
-
 S = "${WORKDIR}/trunk"
 
 inherit autotools pkgconfig
@@ -25,3 +19,7 @@ do_install_prepend() {
   install -m 0755 ${WORKDIR}/configure ${D}${sysconfdir}/rcS.d/S98configure
 }
 
+EXTRA_OECONF += " --disable-gpg \ 
+                  --disable-openssl \ 
+                  --disable-ssl-curl \
+                  --disable-curl"
diff --git a/recipes/opkg/opkg_svn.bb b/recipes/opkg/opkg_svn.bb
index 5138458498..b193d7c55c 100644
--- a/recipes/opkg/opkg_svn.bb
+++ b/recipes/opkg/opkg_svn.bb
@@ -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"
 
-# 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
 }