Author: ayoung
Date: Fri Mar 16 03:45:54 2012
New Revision: 9658
URL: http://svn.slimdevices.com/jive?rev=9658&view=rev
Log:
Try reverting to cached copy of r4534 of opkg.
Added:
7.8/trunk/squeezeos/poky/meta/packages/opkg/files/opkg-fix-gcc-warnings.patch
Modified:
7.8/trunk/squeezeos/poky/meta/conf/distro/include/poky-fixed-revisions.inc
7.8/trunk/squeezeos/poky/meta/packages/opkg/files/fix_prototype.patch
7.8/trunk/squeezeos/poky/meta/packages/opkg/opkg.inc
Modified:
7.8/trunk/squeezeos/poky/meta/conf/distro/include/poky-fixed-revisions.inc
URL:
http://svn.slimdevices.com/jive/7.8/trunk/squeezeos/poky/meta/conf/distro/include/poky-fixed-revisions.inc?rev=9658&r1=9657&r2=9658&view=diff
==============================================================================
--- 7.8/trunk/squeezeos/poky/meta/conf/distro/include/poky-fixed-revisions.inc
(original)
+++ 7.8/trunk/squeezeos/poky/meta/conf/distro/include/poky-fixed-revisions.inc
Fri Mar 16 03:45:54 2012
@@ -75,9 +75,9 @@
SRCREV_pn-matchbox-wm-2 ?= "2083"
SRCREV_pn-matchbox-wm ?= "1524"
SRCREV_pn-oh-puzzles ?= "23"
-SRCREV_pn-opkg-native ?= "180"
-SRCREV_pn-opkg-sdk ?= "180"
-SRCREV_pn-opkg ?= "180"
+SRCREV_pn-opkg-native ?= "4534"
+SRCREV_pn-opkg-sdk ?= "4534"
+SRCREV_pn-opkg ?= "4534"
SRCREV_pn-opkg-utils-native ?= "234524f33dbaf750b921b4a8ecb0e64e1ef38d00"
SRCREV_pn-opkg-utils ?= "234524f33dbaf750b921b4a8ecb0e64e1ef38d00"
SRCREV_pn-oprofileui ?= "194"
Modified: 7.8/trunk/squeezeos/poky/meta/packages/opkg/files/fix_prototype.patch
URL:
http://svn.slimdevices.com/jive/7.8/trunk/squeezeos/poky/meta/packages/opkg/files/fix_prototype.patch?rev=9658&r1=9657&r2=9658&view=diff
==============================================================================
--- 7.8/trunk/squeezeos/poky/meta/packages/opkg/files/fix_prototype.patch
(original)
+++ 7.8/trunk/squeezeos/poky/meta/packages/opkg/files/fix_prototype.patch Fri
Mar 16 03:45:54 2012
@@ -24,4 +24,16 @@
int get_available_blocks(char * filesystem);
char **read_raw_pkgs_from_file(const char *file_name);
-
+Index: opkg/libopkg/opkg_cmd.c
+===================================================================
+--- opkg.orig/libopkg/opkg_cmd.c 2008-10-23 12:02:29.000000000 +0100
++++ opkg/libopkg/opkg_cmd.c 2008-10-23 12:02:53.000000000 +0100
+@@ -151,7 +151,7 @@
+ error_list = error_list->next;
+
+ }
+- free_error_list(&error_list);
++ free_error_list();
+ }
+
+ }
Added:
7.8/trunk/squeezeos/poky/meta/packages/opkg/files/opkg-fix-gcc-warnings.patch
URL:
http://svn.slimdevices.com/jive/7.8/trunk/squeezeos/poky/meta/packages/opkg/files/opkg-fix-gcc-warnings.patch?rev=9658&view=auto
==============================================================================
---
7.8/trunk/squeezeos/poky/meta/packages/opkg/files/opkg-fix-gcc-warnings.patch
(added)
+++
7.8/trunk/squeezeos/poky/meta/packages/opkg/files/opkg-fix-gcc-warnings.patch
Fri Mar 16 03:45:54 2012
@@ -1,0 +1,53 @@
+diff -urN opkg.orig/libopkg/libopkg.c opkg/libopkg/libopkg.c
+--- opkg.orig/libopkg/libopkg.c 2009-02-09 10:49:40.000000000 +0000
++++ opkg/libopkg/libopkg.c 2009-02-09 10:50:23.000000000 +0000
+@@ -38,7 +38,7 @@
+ if ( level == OPKG_ERROR ){
+ push_error_list(&error_list, msg);
+ } else
+- printf(msg);
++ printf("%s", msg);
+ }
+ return 0;
+ }
+@@ -71,7 +71,7 @@
+ char* default_opkg_response_callback(char *question)
+ {
+ char *response = NULL;
+- printf(question);
++ printf("%s", question);
+ fflush(stdout);
+ do {
+ response = (char *)file_read_line_alloc(stdin);
+diff -urN opkg.orig/libopkg/opkg_cmd.c opkg/libopkg/opkg_cmd.c
+--- opkg.orig/libopkg/opkg_cmd.c 2009-02-09 10:49:40.000000000 +0000
++++ opkg/libopkg/opkg_cmd.c 2009-02-09 10:50:23.000000000 +0000
+@@ -369,7 +369,7 @@
+ perror (ctx->statedir);
+
+ sprintf_alloc (&cmd, "rm -rf %s", ctx->statedir);
+- system (cmd);
++ err = system (cmd);
+ free (cmd);
+
+ free (ctx->statedir);
+diff -urN opkg.orig/libopkg/pkg.c opkg/libopkg/pkg.c
+--- opkg.orig/libopkg/pkg.c 2009-02-09 10:49:40.000000000 +0000
++++ opkg/libopkg/pkg.c 2009-02-09 10:52:49.000000000 +0000
+@@ -1052,6 +1052,7 @@
+
+ void pkg_print_info(pkg_t *pkg, FILE *file)
+ {
++ int t = 0;
+ char * buff;
+ if (pkg == NULL) {
+ return;
+@@ -1061,7 +1062,7 @@
+ if ( buff == NULL )
+ return;
+ if (strlen(buff)>2){
+- fwrite(buff, 1, strlen(buff), file);
++ t = fwrite(buff, 1, strlen(buff), file); /* TODO: check t */
+ }
+ free(buff);
+ }
Modified: 7.8/trunk/squeezeos/poky/meta/packages/opkg/opkg.inc
URL:
http://svn.slimdevices.com/jive/7.8/trunk/squeezeos/poky/meta/packages/opkg/opkg.inc?rev=9658&r1=9657&r2=9658&view=diff
==============================================================================
--- 7.8/trunk/squeezeos/poky/meta/packages/opkg/opkg.inc (original)
+++ 7.8/trunk/squeezeos/poky/meta/packages/opkg/opkg.inc Fri Mar 16 03:45:54
2012
@@ -6,9 +6,15 @@
DEPENDS = "curl gpgme"
PV = "0.0+svnr${SRCREV}"
-SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \
- file://fix_prototype.patch;patch=1"
+# opkg-fix-gcc-warnings.patch: the patch is already upstreamed and could be
+# taken out once okpg is updated to new repo
+# http://opkg.googlecode.com/svn/trunk
+# with rev >= 150
-S = "${WORKDIR}/trunk"
+SRC_URI =
"http://downloads.slimdevices.com/poky-cache/opkg-utils_svn.openmoko.org_.trunk.src.host._4534_.tar.gz
\
+ file://fix_prototype.patch;patch=1 \
+ file://opkg-fix-gcc-warnings.patch;patch=1"
+
+S = "${WORKDIR}/opkg"
inherit autotools_stage pkgconfig
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
