Changeset 23205 for branches/backfire


Ignore:
Timestamp:
2010-10-03T21:42:30+02:00 (6 years ago)
Author:
jow
Message:

[backfire] merge r23050, r23052, r23159 and r23174

Location:
branches/backfire/package/opkg
Files:
6 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • branches/backfire/package/opkg/Makefile

    r23040 r23205  
    99 
    1010PKG_NAME:=opkg 
    11 PKG_REV:=513 
     11PKG_REV:=563 
    1212PKG_VERSION:=$(PKG_REV) 
    13 PKG_RELEASE:=3 
     13PKG_RELEASE:=2 
    1414 
    1515PKG_SOURCE_PROTO:=svn 
     
    2727  CATEGORY:=Base system 
    2828  TITLE:=opkg package management system 
     29  MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org> 
    2930  URL:=http://wiki.openmoko.org/wiki/Opkg 
    3031endef 
  • branches/backfire/package/opkg/patches/003-fs_overlay_support.patch

    r20474 r23205  
    77--- a/libopkg/opkg_conf.c 
    88+++ b/libopkg/opkg_conf.c 
    9 @@ -62,6 +62,7 @@ opkg_option_t options[] = { 
     9@@ -63,6 +63,7 @@ opkg_option_t options[] = { 
    1010          { "download_only", OPKG_OPT_TYPE_BOOL, &_conf.download_only }, 
    1111          { "nodeps", OPKG_OPT_TYPE_BOOL, &_conf.nodeps }, 
     
    1717--- a/libopkg/opkg_conf.h 
    1818+++ b/libopkg/opkg_conf.h 
    19 @@ -76,6 +76,7 @@ struct opkg_conf 
     19@@ -78,6 +78,7 @@ struct opkg_conf 
    2020      int check_signature; 
    21       int nodeps; /* do not follow dependences */ 
     21      int nodeps; /* do not follow dependencies */ 
    2222      char *offline_root; 
    2323+     char *overlay_root; 
     
    3535 #include "pkg.h" 
    3636 #include "pkg_hash.h" 
    37 @@ -189,13 +190,24 @@ static int 
     37@@ -192,13 +193,24 @@ static int 
    3838 verify_pkg_installable(pkg_t *pkg) 
    3939 { 
  • branches/backfire/package/opkg/patches/011-old-config-location.patch

    r23040 r23205  
    11--- a/src/opkg-cl.c 
    22+++ b/src/opkg-cl.c 
    3 @@ -172,7 +172,10 @@ args_parse(int argc, char *argv[]) 
    4                         printf("Confusion: getopt_long returned %d\n", c); 
     3@@ -200,6 +200,9 @@ args_parse(int argc, char *argv[]) 
    54                } 
    65        } 
    7 -     
    8 + 
     6  
    97+       if(!conf->conf_file && !conf->offline_root) 
    108+               conf->conf_file = xstrdup("/etc/opkg.conf"); 
  • branches/backfire/package/opkg/patches/012-strip-trailing-conffiles-whitespace.patch

    r22339 r23205  
    11--- a/libopkg/opkg_install.c 
    22+++ b/libopkg/opkg_install.c 
    3 @@ -271,6 +271,7 @@ unpack_pkg_control_files(pkg_t *pkg) 
     3@@ -274,6 +274,7 @@ unpack_pkg_control_files(pkg_t *pkg) 
    44      while (1) { 
    55          char *cf_name; 
     
    99          cf_name = file_read_line_alloc(conffiles_file); 
    1010          if (cf_name == NULL) { 
    11 @@ -279,6 +280,12 @@ unpack_pkg_control_files(pkg_t *pkg) 
     11@@ -282,6 +283,12 @@ unpack_pkg_control_files(pkg_t *pkg) 
    1212          if (cf_name[0] == '\0') { 
    1313               continue; 
Note: See TracChangeset for help on using the changeset viewer.