SlugOS: slugos.inc, opkg-nogpg-nocurl_svn.bb - revert to SVN rev 160

Override sane-srcrevs.inc in slugos.inc
Reinstate old patches to opkg-nogpg-nocurl_svn.bb required by older sources.
(This fixes a number of instabilities and problems reported with opkg)

diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index d46dcf5..1ac6fe0 100644 (file)
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -25,6 +25,25 @@ PREFERRED_VERSION_linux-ixp4xx = "2.6.27.8+svnr${SRCREV}"
 #===============================================================================#
 
 
+
+#===============================================================================#
+#===============================================================================#
+#===============================================================================#
+#                              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.
+#
+SRCREV_pn-opkg        = "160"
+SRCREV_pn-opkg-native = "160"
+SRCREV_pn-opkg-sdk    = "160"
+#
+#===============================================================================#
+#===============================================================================#
+#===============================================================================#
+
+
 #----------------------------------------------------------------------------------
 # STANDARD SLUGOS DEFINITIONS
 #----------------------------------------------------------------------------------

diff --git a/packages/opkg/opkg-nogpg-nocurl_svn.bb b/packages/opkg/opkg-nogpg-nocurl_svn.bb
index 5a566b8..d385dc8 100644 (file)
--- a/packages/opkg/opkg-nogpg-nocurl_svn.bb
+++ b/packages/opkg/opkg-nogpg-nocurl_svn.bb
@@ -3,15 +3,21 @@ require opkg_svn.bb
 DEPENDS = ""
 PROVIDES += "opkg"
 
-SRC_URI += "file://opkg_wget_nogpg_01_use_vfork_gunzip.patch;patch=1 \
+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 \
           "
-PR = "r1"
+PR = "r2"
 
 SRCREV = "${SRCREV_pn-opkg}"
 
-EXTRA_OECONF += "--disable-gpg --disable-curl --enable-static --disable-shared"
+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"
 
 # The nogpg version isn't getting much love and has an unused variable which trips up -Werror
 do_configure_prepend() {