summaryrefslogtreecommitdiffstats
path: root/meta/packages/opkg/files
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-01-13 22:06:05 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-01-13 22:06:25 +0000
commita717961f6e0e016e447eeca5f5f5d3a81354c61c (patch)
treebbedfba6ebef809e6bc303954d3ec743374693d3 /meta/packages/opkg/files
parent357282e2111fa6b84b34185d9916b0c17119480c (diff)
downloadpoky-a717961f6e0e016e447eeca5f5f5d3a81354c61c.tar.gz
opkg: Convert to use BBCLASSEXTEND
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/opkg/files')
-rw-r--r--meta/packages/opkg/files/fix_prototype.patch39
-rw-r--r--meta/packages/opkg/files/opkg-fix-gcc-warnings.patch53
-rw-r--r--meta/packages/opkg/files/opkg_unarchive.patch13
-rw-r--r--meta/packages/opkg/files/sighandlerfix.patch14
4 files changed, 0 insertions, 119 deletions
diff --git a/meta/packages/opkg/files/fix_prototype.patch b/meta/packages/opkg/files/fix_prototype.patch
deleted file mode 100644
index 4be881aa7e..0000000000
--- a/meta/packages/opkg/files/fix_prototype.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1Index: opkg/libopkg/opkg_utils.c
2===================================================================
3--- opkg.orig/libopkg/opkg_utils.c 2008-10-23 09:36:52.000000000 +0100
4+++ opkg/libopkg/opkg_utils.c 2008-10-23 09:37:05.000000000 +0100
5@@ -165,7 +165,7 @@
6 }
7
8
9-void free_error_list(){
10+void free_error_list(void){
11 struct errlist *err_tmp_lst;
12
13 err_tmp_lst = error_list;
14Index: opkg/libopkg/opkg_utils.h
15===================================================================
16--- opkg.orig/libopkg/opkg_utils.h 2008-10-23 09:36:50.000000000 +0100
17+++ opkg/libopkg/opkg_utils.h 2008-10-23 09:37:13.000000000 +0100
18@@ -23,7 +23,7 @@
19
20 void push_error_list(struct errlist **errors,char * msg);
21 void reverse_error_list(struct errlist **errors);
22-void free_error_list();
23+void free_error_list(void);
24
25 int get_available_blocks(char * filesystem);
26 char **read_raw_pkgs_from_file(const char *file_name);
27Index: opkg/libopkg/opkg_cmd.c
28===================================================================
29--- opkg.orig/libopkg/opkg_cmd.c 2008-10-23 12:02:29.000000000 +0100
30+++ opkg/libopkg/opkg_cmd.c 2008-10-23 12:02:53.000000000 +0100
31@@ -151,7 +151,7 @@
32 error_list = error_list->next;
33
34 }
35- free_error_list(&error_list);
36+ free_error_list();
37 }
38
39 }
diff --git a/meta/packages/opkg/files/opkg-fix-gcc-warnings.patch b/meta/packages/opkg/files/opkg-fix-gcc-warnings.patch
deleted file mode 100644
index 149542ed6a..0000000000
--- a/meta/packages/opkg/files/opkg-fix-gcc-warnings.patch
+++ /dev/null
@@ -1,53 +0,0 @@
1diff -urN opkg.orig/libopkg/libopkg.c opkg/libopkg/libopkg.c
2--- opkg.orig/libopkg/libopkg.c 2009-02-09 10:49:40.000000000 +0000
3+++ opkg/libopkg/libopkg.c 2009-02-09 10:50:23.000000000 +0000
4@@ -38,7 +38,7 @@
5 if ( level == OPKG_ERROR ){
6 push_error_list(&error_list, msg);
7 } else
8- printf(msg);
9+ printf("%s", msg);
10 }
11 return 0;
12 }
13@@ -71,7 +71,7 @@
14 char* default_opkg_response_callback(char *question)
15 {
16 char *response = NULL;
17- printf(question);
18+ printf("%s", question);
19 fflush(stdout);
20 do {
21 response = (char *)file_read_line_alloc(stdin);
22diff -urN opkg.orig/libopkg/opkg_cmd.c opkg/libopkg/opkg_cmd.c
23--- opkg.orig/libopkg/opkg_cmd.c 2009-02-09 10:49:40.000000000 +0000
24+++ opkg/libopkg/opkg_cmd.c 2009-02-09 10:50:23.000000000 +0000
25@@ -369,7 +369,7 @@
26 perror (ctx->statedir);
27
28 sprintf_alloc (&cmd, "rm -rf %s", ctx->statedir);
29- system (cmd);
30+ err = system (cmd);
31 free (cmd);
32
33 free (ctx->statedir);
34diff -urN opkg.orig/libopkg/pkg.c opkg/libopkg/pkg.c
35--- opkg.orig/libopkg/pkg.c 2009-02-09 10:49:40.000000000 +0000
36+++ opkg/libopkg/pkg.c 2009-02-09 10:52:49.000000000 +0000
37@@ -1052,6 +1052,7 @@
38
39 void pkg_print_info(pkg_t *pkg, FILE *file)
40 {
41+ int t = 0;
42 char * buff;
43 if (pkg == NULL) {
44 return;
45@@ -1061,7 +1062,7 @@
46 if ( buff == NULL )
47 return;
48 if (strlen(buff)>2){
49- fwrite(buff, 1, strlen(buff), file);
50+ t = fwrite(buff, 1, strlen(buff), file); /* TODO: check t */
51 }
52 free(buff);
53 }
diff --git a/meta/packages/opkg/files/opkg_unarchive.patch b/meta/packages/opkg/files/opkg_unarchive.patch
deleted file mode 100644
index 9e5ccfb714..0000000000
--- a/meta/packages/opkg/files/opkg_unarchive.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1--- trunk/libbb/unarchive.c.orig 2009-02-11 22:14:58.000000000 +0100
2+++ trunk/libbb/unarchive.c 2009-02-11 22:15:07.000000000 +0100
3@@ -606,6 +606,10 @@
4 tar_entry->name = concat_path_file(tar.formated.prefix, tar.formated.name);
5 }
6
7+ if (strlen(tar_entry->name) > 100) {
8+ tar_entry->name[100] = 0;
9+ }
10+
11 // tar_entry->name = xstrdup(tar.formated.name);
12
13 /*
diff --git a/meta/packages/opkg/files/sighandlerfix.patch b/meta/packages/opkg/files/sighandlerfix.patch
deleted file mode 100644
index b60245f581..0000000000
--- a/meta/packages/opkg/files/sighandlerfix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
1Index: opkg/libopkg/opkg_install.c
2===================================================================
3--- opkg.orig/libopkg/opkg_install.c 2009-05-23 00:20:04.000000000 +0100
4+++ opkg/libopkg/opkg_install.c 2009-05-23 00:20:09.000000000 +0100
5@@ -21,7 +21,9 @@
6 #include <glob.h>
7 #include <time.h>
8 #include <signal.h>
9+#ifndef __USE_GNU
10 typedef void (*sighandler_t)(int);
11+#endif
12
13 #include "pkg.h"
14 #include "pkg_hash.h"