From 5c5b8928d27dca5cd40a1be60ccb9bc5bd0c899f Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Fri, 26 Mar 2010 14:29:17 +0000 Subject: [PATCH] package/opkg: refresh patches SVN-Revision: 20474 --- package/opkg/patches/003-fs_overlay_support.patch | 6 +++--- package/opkg/patches/007-force_static.patch | 10 +++++----- package/opkg/patches/009-remove-upgrade-all.patch | 4 ++-- package/opkg/patches/010-remove-flag.patch | 4 ++-- package/opkg/patches/011-old-config-location.patch | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package/opkg/patches/003-fs_overlay_support.patch b/package/opkg/patches/003-fs_overlay_support.patch index 0d4402ed12..4fed4d12e2 100644 --- a/package/opkg/patches/003-fs_overlay_support.patch +++ b/package/opkg/patches/003-fs_overlay_support.patch @@ -6,7 +6,7 @@ Signed-off-by: Nicolas Thill --- a/libopkg/opkg_conf.c +++ b/libopkg/opkg_conf.c -@@ -62,6 +62,7 @@ +@@ -62,6 +62,7 @@ opkg_option_t options[] = { { "download_only", OPKG_OPT_TYPE_BOOL, &_conf.download_only }, { "nodeps", OPKG_OPT_TYPE_BOOL, &_conf.nodeps }, { "offline_root", OPKG_OPT_TYPE_STRING, &_conf.offline_root }, @@ -16,7 +16,7 @@ Signed-off-by: Nicolas Thill { "query-all", OPKG_OPT_TYPE_BOOL, &_conf.query_all }, --- a/libopkg/opkg_conf.h +++ b/libopkg/opkg_conf.h -@@ -76,6 +76,7 @@ +@@ -76,6 +76,7 @@ struct opkg_conf int check_signature; int nodeps; /* do not follow dependences */ char *offline_root; @@ -34,7 +34,7 @@ Signed-off-by: Nicolas Thill #include "pkg.h" #include "pkg_hash.h" -@@ -189,13 +190,24 @@ +@@ -189,13 +190,24 @@ static int verify_pkg_installable(pkg_t *pkg) { unsigned long kbs_available, pkg_size_kbs; diff --git a/package/opkg/patches/007-force_static.patch b/package/opkg/patches/007-force_static.patch index 4ae8bfea49..12a7cc66ed 100644 --- a/package/opkg/patches/007-force_static.patch +++ b/package/opkg/patches/007-force_static.patch @@ -1,6 +1,6 @@ --- a/libopkg/Makefile.am +++ b/libopkg/Makefile.am -@@ -35,16 +35,10 @@ +@@ -35,16 +35,10 @@ if HAVE_SHA256 opkg_util_sources += sha256.c sha256.h endif @@ -22,7 +22,7 @@ +libopkg_a_LIBADD = $(top_builddir)/libbb/libbb.a $(CURL_LIBS) $(GPGME_LIBS) $(OPENSSL_LIBS) $(PATHFINDER_LIBS) --- a/libbb/Makefile.am +++ b/libbb/Makefile.am -@@ -2,9 +2,9 @@ +@@ -2,9 +2,9 @@ HOST_CPU=@host_cpu@ BUILD_CPU=@build_cpu@ ALL_CFLAGS=-g -O -Wall -DHOST_CPU_STR=\"$(HOST_CPU)\" -DBUILD_CPU=@build_cpu@ @@ -36,7 +36,7 @@ wfopen.c \ --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -4,11 +4,11 @@ +@@ -4,11 +4,11 @@ AM_CFLAGS = $(ALL_CFLAGS) -Wall -g -O3 - #noinst_PROGRAMS = libopkg_test opkg_active_list_test noinst_PROGRAMS = libopkg_test @@ -50,7 +50,7 @@ #opkg_extract_test_SOURCES = opkg_extract_test.c #opkg_extract_test_CFLAGS = $(ALL_CFLAGS) -I$(top_srcdir) -@@ -16,7 +16,7 @@ +@@ -16,7 +16,7 @@ noinst_PROGRAMS = libopkg_test #opkg_active_list_test_SOURCES = opkg_active_list_test.c #opkg_active_list_test_CFLAGS = $(ALL_CFLAGS) -I$(top_srcdir) @@ -61,7 +61,7 @@ --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -2,5 +2,5 @@ +@@ -2,5 +2,5 @@ AM_CFLAGS = -I${top_srcdir}/libopkg ${AL bin_PROGRAMS = opkg-cl opkg_cl_SOURCES = opkg-cl.c diff --git a/package/opkg/patches/009-remove-upgrade-all.patch b/package/opkg/patches/009-remove-upgrade-all.patch index d73ef466e7..0c3f6cf4a1 100644 --- a/package/opkg/patches/009-remove-upgrade-all.patch +++ b/package/opkg/patches/009-remove-upgrade-all.patch @@ -1,6 +1,6 @@ --- a/libopkg/opkg_cmd.c +++ b/libopkg/opkg_cmd.c -@@ -498,17 +498,6 @@ +@@ -498,17 +498,6 @@ opkg_upgrade_cmd(int argc, char **argv) opkg_install_by_name(arg); } } @@ -18,7 +18,7 @@ } opkg_configure_packages(NULL); -@@ -1166,7 +1155,7 @@ +@@ -1166,7 +1155,7 @@ opkg_print_architecture_cmd(int argc, ch array for easier maintenance */ static opkg_cmd_t cmds[] = { {"update", 0, (opkg_cmd_fun_t)opkg_update_cmd, PFM_DESCRIPTION|PFM_SOURCE}, diff --git a/package/opkg/patches/010-remove-flag.patch b/package/opkg/patches/010-remove-flag.patch index 277546feda..c242bea31f 100644 --- a/package/opkg/patches/010-remove-flag.patch +++ b/package/opkg/patches/010-remove-flag.patch @@ -1,6 +1,6 @@ --- a/libopkg/opkg_cmd.c +++ b/libopkg/opkg_cmd.c -@@ -738,49 +738,6 @@ +@@ -738,49 +738,6 @@ opkg_remove_cmd(int argc, char **argv) } static int @@ -50,7 +50,7 @@ opkg_files_cmd(int argc, char **argv) { pkg_t *pkg; -@@ -1162,7 +1119,6 @@ +@@ -1162,7 +1119,6 @@ static opkg_cmd_t cmds[] = { {"list_upgradable", 0, (opkg_cmd_fun_t)opkg_list_upgradable_cmd, PFM_SOURCE}, {"list-upgradable", 0, (opkg_cmd_fun_t)opkg_list_upgradable_cmd, PFM_SOURCE}, {"info", 0, (opkg_cmd_fun_t)opkg_info_cmd, 0}, diff --git a/package/opkg/patches/011-old-config-location.patch b/package/opkg/patches/011-old-config-location.patch index 74a98ef4a3..931f4f1164 100644 --- a/package/opkg/patches/011-old-config-location.patch +++ b/package/opkg/patches/011-old-config-location.patch @@ -1,6 +1,6 @@ --- a/src/opkg-cl.c +++ b/src/opkg-cl.c -@@ -172,7 +172,10 @@ +@@ -172,7 +172,10 @@ args_parse(int argc, char *argv[]) printf("Confusion: getopt_long returned %d\n", c); } } -- 2.30.2