[oe-commits] org.oe.dev create opkg variant for very small rootfs systems (SlugOS 5.0)

[mwester commit]

create opkg variant for very small rootfs systems (SlugOS 5.0)
This is a work-in-progress at this time, preference is set to -1

Author: mwester at openembedded.org
Branch: org.openembedded.dev
Revision: 334a1e21ba079070063d9aacc2e2010b3d63ff44
ViewMTN: http://monotone.openembedded.org/revision/info/334a1e21ba079070063d9aacc2e2010b3d63ff44
Files:
1
packages/opkg/files/opkg_wget.patch
packages/opkg/files/reduce-nogpg-noise.patch
packages/opkg/opkg-nogpg-nocurl_svn.bb
Diffs:

#
# mt diff -rdb5edf1d33af46eb85f6703cd580fdbf069f719f -r334a1e21ba079070063d9aacc2e2010b3d63ff44
#
#
#
# add_file "packages/opkg/files/opkg_wget.patch"
#  content [638671bbefdd1743c7efc54bc0eda0b92b3ded5b]
# 
# add_file "packages/opkg/files/reduce-nogpg-noise.patch"
#  content [ec4b6981cb45b869e3f606606bc2e1ce91cff20b]
# 
# add_file "packages/opkg/opkg-nogpg-nocurl_svn.bb"
#  content [80320112589965ead6aad32429427c8b0c3849ed]
#
============================================================
--- packages/opkg/files/opkg_wget.patch	638671bbefdd1743c7efc54bc0eda0b92b3ded5b
+++ packages/opkg/files/opkg_wget.patch	638671bbefdd1743c7efc54bc0eda0b92b3ded5b
@@ -0,0 +1,88 @@
+--- opkg/libopkg/opkg_download.c.orig	2008-08-21 12:33:49.000000000 -0500
++++ opkg/libopkg/opkg_download.c	2008-08-21 15:12:00.000000000 -0500
+@@ -17,7 +17,9 @@
+    General Public License for more details.
+ */
+ #include "config.h"
++#ifdef HAVE_CURL
+ #include <curl/curl.h>
++#endif
+ #ifdef HAVE_GPGME
+ #include <gpgme.h>
+ #endif
+@@ -76,6 +78,7 @@
+ 	setenv("no_proxy", conf->no_proxy, 1);
+     }
+ 
++#ifdef HAVE_CURL
+     CURL *curl;
+     CURLcode res;
+     FILE * file = fopen (tmp_file_location, "w");
+@@ -121,6 +124,27 @@
+         free(src_basec);
+ 	return -1;
+     }
++#else
++    {
++      int res;
++      char *wgetcmd;
++      char *wgetopts;
++      wgetopts = getenv("OPKG_WGETOPTS");
++      sprintf_alloc(&wgetcmd, "wget -q %s%s -O \"%s\" \"%s\"",
++		    (conf->http_proxy || conf->ftp_proxy) ? "-Y on " : "",
++		    (wgetopts!=NULL) ? wgetopts : "",
++		    tmp_file_location, src);
++      opkg_message(conf, OPKG_INFO, "Executing: %s\n", wgetcmd);
++      res = xsystem(wgetcmd);
++      free(wgetcmd);
++      if (res) {
++	opkg_message(conf, OPKG_ERROR, "Failed to download %s, error %d\n", src, res);
++	free(tmp_file_location);
++        free(src_basec);
++	return res;
++      }
++    }
++#endif
+ 
+     err = file_move(tmp_file_location, dest_file_name);
+ 
+--- opkg/configure.ac.orig	2008-07-08 09:39:11.000000000 -0500
++++ opkg/configure.ac	2008-08-21 14:57:35.000000000 -0500
+@@ -23,7 +23,7 @@
+ # Checks for libraries
+ 
+ # check for libcurl
+-PKG_CHECK_MODULES(CURL, libcurl)
++#PKG_CHECK_MODULES(CURL, libcurl)
+ 
+ 
+ 
+--- opkg/libopkg/opkg.c.orig	2008-08-21 19:49:35.000000000 -0500
++++ opkg/libopkg/opkg.c	2008-08-21 19:55:27.000000000 -0500
+@@ -1021,7 +1021,9 @@
+   return package;
+ }
+ 
++#ifdef HAVE_CURL
+ #include <curl/curl.h>
++#endif
+ /**
+  * @brief Check the accessibility of repositories. It will try to access the repository to check if the respository is accessible throught current network status. 
+  * @param opkg The opkg_t
+@@ -1071,12 +1073,16 @@
+     repositories--;
+ 
+     err = opkg_download(opkg->conf, iter1->data, "/dev/null", NULL, NULL);
++#ifdef HAVE_CURL
+     if (!(err == CURLE_OK || 
+ 		err == CURLE_HTTP_RETURNED_ERROR || 
+ 		err == CURLE_FILE_COULDNT_READ_FILE ||
+ 		err == CURLE_REMOTE_FILE_NOT_FOUND || 
+ 		err == CURLE_TFTP_NOTFOUND
+ 		)) {
++#else
++    if (!(err == 0)) {
++#endif
+ 	    ret++;
+     }
+     str_list_elt_deinit(iter1);
============================================================
--- packages/opkg/files/reduce-nogpg-noise.patch	ec4b6981cb45b869e3f606606bc2e1ce91cff20b
+++ packages/opkg/files/reduce-nogpg-noise.patch	ec4b6981cb45b869e3f606606bc2e1ce91cff20b
@@ -0,0 +1,11 @@
+--- opkg/libopkg/opkg_cmd.c.orig	2008-08-21 22:18:43.000000000 -0500
++++ opkg/libopkg/opkg_cmd.c	2008-08-21 22:19:20.000000000 -0500
+@@ -288,7 +288,7 @@ static int opkg_update_cmd(opkg_conf_t *
+ 	  free (tmp_file_name);
+ 	  free (url);
+ #else
+-	  opkg_message (conf, OPKG_NOTICE, "Signiture check for %s skipped "
++	  opkg_message (conf, OPKG_INFO, "Signature check for %s skipped "
+               "because GPG support was not enabled in this build\n", src->name);
+ #endif
+ 	  free(list_file_name);
============================================================
--- packages/opkg/opkg-nogpg-nocurl_svn.bb	80320112589965ead6aad32429427c8b0c3849ed
+++ packages/opkg/opkg-nogpg-nocurl_svn.bb	80320112589965ead6aad32429427c8b0c3849ed
@@ -0,0 +1,20 @@
+require opkg_svn.bb
+
+DEPENDS = ""
+PROVIDES += "opkg"
+
+SRC_URI += "file://opkg_wget.patch;patch=1 \
+	    file://reduce-nogpg-noise.patch;patch=1 \
+	   "
+PR = "r0"
+
+SRCREV = "${SRCREV_pn-opkg}"
+
+EXTRA_OECONF += "--disable-gpg"
+
+# 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"