Changeset 19061


Ignore:
Timestamp:
2010-01-07T13:37:49+01:00 (8 years ago)
Author:
jow
Message:

[package] opkg: update to r513, move lock-file to /var/lock and drop cleanup patch - went upstream

Location:
trunk/package/opkg
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/opkg/Makefile

    r18884 r19061  
    11# 
    2 # Copyright (C) 2006-2009 OpenWrt.org 
     2# Copyright (C) 2006-2010 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    99 
    1010PKG_NAME:=opkg 
    11 PKG_REV:=503 
     11PKG_REV:=513 
    1212PKG_VERSION:=$(PKG_REV) 
    13 PKG_RELEASE:=2 
     13PKG_RELEASE:=1 
    1414 
    1515PKG_SOURCE_PROTO:=svn 
     
    4848        --disable-curl \ 
    4949        --disable-gpg \ 
    50         --with-ipkgetcdir=/etc 
     50        --with-opkgetcdir=/etc \ 
     51        --with-opkglockfile=/var/lock/opkg.lock 
    5152 
    5253define Build/Configure 
  • trunk/package/opkg/patches/003-fs_overlay_support.patch

    r18884 r19061  
    77--- a/libopkg/opkg_conf.c 
    88+++ b/libopkg/opkg_conf.c 
    9 @@ -58,6 +58,7 @@ 
    10           { "noaction", OPKG_OPT_TYPE_BOOL, &_conf.noaction }, 
     9@@ -62,6 +62,7 @@ 
     10          { "download_only", OPKG_OPT_TYPE_BOOL, &_conf.download_only }, 
    1111          { "nodeps", OPKG_OPT_TYPE_BOOL, &_conf.nodeps }, 
    1212          { "offline_root", OPKG_OPT_TYPE_STRING, &_conf.offline_root }, 
     
    1717--- a/libopkg/opkg_conf.h 
    1818+++ b/libopkg/opkg_conf.h 
    19 @@ -74,6 +74,7 @@ 
     19@@ -76,6 +76,7 @@ 
    2020      int check_signature; 
    2121      int nodeps; /* do not follow dependences */ 
  • trunk/package/opkg/patches/004-host_cpu.patch

    r18864 r19061  
    1313@@ -1,5 +1,5 @@ 
    1414- 
    15 -AM_CFLAGS=-Wall -DHOST_CPU_STR=\"@host_cpu@\" -DBUILD_CPU=@build_cpu@ -DLIBDIR=\"@libdir@\" -DOPKGLIBDIR=\"@opkglibdir@\" -DOPKGETCDIR=\"@opkgetcdir@\" -DDATADIR=\"@datadir@\" -I$(top_srcdir) $(BIGENDIAN_CFLAGS) $(CURL_CFLAGS) $(GPGME_CFLAGS) $(PATHFINDER_CFLAGS) 
     15-AM_CFLAGS=-Wall -DHOST_CPU_STR=\"@host_cpu@\" -DBUILD_CPU=@build_cpu@ -DLIBDIR=\"@libdir@\" -DOPKGLIBDIR=\"@opkglibdir@\" -DOPKGETCDIR=\"@opkgetcdir@\" -DOPKGLOCKFILE=\"@opkglockfile@\" -DDATADIR=\"@datadir@\" -I$(top_srcdir) $(BIGENDIAN_CFLAGS) $(CURL_CFLAGS) $(GPGME_CFLAGS) $(PATHFINDER_CFLAGS) 
    1616+HOST_CPU=@host_cpu@ 
    17 +AM_CFLAGS=-Wall -DHOST_CPU_STR=\"$(HOST_CPU)\" -DBUILD_CPU=@build_cpu@ -DLIBDIR=\"@libdir@\" -DOPKGLIBDIR=\"@opkglibdir@\" -DOPKGETCDIR=\"@opkgetcdir@\" -DDATADIR=\"@datadir@\" -I$(top_srcdir) $(BIGENDIAN_CFLAGS) $(CURL_CFLAGS) $(GPGME_CFLAGS) $(PATHFINDER_CFLAGS) 
     17+AM_CFLAGS=-Wall -DHOST_CPU_STR=\"$(HOST_CPU)\" -DBUILD_CPU=@build_cpu@ -DLIBDIR=\"@libdir@\" -DOPKGLIBDIR=\"@opkglibdir@\" -DOPKGETCDIR=\"@opkgetcdir@\" -DOPKGLOCKFILE=\"@opkglockfile@\" -DDATADIR=\"@datadir@\" -I$(top_srcdir) $(BIGENDIAN_CFLAGS) $(CURL_CFLAGS) $(GPGME_CFLAGS) $(PATHFINDER_CFLAGS) 
    1818  
    1919 libopkg_includedir=$(includedir)/libopkg 
  • trunk/package/opkg/patches/007-force_static.patch

    r18864 r19061  
    11--- a/libopkg/Makefile.am 
    22+++ b/libopkg/Makefile.am 
    3 @@ -36,16 +36,10 @@ 
     3@@ -35,16 +35,10 @@ 
    44 opkg_util_sources += sha256.c sha256.h 
    55 endif 
  • trunk/package/opkg/patches/009-remove-upgrade-all.patch

    r18864 r19061  
    11--- a/libopkg/opkg_cmd.c 
    22+++ b/libopkg/opkg_cmd.c 
    3 @@ -495,17 +495,6 @@ 
     3@@ -498,17 +498,6 @@ 
    44                    opkg_install_by_name(arg); 
    55                } 
     
    1919  
    2020      opkg_configure_packages(NULL); 
    21 @@ -1163,7 +1152,7 @@ 
     21@@ -1166,7 +1155,7 @@ 
    2222    array for easier maintenance */ 
    2323 static opkg_cmd_t cmds[] = { 
  • trunk/package/opkg/patches/010-remove-flag.patch

    r18864 r19061  
    11--- a/libopkg/opkg_cmd.c 
    22+++ b/libopkg/opkg_cmd.c 
    3 @@ -735,49 +735,6 @@ 
     3@@ -738,49 +738,6 @@ 
    44 } 
    55  
     
    5151 { 
    5252      pkg_t *pkg; 
    53 @@ -1159,7 +1116,6 @@ 
     53@@ -1162,7 +1119,6 @@ 
    5454      {"list_upgradable", 0, (opkg_cmd_fun_t)opkg_list_upgradable_cmd, PFM_SOURCE}, 
    5555      {"list-upgradable", 0, (opkg_cmd_fun_t)opkg_list_upgradable_cmd, PFM_SOURCE}, 
  • trunk/package/opkg/patches/011-old-config-location.patch

    r18879 r19061  
    11--- a/src/opkg-cl.c 
    22+++ b/src/opkg-cl.c 
    3 @@ -169,7 +169,10 @@ 
     3@@ -172,7 +172,10 @@ 
    44                        printf("Confusion: getopt_long returned %d\n", c); 
    55                } 
  • trunk/package/opkg/patches/012-cleanup-tmpdir.patch

    r18879 r19061  
    1 --- a/src/opkg-cl.c 
    2 +++ b/src/opkg-cl.c 
    3 @@ -263,7 +263,7 @@ 
    4  int 
    5  main(int argc, char *argv[]) 
    6  { 
    7 -       int opts; 
    8 +       int opts, err = -1; 
    9         char *cmd_name; 
    10         opkg_cmd_t *cmd; 
    11         int nocheckfordirorfile = 0; 
    12 @@ -327,15 +327,8 @@ 
    13                 usage(); 
    14         } 
    15   
    16 -       if (opkg_cmd_exec(cmd, argc - opts, (const char **) (argv + opts))) 
    17 -               goto err2; 
    18 +       err = opkg_cmd_exec(cmd, argc - opts, (const char **) (argv + opts)); 
    19   
    20 -       print_error_list(); 
    21 -       free_error_list(); 
    22 - 
    23 -       return 0; 
    24 - 
    25 -err2: 
    26  #ifdef HAVE_CURL 
    27         opkg_curl_cleanup(); 
    28  #endif 
    29 @@ -346,5 +339,5 @@ 
    30         print_error_list(); 
    31         free_error_list(); 
    32   
    33 -       return -1; 
    34 +       return err; 
    35  } 
Note: See TracChangeset for help on using the changeset viewer.