Permalink
Browse files

* Rename top level ipkg directory to opkg

git-svn-id: http://opkg.googlecode.com/svn/trunk@8 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358
  • Loading branch information...
1 parent 7fc0de8 commit 0b7a99e65bb95cd86d8846a21fce1cfc2b0b7495 ticktock35 committed Dec 15, 2008
Showing with 1,674 additions and 1,677 deletions.
  1. +2 −2 AUTHORS
  2. +332 −332 ChangeLog
  3. +1 −1 INSTALL
  4. +45 −45 Makefile.am
  5. +0 −3 README
  6. +21 −21 TODO
  7. +15 −15 args.c
  8. +1 −1 args.h
  9. +5 −5 conffile.c
  10. +1 −1 conffile.h
  11. +1 −1 conffile_list.c
  12. +15 −15 configure.ac
  13. +6 −6 familiar/control-unstripped.in
  14. +6 −6 familiar/control.in
  15. +5 −5 familiar/{libipkg-control.in → libopkg-control.in}
  16. +6 −6 familiar/{libipkg-dev-control.in → libopkg-dev-control.in}
  17. +2 −2 file_util.c
  18. +6 −6 hash_table.c
  19. +1 −1 hash_table.h
  20. +3 −3 intercept/depmod
  21. +3 −3 intercept/ldconfig
  22. +3 −3 intercept/update-modules
  23. +1 −1 libbb/libbb.h
  24. +10 −10 libbb/unarchive.c
  25. +0 −88 libipkg.h
  26. +139 −139 libipkg.c → libopkg.c
  27. +88 −0 libopkg.h
  28. +4 −4 libipkg.pc.in → libopkg.pc.in
  29. +2 −2 md5.c
  30. +1 −1 nv_pair.c
  31. +1 −1 nv_pair_list.c
  32. +4 −4 ipkg-frontend.c → opkg-frontend.c
  33. +14 −14 ipkg.c → opkg.c
  34. +23 −23 ipkg.h → opkg.h
  35. +23 −23 ipkg.h.in → opkg.h.in
  36. +237 −237 ipkg_cmd.c → opkg_cmd.c
  37. +14 −14 ipkg_cmd.h → opkg_cmd.h
  38. +89 −89 ipkg_conf.c → opkg_conf.c
  39. +25 −25 ipkg_conf.h → opkg_conf.h
  40. +6 −6 ipkg_configure.c → opkg_configure.c
  41. +5 −5 ipkg_configure.h → opkg_configure.h
  42. +21 −21 ipkg_download.c → opkg_download.c
  43. +7 −7 ipkg_download.h → opkg_download.h
  44. +2 −2 ipkg_extract_test.c → opkg_extract_test.c
  45. +4 −4 ipkg_hash_test.c → opkg_hash_test.c
  46. +218 −218 ipkg_install.c → opkg_install.c
  47. +12 −12 ipkg_install.h → opkg_install.h
  48. +11 −11 ipkg_message.c → opkg_message.c
  49. +12 −12 ipkg_message.h → opkg_message.h
  50. +33 −33 ipkg_remove.c → opkg_remove.c
  51. +12 −12 ipkg_remove.h → opkg_remove.h
  52. +11 −11 ipkg_upgrade.c → opkg_upgrade.c
  53. +3 −3 ipkg_upgrade.h → opkg_upgrade.h
  54. +3 −3 ipkg_utils.c → opkg_utils.c
  55. +3 −3 ipkg_utils.h → opkg_utils.h
  56. +42 −42 pkg.c
  57. +10 −10 pkg.h
  58. +16 −16 pkg_depends.c
  59. +3 −3 pkg_depends.h
  60. +9 −9 pkg_dest.c
  61. +1 −1 pkg_dest.h
  62. +1 −1 pkg_dest_list.c
  63. +4 −4 pkg_extract.c
  64. +32 −32 pkg_hash.c
  65. +6 −6 pkg_hash.h
  66. +6 −6 pkg_parse.c
  67. +1 −1 pkg_src.c
  68. +1 −1 pkg_src_list.c
  69. +8 −8 pkg_vec.c
  70. +1 −1 pkg_vec.h
  71. +1 −1 sprintf_alloc.c
  72. +1 −1 str_list.c
  73. +1 −1 str_util.c
  74. +4 −4 update-alternatives
  75. +5 −5 user.c
  76. +1 −1 void_list.c
  77. +1 −1 xregex.c
  78. +1 −1 xsystem.c
View
@@ -1,5 +1,5 @@
-ipkg actually is maintained by Pierluigi Frullani <pigi@frumar.it>
+opkg actually is maintained by Pierluigi Frullani <pigi@frumar.it>
-ipkg is being written by Carl Worth <cworth@handhelds.org> and Steve
+opkg is being written by Carl Worth <cworth@handhelds.org> and Steve
Ayer <steven.ayer@compaq.com>
View
Oops, something went wrong.
View
@@ -1,4 +1,4 @@
-ipkg uses autoconf and friends for configuration. The familiar steps of:
+opkg uses autoconf and friends for configuration. The familiar steps of:
./configure
make
View
@@ -3,38 +3,38 @@ SUBDIRS = etc familiar libbb
HOST_CPU=@host_cpu@
BUILD_CPU=@build_cpu@
-IPKGLIBDIR=@ipkglibdir@
-ALL_CFLAGS=-g -O -Wall -DHOST_CPU_STR=\"@host_cpu@\" -DBUILD_CPU=@build_cpu@ -DLIBDIR=\"@libdir@\" -DIPKGLIBDIR=\"@ipkglibdir@\" -DDATADIR=\"@datadir@\"
+OPKGLIBDIR=@opkglibdir@
+ALL_CFLAGS=-g -O -Wall -DHOST_CPU_STR=\"@host_cpu@\" -DBUILD_CPU=@build_cpu@ -DLIBDIR=\"@libdir@\" -DOPKGLIBDIR=\"@opkglibdir@\" -DDATADIR=\"@datadir@\"
-bin_PROGRAMS = ipkg-cl
+bin_PROGRAMS = opkg-cl
-lib_LTLIBRARIES = libipkg.la
+lib_LTLIBRARIES = libopkg.la
bin_SCRIPTS = update-alternatives
-interceptdir = $(datadir)/ipkg/intercept
+interceptdir = $(datadir)/opkg/intercept
intercept_DATA = intercept/ldconfig intercept/depmod intercept/update-modules
install-data-hook:
- chmod +x $(DESTDIR)$(datadir)/ipkg/intercept/*
+ chmod +x $(DESTDIR)$(datadir)/opkg/intercept/*
-# ipkg_LDADD = libbb/libbb.a replace/libreplace.a
+# opkg_LDADD = libbb/libbb.a replace/libreplace.a
-#ipkg_cl_LDADD = libipkg.la libbb/libbb.la replace/libreplace.a
-ipkg_cl_LDADD = libipkg.la libbb/libbb.la
+#opkg_cl_LDADD = libopkg.la libbb/libbb.la replace/libreplace.a
+opkg_cl_LDADD = libopkg.la libbb/libbb.la
-libipkg_includedir=$(includedir)/libipkg
+libopkg_includedir=$(includedir)/libopkg
-libipkg_include_HEADERS= \
+libopkg_include_HEADERS= \
args.h \
conffile.h \
conffile_list.h \
config.h \
hash_table.h \
includes.h \
- ipkg_conf.h \
- ipkg.h \
- ipkg_message.h \
+ opkg_conf.h \
+ opkg.h \
+ opkg_message.h \
nv_pair.h \
nv_pair_list.h \
pkg_depends.h \
@@ -47,41 +47,41 @@ libipkg_include_HEADERS= \
pkg_vec.h \
str_list.h \
void_list.h \
- libipkg.h
+ libopkg.h
#\ replace/replace.h
-#libipkg_la_LIBADD = libbb/libbb.la replace/libreplace.a
-libipkg_la_LIBADD = libbb/libbb.la $(CURL_LIBS)
+#libopkg_la_LIBADD = libbb/libbb.la replace/libreplace.a
+libopkg_la_LIBADD = libbb/libbb.la $(CURL_LIBS)
-ipkg_core_sources = args.c args.h ipkg.c \
+opkg_core_sources = args.c args.h opkg.c \
user.c user.h
-ipkg_libcore_sources = args.c args.h libipkg.c libipkg.h ipkg.h\
+opkg_libcore_sources = args.c args.h libopkg.c libopkg.h opkg.h\
user.c user.h
-ipkg_cmd_sources = ipkg_cmd.c ipkg_cmd.h \
- ipkg_configure.c ipkg_configure.h \
- ipkg_download.c ipkg_download.h \
- ipkg_install.c ipkg_install.h \
- ipkg_upgrade.c ipkg_upgrade.h \
- ipkg_remove.c ipkg_remove.h
-ipkg_db_sources = ipkg_conf.c ipkg_conf.h \
- ipkg_utils.c ipkg_utils.h pkg.c pkg.h hash_table.h \
+opkg_cmd_sources = opkg_cmd.c opkg_cmd.h \
+ opkg_configure.c opkg_configure.h \
+ opkg_download.c opkg_download.h \
+ opkg_install.c opkg_install.h \
+ opkg_upgrade.c opkg_upgrade.h \
+ opkg_remove.c opkg_remove.h
+opkg_db_sources = opkg_conf.c opkg_conf.h \
+ opkg_utils.c opkg_utils.h pkg.c pkg.h hash_table.h \
pkg_depends.c pkg_depends.h pkg_extract.c pkg_extract.h \
hash_table.c pkg_hash.c pkg_hash.h pkg_parse.c pkg_parse.h \
pkg_vec.c pkg_vec.h
-ipkg_list_sources = conffile.c conffile.h conffile_list.c conffile_list.h \
+opkg_list_sources = conffile.c conffile.h conffile_list.c conffile_list.h \
nv_pair.c nv_pair.h nv_pair_list.c nv_pair_list.h \
pkg_dest.c pkg_dest.h pkg_dest_list.c pkg_dest_list.h \
pkg_src.c pkg_src.h pkg_src_list.c pkg_src_list.h \
str_list.c str_list.h void_list.c void_list.h
-ipkg_util_sources = file_util.c file_util.h ipkg_message.h ipkg_message.c md5.c md5.h \
+opkg_util_sources = file_util.c file_util.h opkg_message.h opkg_message.c md5.c md5.h \
sprintf_alloc.c sprintf_alloc.h str_util.c str_util.h \
xregex.c xregex.h xsystem.c xsystem.h
-# ipkg_SOURCES = $(ipkg_core_sources) $(ipkg_cmd_sources) $(ipkg_db_sources) \
-# $(ipkg_util_sources) $(ipkg_list_sources)
+# opkg_SOURCES = $(opkg_core_sources) $(opkg_cmd_sources) $(opkg_db_sources) \
+# $(opkg_util_sources) $(opkg_list_sources)
-EXTRA_DIST = ipkg.c update-alternatives $(intercept_DATA)
+EXTRA_DIST = opkg.c update-alternatives $(intercept_DATA)
MAINTAINERCLEANFILES= \
configure \
@@ -92,26 +92,26 @@ MAINTAINERCLEANFILES= \
.Makefile.am.swp \
aclocal.m4
-libipkg_la_SOURCES = $(ipkg_libcore_sources) $(ipkg_cmd_sources) $(ipkg_db_sources) \
- $(ipkg_util_sources) $(ipkg_list_sources)
+libopkg_la_SOURCES = $(opkg_libcore_sources) $(opkg_cmd_sources) $(opkg_db_sources) \
+ $(opkg_util_sources) $(opkg_list_sources)
-ipkg_cl_SOURCES = ipkg-frontend.c
+opkg_cl_SOURCES = opkg-frontend.c
-libipkg_la_CFLAGS = -DIPKG_LIB $(ALL_CFLAGS) $(CURL_CFLAGS)
+libopkg_la_CFLAGS = -DOPKG_LIB $(ALL_CFLAGS) $(CURL_CFLAGS)
-ipkg_CFLAGS = $(ALL_CFLAGS) $(CURL_CFLAGS)
+opkg_CFLAGS = $(ALL_CFLAGS) $(CURL_CFLAGS)
-ipkg_cl_CFLAGS = -DIPKG_LIB $(ALL_CFLAGS)
+opkg_cl_CFLAGS = -DOPKG_LIB $(ALL_CFLAGS)
-noinst_PROGRAMS = ipkg_hash_test ipkg_extract_test
+noinst_PROGRAMS = opkg_hash_test opkg_extract_test
-ipkg_hash_test_LDADD = libbb/libbb.la
-ipkg_hash_test_SOURCES = ipkg_hash_test.c $(ipkg_db_sources) $(ipkg_util_sources) $(ipkg_list_sources)
-ipkg_hash_test_CFLAGS = $(ALL_CFLAGS)
+opkg_hash_test_LDADD = libbb/libbb.la
+opkg_hash_test_SOURCES = opkg_hash_test.c $(opkg_db_sources) $(opkg_util_sources) $(opkg_list_sources)
+opkg_hash_test_CFLAGS = $(ALL_CFLAGS)
-ipkg_extract_test_LDADD = libbb/libbb.la
-ipkg_extract_test_SOURCES = ipkg_extract_test.c $(ipkg_db_sources) $(ipkg_util_sources) $(ipkg_list_sources)
-ipkg_extract_test_CFLAGS = $(ALL_CFLAGS)
+opkg_extract_test_LDADD = libbb/libbb.la
+opkg_extract_test_SOURCES = opkg_extract_test.c $(opkg_db_sources) $(opkg_util_sources) $(opkg_list_sources)
+opkg_extract_test_CFLAGS = $(ALL_CFLAGS)
package: all-recursive
STRIPPROG=$(STRIP) familiar/rules INSTALL=$$PWD/install-sh binary-arch
View
@@ -1,3 +0,0 @@
-ipkg - The Itsy Package Management System
-
-See http://www.handhelds.org/moin/moin.cgi/Ipkg for more details about ipkg.
View
@@ -1,12 +1,12 @@
-Things to do for ipkg, in a partial order:
+Things to do for opkg, in a partial order:
0) Play with configure to check for strdup/strndup ( to works with replace/replace.h stuffs )
-1) Fix incompatibilities between current C-based ipkg and original
-sh-based ipkg.
+1) Fix incompatibilities between current C-based opkg and original
+sh-based opkg.
-1.a) Fix ipkg.conf options for http_proxy and friends. DONE:
+1.a) Fix opkg.conf options for http_proxy and friends. DONE:
http_proxy tested, (ftp_proxy, no_proxy, proxy_user, and
proxy_passwd have not been tested).
@@ -18,15 +18,15 @@ sh-based ipkg.
1.e) Fix offline_root mode. DONE: tested.
-2) Release ipkg as ipkg, (no longer as ipkg-unstable). This depends on
+2) Release opkg as opkg, (no longer as opkg-unstable). This depends on
all of (1) being DONE. Although I might let this release proceed
without offline_root --- only Jamey will complain. ;-)
3) Bug fixes
3.a) fix all code marked "XXX: BUG"
-3.b) fix all outstanding ipkg bugzilla bugs
+3.b) fix all outstanding opkg bugzilla bugs
3.c) conffiles support seems broken again. It's prompting on just
about every file. It might be because of file names beginning
@@ -47,34 +47,34 @@ sh-based ipkg.
3.g) Audit all dpkg package fields for both parsing and printing support.
-3.h) "ipkg status" and "ipkg info" need to complain about unknown
+3.h) "opkg status" and "opkg info" need to complain about unknown
packages. For that matter, these two commands should probably just
become aliases to the same functionality.
- Jamey thinks ipkg status should be brief give one line per package, while
- ipkg info can continue to be verbose. 7/23/2002.
+ Jamey thinks opkg status should be brief give one line per package, while
+ opkg info can continue to be verbose. 7/23/2002.
-3.i) Currently "ipkg install foo" will upgrade foo if possible. The
+3.i) Currently "opkg install foo" will upgrade foo if possible. The
"Package foo is already installed" check needs to be moved up to
avoid this.
- Jamey thinkgs that "ipkg install foo" should upgrade foo. 7/23/2002.
+ Jamey thinkgs that "opkg install foo" should upgrade foo. 7/23/2002.
4) Implement new features
4.a) start with all "XXX: FEATURE" comments
-4.b) implement all accepted ipkg bugzilla feature requests, (also
- check old post "Subject: Reinventing ipkg" to see if we forgot
+4.b) implement all accepted opkg bugzilla feature requests, (also
+ check old post "Subject: Reinventing opkg" to see if we forgot
any of the good ideas we had once upon a time)
-4.c) ipkg remove needs to (prompt first) then remove packages for
+4.c) opkg remove needs to (prompt first) then remove packages for
which the dependencies will no longer be met. DONE. 7/19/2002.
4.d) Add support for:
- ipkg install foo from some-feed
- ipkg install foo-0.4.3
- ipkg install foo-latest # Only needed if we add a feed-order-priority option
+ opkg install foo from some-feed
+ opkg install foo-0.4.3
+ opkg install foo-latest # Only needed if we add a feed-order-priority option
or something like that.
4.e) Orphaned dependency management (what is this -Jamey 7/23/2002)
@@ -89,7 +89,7 @@ sh-based ipkg.
eliminate some library calls, (glob, regcomp)? Can we get
something like uclibc to work well?
-4.h) Add support for a deb-src in /etc/ipkg.conf. (ARGH! Name clash
+4.h) Add support for a deb-src in /etc/opkg.conf. (ARGH! Name clash
alert! In apt-land, deb-src means something very different than
what I would mean here. Hrm... Maybe src-deb would be cleaner? )
@@ -98,10 +98,10 @@ sh-based ipkg.
4.i) Figure out a clever chroot mechanism for running maintainer scripts in
offline_root mode.
-4.j) Implement ipkg history mechanism, with undo and redo? Keep track of
- packages removed/installed by each call to ipkg.
+4.j) Implement opkg history mechanism, with undo and redo? Keep track of
+ packages removed/installed by each call to opkg.
-5) release ipkg-1.0.0
+5) release opkg-1.0.0
6) Cleanup the code
View
@@ -20,7 +20,7 @@
#include <string.h>
#include <unistd.h>
-#include "ipkg.h"
+#include "opkg.h"
#include "config.h"
#include "args.h"
@@ -53,7 +53,7 @@ int args_init(args_t *args)
args->dest = ARGS_DEFAULT_DEST;
- conf_file_dir = getenv("IPKG_CONF_DIR");
+ conf_file_dir = getenv("OPKG_CONF_DIR");
if (conf_file_dir == NULL || conf_file_dir[0] == '\0') {
conf_file_dir = ARGS_DEFAULT_CONF_FILE_DIR;
}
@@ -226,10 +226,10 @@ int args_parse(args_t *args, int argc, char *argv[])
void args_usage(char *complaint)
{
if (complaint) {
- fprintf(stderr, "ipkg: %s\n", complaint);
+ fprintf(stderr, "opkg: %s\n", complaint);
}
print_version();
- fprintf(stderr, "usage: ipkg [options...] sub-command [arguments...]\n");
+ fprintf(stderr, "usage: opkg [options...] sub-command [arguments...]\n");
fprintf(stderr, "where sub-command is one of:\n");
fprintf(stderr, "\nPackage Manipulation:\n");
@@ -247,7 +247,7 @@ void args_usage(char *complaint)
fprintf(stderr, "\tlist_installed List all and only the installed packages and description \n");
fprintf(stderr, "\tfiles <pkg> List all files belonging to <pkg>\n");
fprintf(stderr, "\tsearch <file|regexp> Search for a package providing <file>\n");
-#ifndef IPKG_LIB
+#ifndef OPKG_LIB
fprintf(stderr, "\tinfo [pkg|regexp [<field>]] Display all/some info fields for <pkg> or all\n");
fprintf(stderr, "\tstatus [pkg|regexp [<field>]] Display all/some status fields for <pkg> or all\n");
#else
@@ -273,7 +273,7 @@ void args_usage(char *complaint)
fprintf(stderr, "\t 1 normal messages (default)\n");
fprintf(stderr, "\t 2 informative messages\n");
fprintf(stderr, "\t 3 debug output\n");
- fprintf(stderr, "\t-f <conf_file> Use <conf_file> as the ipkg configuration file\n");
+ fprintf(stderr, "\t-f <conf_file> Use <conf_file> as the opkg configuration file\n");
fprintf(stderr, "\t-conf <conf_file> Default configuration file location\n");
fprintf(stderr, " is %s/%s\n", ARGS_DEFAULT_CONF_FILE_DIR, ARGS_DEFAULT_CONF_FILE_NAME);
fprintf(stderr, "\t-d <dest_name> Use <dest_name> as the the root directory for\n");
@@ -285,33 +285,33 @@ void args_usage(char *complaint)
fprintf(stderr, "\t-offline <offline_root> offline installation of packages.\n");
fprintf(stderr, "\t-verbose_wget more wget messages\n");
- fprintf(stderr, "\tForce Options (use when ipkg is too smart for its own good):\n");
+ fprintf(stderr, "\tForce Options (use when opkg is too smart for its own good):\n");
fprintf(stderr, "\t-force-depends Make dependency checks warnings instead of errors\n");
fprintf(stderr, "\t Install/remove package in spite of failed dependences\n");
- fprintf(stderr, "\t-force-defaults Use default options for questions asked by ipkg.\n");
+ fprintf(stderr, "\t-force-defaults Use default options for questions asked by opkg.\n");
fprintf(stderr, " (no prompts). Note that this will not prevent\n");
fprintf(stderr, " package installation scripts from prompting.\n");
- fprintf(stderr, "\t-force-reinstall Allow ipkg to reinstall a package.\n");
- fprintf(stderr, "\t-force-overwrite Allow ipkg to overwrite files from another package during an install.\n");
- fprintf(stderr, "\t-force-downgrade Allow ipkg to downgrade packages.\n");
+ fprintf(stderr, "\t-force-reinstall Allow opkg to reinstall a package.\n");
+ fprintf(stderr, "\t-force-overwrite Allow opkg to overwrite files from another package during an install.\n");
+ fprintf(stderr, "\t-force-downgrade Allow opkg to downgrade packages.\n");
fprintf(stderr, "\t-force_space Install even if there does not seem to be enough space.\n");
fprintf(stderr, "\t-noaction No action -- test only\n");
fprintf(stderr, "\t-nodeps Do not follow dependences\n");
fprintf(stderr, "\t-force-removal-of-dependent-packages\n");
- fprintf(stderr, "\t-recursive Allow ipkg to remove package and all that depend on it.\n");
+ fprintf(stderr, "\t-recursive Allow opkg to remove package and all that depend on it.\n");
fprintf(stderr, "\t-test No action -- test only\n");
fprintf(stderr, "\t-t Specify tmp-dir.\n");
fprintf(stderr, "\t--tmp-dir Specify tmp-dir.\n");
fprintf(stderr, "\n");
fprintf(stderr, "\tregexp could be something like 'pkgname*' '*file*' or similar\n");
- fprintf(stderr, "\teg: ipkg info 'libstd*' or ipkg search '*libop*' or ipkg remove 'libncur*'\n");
- /* -force-removal-of-essential-packages Let ipkg remove essential packages.
+ fprintf(stderr, "\teg: opkg info 'libstd*' or opkg search '*libop*' or opkg remove 'libncur*'\n");
+ /* -force-removal-of-essential-packages Let opkg remove essential packages.
Using this option is almost guaranteed to break your system, hence this option
is not even advertised in the usage statement. */
exit(1);
}
static void print_version(void)
{
- fprintf(stderr, "ipkg version %s\n", VERSION);
+ fprintf(stderr, "opkg version %s\n", VERSION);
}
View
@@ -46,7 +46,7 @@ struct args
typedef struct args args_t;
#define ARGS_DEFAULT_CONF_FILE_DIR "/etc"
-#define ARGS_DEFAULT_CONF_FILE_NAME "ipkg.conf"
+#define ARGS_DEFAULT_CONF_FILE_NAME "opkg.conf"
#define ARGS_DEFAULT_DEST NULL
#define ARGS_DEFAULT_FORCE_DEFAULTS 0
#define ARGS_DEFAULT_FORCE_DEPENDS 0
Oops, something went wrong.

0 comments on commit 0b7a99e

Please sign in to comment.