opkg-target,sdk: bump SRCREV

* -native is left alone because packaged-staging needs more testing
* tested install and upgrade on angstrom/beagleboard
* tweaked opkg-nogpg-nocurl recipe to keep it building

4 files changed, 15 insertions, 19 deletions

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 7b11e1dda6..10f943b540 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -255,9 +255,9 @@ SRCREV_pn-openmoocow ?= "39648419825cddfea1cb1321e552a12b71fede14"
 SRCREV_pn-openocd ?= "517"
 SRCREV_pn-openocd-native ?= "517"
 SRCREV_pn-opimd-utils ?= "0e7007fff120c8cc4c579c0c7e57883798e6d23e"
-SRCREV_pn-opkg ?= "240"
+SRCREV_pn-opkg ?= "363"
 SRCREV_pn-opkg-native ?= "240"
-SRCREV_pn-opkg-sdk ?= "240"
+SRCREV_pn-opkg-sdk ?= "363"
 SRCREV_pn-opkg-utils ?= "4578"
 SRCREV_pn-opkg-utils-native ?= "4595"
 SRCREV_pn-oprofileui ?= "173"
diff --git a/recipes/opkg/opkg-nogpg-nocurl_svn.bb b/recipes/opkg/opkg-nogpg-nocurl_svn.bb
index 5e1caa90d9..cd8751ae87 100644
--- a/recipes/opkg/opkg-nogpg-nocurl_svn.bb
+++ b/recipes/opkg/opkg-nogpg-nocurl_svn.bb
@@ -1,24 +1,13 @@
-require opkg_svn.bb
+require opkg-nogpg_svn.bb
 
 DEPENDS = ""
 PROVIDES += "opkg"
 
-SRC_URI += " \
-	    file://opkg_wget.patch;patch=1;maxrev=180 \
-	    file://reduce-nogpg-noise.patch;patch=1;maxrev=180 \
-	    file://opkg_wget_nogpg_01_use_vfork_gunzip.patch;patch=1 \
-	    file://opkg_wget_nogpg_02_use_vfork_system.patch;patch=1 \
-	    file://opkg_wget_nogpg_03_fix_tmpdirs.patch;patch=1 \
-	    file://opkg_wget_nogpg_04_default_tmpdir.patch;patch=1 \
-	   "
 PR = "${INC_PR}"
 
 SRCREV = "${SRCREV_pn-opkg}"
 
-EXTRA_OECONF += "--disable-gpg --enable-static --disable-shared"
-
-# NOTE: Use this one after svn rev 180 (should be a different recipe)
-#EXTRA_OECONF += "--disable-gpg --disable-curl --enable-static --disable-shared"
+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() {
diff --git a/recipes/opkg/opkg-nogpg_svn.bb b/recipes/opkg/opkg-nogpg_svn.bb
index a0f9614a37..9ddc589b49 100644
--- a/recipes/opkg/opkg-nogpg_svn.bb
+++ b/recipes/opkg/opkg-nogpg_svn.bb
@@ -3,11 +3,18 @@ require opkg_svn.bb
 DEPENDS = "curl"
 PROVIDES += "opkg"
 
-PR = "${INC_PR}"
+PR = "${INC_PR}.1"
 
 SRCREV = "${SRCREV_pn-opkg}"
 
-EXTRA_OECONF += "--disable-gpg"
+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() {
diff --git a/recipes/opkg/opkg.inc b/recipes/opkg/opkg.inc
index d744e72223..2e7baee496 100644
--- a/recipes/opkg/opkg.inc
+++ b/recipes/opkg/opkg.inc
@@ -10,8 +10,8 @@ FILESPATHPKG =. "opkg:"
 
 SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \
 	file://opkg_unarchive.patch;patch=1;maxrev=201 \
-	file://opkg-intercept-cleanup.patch;patch=1 \
-	file://isatty.patch;patch=1"
+	file://opkg-intercept-cleanup.patch;patch=1;maxrev=241 \
+"
 
 SRC_URI += "file://configure"