Changeset 3879

Timestamp:

01/18/08 12:28:48 (5 years ago)

Author:

thomas

Message:

• Rename ipkg to opkg

Location:

trunk/src/target/ipkg

Files:

• AUTHORS (modified) (1 diff)
• ChangeLog (modified) (91 diffs)
• INSTALL (modified) (1 diff)
• Makefile.am (modified) (4 diffs)
• README (modified) (1 diff)
• TODO (modified) (7 diffs)
• args.c (modified) (8 diffs)
• args.h (modified) (1 diff)
• conffile.c (modified) (4 diffs)
• conffile.h (modified) (1 diff)
• conffile_list.c (modified) (1 diff)
• configure.ac (modified) (3 diffs)
• familiar/control-unstripped.in (modified) (2 diffs)
• familiar/control.in (modified) (2 diffs)
• familiar/libopkg-control.in (moved) (moved from trunk/src/target/ipkg/familiar/libipkg-control.in) (2 diffs)
• familiar/libopkg-dev-control.in (moved) (moved from trunk/src/target/ipkg/familiar/libipkg-dev-control.in) (2 diffs)
• file_util.c (modified) (2 diffs)
• hash_table.c (modified) (5 diffs)
• hash_table.h (modified) (1 diff)
• intercept/depmod (modified) (1 diff)
• intercept/ldconfig (modified) (1 diff)
• intercept/update-modules (modified) (1 diff)
• libbb/libbb.h (modified) (1 diff)
• libbb/unarchive.c (modified) (3 diffs)
• libopkg.c (moved) (moved from trunk/src/target/ipkg/libipkg.c) (27 diffs)
• libopkg.h (moved) (moved from trunk/src/target/ipkg/libipkg.h) (3 diffs)
• libopkg.pc.in (moved) (moved from trunk/src/target/ipkg/libipkg.pc.in) (1 diff)
• md5.c (modified) (1 diff)
• nv_pair.c (modified) (1 diff)
• nv_pair_list.c (modified) (1 diff)
• opkg-frontend.c (moved) (moved from trunk/src/target/ipkg/ipkg-frontend.c) (3 diffs)
• opkg.c (moved) (moved from trunk/src/target/ipkg/ipkg.c) (7 diffs)
• opkg.h (moved) (moved from trunk/src/target/ipkg/ipkg.h) (3 diffs)
• opkg.h.in (moved) (moved from trunk/src/target/ipkg/ipkg.h.in) (3 diffs)
• opkg_cmd.c (moved) (moved from trunk/src/target/ipkg/ipkg_cmd.c) (84 diffs)
• opkg_cmd.h (moved) (moved from trunk/src/target/ipkg/ipkg_cmd.h) (2 diffs)
• opkg_conf.c (moved) (moved from trunk/src/target/ipkg/ipkg_conf.c) (34 diffs)
• opkg_conf.h (moved) (moved from trunk/src/target/ipkg/ipkg_conf.h) (4 diffs)
• opkg_configure.c (moved) (moved from trunk/src/target/ipkg/ipkg_configure.c) (4 diffs)
• opkg_configure.h (moved) (moved from trunk/src/target/ipkg/ipkg_configure.h) (2 diffs)
• opkg_download.c (moved) (moved from trunk/src/target/ipkg/ipkg_download.c) (16 diffs)
• opkg_download.h (moved) (moved from trunk/src/target/ipkg/ipkg_download.h) (2 diffs)
• opkg_extract_test.c (moved) (moved from trunk/src/target/ipkg/ipkg_extract_test.c) (2 diffs)
• opkg_hash_test.c (moved) (moved from trunk/src/target/ipkg/ipkg_hash_test.c) (2 diffs)
• opkg_install.c (moved) (moved from trunk/src/target/ipkg/ipkg_install.c) (109 diffs)
• opkg_install.h (moved) (moved from trunk/src/target/ipkg/ipkg_install.h) (2 diffs)
• opkg_message.c (moved) (moved from trunk/src/target/ipkg/ipkg_message.c) (3 diffs)
• opkg_message.h (moved) (moved from trunk/src/target/ipkg/ipkg_message.h) (2 diffs)
• opkg_remove.c (moved) (moved from trunk/src/target/ipkg/ipkg_remove.c) (17 diffs)
• opkg_remove.h (moved) (moved from trunk/src/target/ipkg/ipkg_remove.h) (2 diffs)
• opkg_upgrade.c (moved) (moved from trunk/src/target/ipkg/ipkg_upgrade.c) (8 diffs)
• opkg_upgrade.h (moved) (moved from trunk/src/target/ipkg/ipkg_upgrade.h) (2 diffs)
• opkg_utils.c (moved) (moved from trunk/src/target/ipkg/ipkg_utils.c) (2 diffs)
• opkg_utils.h (moved) (moved from trunk/src/target/ipkg/ipkg_utils.h) (2 diffs)
• pkg.c (modified) (28 diffs)
• pkg.h (modified) (5 diffs)
• pkg_depends.c (modified) (12 diffs)
• pkg_depends.h (modified) (1 diff)
• pkg_dest.c (modified) (4 diffs)
• pkg_dest.h (modified) (1 diff)
• pkg_dest_list.c (modified) (1 diff)
• pkg_extract.c (modified) (3 diffs)
• pkg_hash.c (modified) (23 diffs)
• pkg_hash.h (modified) (3 diffs)
• pkg_parse.c (modified) (5 diffs)
• pkg_src.c (modified) (1 diff)
• pkg_src_list.c (modified) (1 diff)
• pkg_vec.c (modified) (7 diffs)
• pkg_vec.h (modified) (1 diff)
• sprintf_alloc.c (modified) (1 diff)
• str_list.c (modified) (1 diff)
• str_util.c (modified) (1 diff)
• update-alternatives (modified) (4 diffs)
• user.c (modified) (3 diffs)
• void_list.c (modified) (1 diff)
• xregex.c (modified) (1 diff)
• xsystem.c (modified) (1 diff)

trunk/src/target/ipkg/AUTHORS

@@ -1 @@
-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>
 

trunk/src/target/ipkg/ChangeLog

@@ -35 +35 @@
 2006-02-02 pigi ( pigi@frumar.it)
         * Version update to 0.99.158
-        * Modified the way upgrade handle the removing of a package, to be sure that ipkg doesn't break busybox upgrade
+        * Modified the way upgrade handle the removing of a package, to be sure that opkg doesn't break busybox upgrade
         *          this should fix #1503
         
@@ -56 +56 @@
         * Version update to 0.99.155
         * Added a function to remove the package that is being upgraded.
-        * Fixed a problem when installing by hand. Now ipkg knows that a package has been selected by hand, 
+        * Fixed a problem when installing by hand. Now opkg knows that a package has been selected by hand, 
         *       and, if every check returns ok, it install the wanted package, instead of selecting one from feed.
         *       Moreover, now downgrade should works again.
-        * Fixed the "Replaces" bug. Now ipkg is able to replace a package also if it doesn't conflict.
+        * Fixed the "Replaces" bug. Now opkg is able to replace a package also if it doesn't conflict.
         * Other minor changes in debug options
 
@@ -69 +69 @@
 
 2005-07-29 pigi ( pigi@frumar.it)
-        * Applied a patch for the GNU tar compatibility . Now ipkg can handle filenames > 100 char.
+        * Applied a patch for the GNU tar compatibility . Now opkg can handle filenames > 100 char.
 
 2005-07-29 pigi ( pigi@frumar.it)
         * Version update to 0.99.153
-        * Fixed a problem with Provides:. Now ipkg is able to install foo when foo is provided by bar, and is able to determine the best candidate based on 
+        * Fixed a problem with Provides:. Now opkg is able to install foo when foo is provided by bar, and is able to determine the best candidate based on 
         * package name. This also fix #1328
 
@@ -90 +90 @@
 2005-05-11 pigi ( pigi@frumar.it)
         * Version update to 0.99.149
-        * Added the possibility to choice the ipkglibdir from configure ( --with-libipkgdir )
+        * Added the possibility to choice the opkglibdir from configure ( --with-libopkgdir )
 
 2005-04-10 pigi ( pigi@frumar.it)
@@ -101 +101 @@
 2005-03-30 pigi ( pigi@frumar.it)
         * Version update to 0.99.147
-        * Found a bug in ipkg_install when freeing a cursor 
+        * Found a bug in opkg_install when freeing a cursor 
 
 2005-03-28 pigi ( pigi@frumar.it)
         * Version update to 0.99.146
-        * Modified the ipkg_error messaging to collect all the messages at the end of the program
+        * Modified the opkg_error messaging to collect all the messages at the end of the program
 
 2005-03-26 pigi ( pigi@frumar.it)
@@ -112 +112 @@
 2005-03-14 pigi ( pigi@frumar.it)
         * Version update to 0.99.145
-        * Found a bug in ipkg remove when a package was depending in itself and ipkg where asked to "-recursive"
+        * Found a bug in opkg remove when a package was depending in itself and opkg where asked to "-recursive"
           This fix bug # 1301
         * A very little beautify in args.c
 
 2005-03-07 pigi ( pigi@frumar.it)
-        * Added the check for md5 in resolv_conf_file. Now ipkg ask for confirmation only it the files differ
+        * Added the check for md5 in resolv_conf_file. Now opkg ask for confirmation only it the files differ
 
 2005-02-22 pigi ( pigi@frumar.it)
         * Version update to 0.99.144
-        * A little fix suggested by drw in ipkg_conf.c
-        * Changed the ipkg.h to be build in automake for oe mechanism . This will enhance the building phase 
+        * A little fix suggested by drw in opkg_conf.c
+        * Changed the opkg.h to be build in automake for oe mechanism . This will enhance the building phase 
           by honouring the lib hierarchy choose by users
         * Changes in automake to honour the new building mechanism
@@ -128 +128 @@
 2005-02-20 pigi ( pigi@frumar.it)
         * Version update to 0.99.143
-        * libipkg.h: reverting the previous modify
-        * ipkg_conf.c: fixing a probable bug in list_dir that fix problems with opie-packagemanager ( tanks to drw for signaling)
+        * libopkg.h: reverting the previous modify
+        * opkg_conf.c: fixing a probable bug in list_dir that fix problems with opie-packagemanager ( tanks to drw for signaling)
 
 2005-02-20 pigi ( pigi@frumar.it)
-        * libipkg.h: added some define to fix the broken external interface after 0.99.139 and lists_dir
+        * libopkg.h: added some define to fix the broken external interface after 0.99.139 and lists_dir
 
 2005-02-17 pigi ( pigi@frumar.it)
@@ -143 +143 @@
 2005-02-06 pigi ( pigi@frumar.it)
         * Version update to 0.99.141
-        * Added space in ipkg_message to give more readible messages
+        * Added space in opkg_message to give more readible messages
         * Corrected a problem when creating the directories in pkg_dest_init
 
 2005-02-05 pigi ( pigi@frumar.it)
         * Version update to 0.99.140
-        * Fixed the bug in ipkg_conf for a wrong pointer.
+        * Fixed the bug in opkg_conf for a wrong pointer.
 
 2005-02-05 pigi ( pigi@frumar.it)
         * Version update to 0.99.139
-        * Fixed the "replaces" problem  reported by pb_. Now ipkg is able to resolve a "replace/conflict" reference
+        * Fixed the "replaces" problem  reported by pb_. Now opkg is able to resolve a "replace/conflict" reference
         * Added the possibility to keep the lists file in a different location. Fullfill enh #1276
 
@@ -164 +164 @@
 
 2005-01-14 pigi ( pigi@frumar.it)
-        * ipkg_install.c: applied patch from rjt@cambridgebroadband.com to remove some c99ism 
+        * opkg_install.c: applied patch from rjt@cambridgebroadband.com to remove some c99ism 
 
 2005-01-14 jamey ( jamey@handhelds.org )
@@ -192 +192 @@
         * Added a new option for listing only the installed packages. Asked by pb_ but really important
         * Little modification to autoconfigure.sh 
-        * removed fileutils dependencies that has disappeared from 0.8 in control-cl.in  control-unstripped.in libipkg-control.in  
+        * removed fileutils dependencies that has disappeared from 0.8 in control-cl.in  control-unstripped.in libopkg-control.in  
 
 2004-11-18 pigi ( pigi@frumar.it)
@@ -206 +206 @@
         * Version update to 0.99.131
         * Added a lot of debug info in DEBUG2
-        * Added a check in ipkg_install.c to permit replacing of existing file when installing a package
-        * from a file ( not an upgrade ) when ipkg find a file clash but the owner of the package is the 
+        * Added a check in opkg_install.c to permit replacing of existing file when installing a package
+        * from a file ( not an upgrade ) when opkg find a file clash but the owner of the package is the 
         * same. That should fix the #1246
 
@@ -219 +219 @@
 2004-09-01 pigi ( pigi@frumar.it)
         * Applied patches from pb_ (bug #1244)
-        * Added EXTRADIST = ipkg.c and others in Makefile.am as in ipkg.0.99.xxx.tar.gz the ipkg.c was missing. ( 
+        * Added EXTRADIST = opkg.c and others in Makefile.am as in opkg.0.99.xxx.tar.gz the opkg.c was missing. ( 
           reported by odvard12@yahoo.com )
         * Version update to 0.99.129
@@ -225 +225 @@
 2004-08-19 Florian <florian.boor@kernelconcepts.de>
         * Version update to 0.99.128
-        * libipkg.c, ipkg_cmd.c: Fixed return value zero if installation
+        * libopkg.c, opkg_cmd.c: Fixed return value zero if installation
           failed. Changed text because failing to install a package
           is not necessarily a bug :-)
@@ -245 +245 @@
 2004-06-12 florian <florian.boor@kernelconcepts.de>
         * Makefile.am: Added some missing headers to the list.
-        * libipkg.pc.in: Fixed hardcoded prefix... tsts
+        * libopkg.pc.in: Fixed hardcoded prefix... tsts
 2004-06-12 pigi ( pigi@frumar.it)
         * pb_ patch for setuid bit in unarchive
@@ -256 +256 @@
         * configure.ac: updated to 0.99.124
         * import the kergoth patch for Makefile.am to fix the linking problems on arch <> arm
-        * added the ipkg remove <regexp> feature.
-        * fixed the ipkg usage message, 'cause in "ifdef LIBIPKG" we don't have the ipkg info field version.
+        * added the opkg remove <regexp> feature.
+        * fixed the opkg usage message, 'cause in "ifdef LIBOPKG" we don't have the opkg info field version.
         * added the message "No package removed" if no package has been removed. This to avoid misunderstanding
           with the successfully done message at the exit of execution.
@@ -265 +265 @@
 2004-05-16 pigi ( pigi@frumar.it)
         * configure.ac: updated to 0.99.122-2
-        * New subrelease released to correct the problem for dependencies (libipkg >= 0.99.122-1) in ipkg control file
+        * New subrelease released to correct the problem for dependencies (libopkg >= 0.99.122-1) in opkg control file
 2004-05-14 pigi ( pigi@frumar.it)
         * configure.ac: updated to 0.99.122-1
@@ -272 +272 @@
 2004-05-10 pigi ( pigi@frumar.it)
         * configure.ac: updated to 0.99.122
-        * pb_, cworth and I discussed a bit on ipkg output to users. We agreed on removing some confusing
+        * pb_, cworth and I discussed a bit on opkg output to users. We agreed on removing some confusing
         * messages, moving them to a debug level of verbosity.
-        * I do added also some message to user indicating the phase ipkg is in, and a global ending message
+        * I do added also some message to user indicating the phase opkg is in, and a global ending message
         * informing the user for the status of operation.
         * This fixes the #1206, and hopefully does not introduce others ;-) 
@@ -296 +296 @@
 2004-03-17 pigi ( pigi@frumar.it)
         *  Added the implement for Essential in status file. This is needed to avoid the unintentional remove
-           of essential packages. In effect the command "ipkg remove ipkg" worked without problems, but then
+           of essential packages. In effect the command "opkg remove opkg" worked without problems, but then
            it was difficult to reinstall. This fix the bug # 867
 2004-03-15 jamey <jamey@handhelds.org>
@@ -313 +313 @@
            This fixes the bug #1099
 2004-03-07 pigi ( pigi@frumar.it)
-        *  Minimal changes for a clean compile in libipkg.c ( so we can close the bug# 1119 )
+        *  Minimal changes for a clean compile in libopkg.c ( so we can close the bug# 1119 )
 2004-03-03 pigi ( pigi@frumar.it)
         * Missing \n in Size and Source Fields.
 2004-03-03 pigi ( pigi@frumar.it)
-        * Florian noticed a free missiing in ipkg_cmd.c ( should sleep more at night ) 
+        * Florian noticed a free missiing in opkg_cmd.c ( should sleep more at night ) 
           it was in an (almost) unsed part of the code ( old code ) but, just in case...
         * Changed a comment in pkg.c ( it was in italian ) and added a bit of explain in 
@@ -324 +324 @@
         * configure.ac: updated to 0.99.116
         * pkg.h: from Pigi: pkg_formatted_info and pkg_formatted_field now allocate the strings they fill in
-        * pkg.c, ipkg_cmd.c: from Pigi: updated to the new pkg.h interface 
+        * pkg.c, opkg_cmd.c: from Pigi: updated to the new pkg.h interface 
 2004-02-29 florian <florian.boor@kernelconcepts.de>
         pkg.c: Pigi and me poked around a little bit and located the cause of
@@ -333 +333 @@
 2004-02-24 jamey <jamey@handhelds.org>
         * configure.ac: updated to 0.99.115
-        * ipkg_cmd.c: segv caught by pigi: buffer freed in loop but used on next iterations.  bug squashed.
+        * opkg_cmd.c: segv caught by pigi: buffer freed in loop but used on next iterations.  bug squashed.
         * user.c: realloc question buffer if it is too short so that messages are not truncated.
 2004-02-20 jamey <jamey@handhelds.org>
@@ -340 +340 @@
 2004-02-19 jamey <jamey.hicks@hp.com>
         * configure.ac: update to 0.99.113
-        * libipkg.c: patch from drw to fix ipkg list
+        * libopkg.c: patch from drw to fix opkg list
 2004-02-19 florian <florian.boor@kernelconcepts.de>
         * Some minor changes to make code compile on more compilers.
@@ -351 +351 @@
 2004-01-23 florian <florian.boor@kernelconcepts.de>
         * Applied Dan's patch that adds a package download command to
-          libipkg.      
+          libopkg.      
 2004-01-20 florian <florian.boor@kernelconcepts.de>
         * Applied Dan's changes to work incuded from a C++ app. 
 2004-01-15 jamey
         * configure.ac: updated to 0.99.110
-        * libipkg.c: added default callbacks for output
-        * ipkg_conf.c: default verbosity to 1
+        * libopkg.c: added default callbacks for output
+        * opkg_conf.c: default verbosity to 1
 2004-01-12 jamey
         * configure.ac: updated to 0.99.109
-        * ipkg_install.c: fix potential segv sprintf_alloc with fewer args than required by format string (yay valgrind)
+        * opkg_install.c: fix potential segv sprintf_alloc with fewer args than required by format string (yay valgrind)
         * sprintf_alloc.c: add null pointer checking
 2004-01-12 jamey
         * configure.ac: updated to 0.99.108
-        * Makefile.am, familiar/: use ipkg-cl as default executable, install as ipkg via update-alternatives
+        * Makefile.am, familiar/: use opkg-cl as default executable, install as opkg via update-alternatives
 2004-01-12 jamey
         * configure.ac: updated to 0.99.107
@@ -373 +373 @@
 
 2003-12-02 florian <florian.boor@kernelconcepts.de>
-        * Added familiar/ipkg-cl.control.in, which is a prototype of
-          control file for ipkg-cl package creation.
+        * Added familiar/opkg-cl.control.in, which is a prototype of
+          control file for opkg-cl package creation.
 2003-12-01 florian <florian.boor@kernelconcepts.de>
-        * added ipkg command line tool using libipkg, binary is known as ipkg-cl
-        * ipkg-frontend.c: source for this tool
+        * added opkg command line tool using libopkg, binary is known as opkg-cl
+        * opkg-frontend.c: source for this tool
         * libbb/Makefile.am: Removed changing of CFLAGS, this avoids a nasty warning.
-        * Makefile.am: Same fix and addition of new target creating ipkg-cl.
+        * Makefile.am: Same fix and addition of new target creating opkg-cl.
         * removed ltmain.sh, libtool which seem to be created by autostuff
         
 2003-12-01 jamey
         * configure.ac: updated to 0.99.106
-        * pkg.c, ipkg_conf.c: check for null pointers (null pkg->dest in particular)
+        * pkg.c, opkg_conf.c: check for null pointers (null pkg->dest in particular)
 2003-11-11 jamey
         * configure.ac: updated to 0.99.105
-        * ipkg_conf.c: added verbosity option to conf file
+        * opkg_conf.c: added verbosity option to conf file
 2003-11-11 jamey
         * configure.ac: updated to 0.99.104
-        * ipkg_install.c: removed spurious calls to fflush, remove obsolete maintainer scripts on upgrade
-        * ipkg_remove.c: remove unused function: remove_conffiles
+        * opkg_install.c: removed spurious calls to fflush, remove obsolete maintainer scripts on upgrade
+        * opkg_remove.c: remove unused function: remove_conffiles
 2003-11-11 jamey
         * configure.ac: updated to 0.99.103
-        * libipkg.pc.in, configure.ac: pkgconfig for libipkg
-        * ipkg_conf.c, pkg.c: check for error on fopen
+        * libopkg.pc.in, configure.ac: pkgconfig for libopkg
+        * opkg_conf.c, pkg.c: check for error on fopen
         * pkg_hash.c: reduced verbosity
         * libtool: arm-linux-strip does not support --strip-debug on .a files
 2003-11-10 jamey
         * configure.ac: updated to 0.99.102
-        * ipkg_cmd.c: compute architecture_priority of packages in database before doing download command
-        * conffile.c file_util.[ch] ipkg_install.c: better separation of installation root filenames and actual filenames
+        * opkg_cmd.c: compute architecture_priority of packages in database before doing download command
+        * conffile.c file_util.[ch] opkg_install.c: better separation of installation root filenames and actual filenames
         * pkg.h: added prototype for pkg_free_installed_files
 2003-11-10 jamey
         * configure.ac: updated to 0.99.101
-        * libipkg changes
+        * libopkg changes
         * generate .list files from file_hash
 2003-11-05 jamey
         * configure.ac: updated to 0.99.100
-        * ipkg_install.c: fix segv: was passing conflictee->parent instead of conflictee
+        * opkg_install.c: fix segv: was passing conflictee->parent instead of conflictee
 2003-10-08 jamey
         * configure.ac: updated to 0.99.99
-        * ipkg_install.c: use the root_dir after stripping off offline_root prefix
+        * opkg_install.c: use the root_dir after stripping off offline_root prefix
 2003-10-08 jamey
         * configure.ac: updated to 0.99.98
         * pkg_hash.c: fixed segv if replaced_by->len was 0
-        * ipkg_cmd.c: ipkg remove with no arguments will remove non-user leaf packages
-        * ipkg_remove.[ch]: export pkg_has_installed_dependents
+        * opkg_cmd.c: opkg remove with no arguments will remove non-user leaf packages
+        * opkg_remove.[ch]: export pkg_has_installed_dependents
         * pkg_depends.c: add pkg->parent to pkg->provides
-        * ipkg_install.c: strip offline_root prefix off of conffile name so comparing the md5sums should work
+        * opkg_install.c: strip offline_root prefix off of conffile name so comparing the md5sums should work
         * pkg.c: missing comma added
 2003-10-01 jamey
         * configure.ac: updated to 0.99.97
-        * ipkg_cmd.c: added whatdependsrec command to show what recursively depends on a package or packages
+        * opkg_cmd.c: added whatdependsrec command to show what recursively depends on a package or packages
         * pkg_vec.[ch]: added pkg_vec_clear_marks and pkg_vec_mark_if_matches
         * args.c: usage string updated
 2003-09-28 jamey
         * configure.ac: updated to 0.99.96
-        * ipkg_conf.c: adjusted verbosity
-        * ipkg_install.c: only remove replacee if it is also conflicted, per debian standard
+        * opkg_conf.c: adjusted verbosity
+        * opkg_install.c: only remove replacee if it is also conflicted, per debian standard
         * pkg_depends.c: only add to replaced_by if it also conflicts, per debian standard
                 added pkg_provides, pkg_replaces, pkg_conflicts
@@ -435 +435 @@
 2003-09-28 jamey
         * configure.ac: updated to 0.99.95
-        * args.[ch], ipkg_cmd.c, ipkg_conf.[ch], ipkg_download.c, ipkg_install.c, ipkg_remove.c, pkg.[ch]:
-           Implemented -test mode for ipkg.
+        * args.[ch], opkg_cmd.c, opkg_conf.[ch], opkg_download.c, opkg_install.c, opkg_remove.c, pkg.[ch]:
+           Implemented -test mode for opkg.
 2003-09-28 jamey
         * configure.ac: updated to 0.99.94
@@ -443 +443 @@
 2003-09-26 jamey
         * configure.ac: updated to 0.99.93
-        * ipkg_install.c: corrected message level depending on conf->force_depend
-        * ipkg_conf.c: check for duplicate src entries
+        * opkg_install.c: corrected message level depending on conf->force_depend
+        * opkg_conf.c: check for duplicate src entries
         * nv_pair_list.[ch]: added nv_pair_list_find
 2003-09-16 jamey
@@ -463 +463 @@
         * pkg_extract.c: use installed_file list if it exists in pkg_extract_data_file_names_to_file
         * pkg.[ch]: added pkg_write_filelist() and pkg_write_changed_filelists()
-        * ipkg_remove.c: do not call ipkg_conf_write_status_files from ipkg_remove
-        * ipkg_install.c: use ipkg_write_filelist()
+        * opkg_remove.c: do not call opkg_conf_write_status_files from opkg_remove
+        * opkg_install.c: use opkg_write_filelist()
         * ipgk_cmd.c: after writing status file, write any changed pkg filelists
 2003-08-20 11:02  jamey
@@ -472 +472 @@
         * configure.ac: updated to 0.99.88
         * pkg_hash: bug 942, declare internal induction variable
-        * ipkg_cmd.c, ipkg_conf.[ch], pkg_src.[ch], pkg_src_list.[ch]: bug 604, support Packages.gz
+        * opkg_cmd.c, opkg_conf.[ch], pkg_src.[ch], pkg_src_list.[ch]: bug 604, support Packages.gz
 2003-08-06 18:34  jamey
         * configure.ac: updated to 0.99.87
@@ -480 +480 @@
 2003-07-11 18:34  jamey
         * configure.ac: updated to 0.99.86
-        * ipkg.h, ipkg_cmd.c, ipkg_configure.c, ipkg_install.c, ipkg_remove.c: only write status file if something changed.
+        * opkg.h, opkg_cmd.c, opkg_configure.c, opkg_install.c, opkg_remove.c: only write status file if something changed.
 2003-07-11 18:34  jamey
         * configure.ac: updated to 0.99.85
         * pkg.c, pkg.h, pkg_depends.c, pkg_depends.h, pkg_parse.c: bug 885:
           add recommends and suggests
-        * args.c, ipkg_cmd.c, ipkg_cmd.h: add ipkg configure command
+        * args.c, opkg_cmd.c, opkg_cmd.h: add opkg configure command
         * pkg_vec.c: apply patch for bug 883
 2003-05-11 Jamey Hicks <jamey@handhelds.org>
         * configure.ac: updated to 0.99.84
-        * pkg.c, ipkg-compare-versions.c: fix problem where . and - were not treated as separators in version comparison
+        * pkg.c, opkg-compare-versions.c: fix problem where . and - were not treated as separators in version comparison
 2003-04-11 Jamey Hicks <jamey@handhelds.org>
         * configure.ac: updated to 0.99.83
-        * ipkg_install.c: use pkg->installed_size instead of pkg->size
-        * ipkg_cmd.c, ipkg_conf.c: put lists under offline_root if specified
+        * opkg_install.c: use pkg->installed_size instead of pkg->size
+        * opkg_cmd.c, opkg_conf.c: put lists under offline_root if specified
 2003-04-11 Jamey Hicks <jamey@handhelds.org>
         * configure.ac: updated to 0.99.82
@@ -508 +508 @@
         * configure.ac: updated to 0.99.79
         * pkg_hash.c: default architecture to host_cpu if unspecified
-        * ipkg_install.c, ipkg_download.c: refuse to install package with no architecture
+        * opkg_install.c, opkg_download.c: refuse to install package with no architecture
 2003-04-07 Jamey Hicks <jamey@handhelds.org>
         * configure.ac: updated to 0.99.78
-        * args.[ch], ipkg_conf.[ch]: added query_all (-A)
-        * ipkg_cmd.c: finished implementing whatdepends, whatrequires, whatprovides, and whatconflicts
+        * args.[ch], opkg_conf.[ch]: added query_all (-A)
+        * opkg_cmd.c: finished implementing whatdepends, whatrequires, whatprovides, and whatconflicts
 2003-04-03 Jamey Hicks <jamey@handhelds.org>
         * configure.ac: updated to 0.99.77
-        * ipkg_cmd.c: implemented whatdepends
-        * ipkg_conf.c: fixed typo
+        * opkg_cmd.c: implemented whatdepends
+        * opkg_conf.c: fixed typo
 2003-04-03 Jamey Hicks <jamey@handhelds.org>
         * configure.ac: updated to 0.99.76
         * args.c: was zeroing args structure too late
-        * ipkg_conf.c: test for existence of /etc/ipkg.conf before trying to load it
+        * opkg_conf.c: test for existence of /etc/opkg.conf before trying to load it
 2003-04-03 Jamey Hicks <jamey@handhelds.org>
         * configure.ac: updated to 0.99.75
@@ -527 +527 @@
 2003-04-03 Jamey Hicks <jamey@handhelds.org>
         * configure.ac: updated to 0.99.74
-        * ipkg_cmd.c: avoid segv by only calling xregfree after xregcomp was called
+        * opkg_cmd.c: avoid segv by only calling xregfree after xregcomp was called
         * pkg_hash.c: prefer pkgs that are marked hold/prefer, next
         abstract pkgs that are installed, next latest pkg if one provider,
@@ -540 +540 @@
         * configure.ac: updated to 0.99.71
         * pkg.c: Added pkg_name_version_and_architecture_compare and abstract_pkg_name_compare
-        * ipkg_cmd.c: allow multiple fields for info and status command.
+        * opkg_cmd.c: allow multiple fields for info and status command.
         Allow posix regexp's for package name in status, info, and list
         commands.
@@ -548 +548 @@
 2003-04-02 Jamey Hicks <jamey@handhelds.org>
         * configure.ac: updated to 0.99.70
-        * args.c, args.h, ipkg_conf.c, ipkg_conf.h, ipkg_install.c: implemented nodeps option
+        * args.c, args.h, opkg_conf.c, opkg_conf.h, opkg_install.c: implemented nodeps option
         * pkg_vec.[ch]: added [abstract_]pkg_vec_{contains,sort}
         * pkg.c: print which script not being run in offline root mode
@@ -554 +554 @@
         * configure.ac: updated to 0.99.69
         * pkg_vec.c: compare architecture to architecture, not to name
-        * ipkg_utils.c: do not exit, instead return NULL
-        * ipkg_install.c: do not exit, instead return -EINVAL
-        * ipkg_download.c: make sure to set pkg dest
-        * ipkg_cmd.c: notice instead of info for writing status file message
+        * opkg_utils.c: do not exit, instead return NULL
+        * opkg_install.c: do not exit, instead return -EINVAL
+        * opkg_download.c: make sure to set pkg dest
+        * opkg_cmd.c: notice instead of info for writing status file message
 2003-04-02 Jamey Hicks <jamey@handhelds.org>
         * configure.ac: updated to 0.99.68
@@ -563 +563 @@
 2003-04-01 Jamey Hicks <jamey@handhelds.org>
         * configure.ac: updated to 0.99.67
-        * ipkg_install.c: one last check for supported architecture in ipkg_install_pkg
+        * opkg_install.c: one last check for supported architecture in opkg_install_pkg
         * pkg.c: make pkg_print_field less fragile by using strcasecmp,
         added support to print Conflicts
         * pkg_hash.c: if multiple candidates with right architecture
         satisfy constraint_fcn, return latest version
-        * ipkg_cmd.c: when verbosity > 1, show if conffiles have been
+        * opkg_cmd.c: when verbosity > 1, show if conffiles have been
         modified in info command
         * hash_table.c, hash_table.h: count number of elements in hash
@@ -581 +581 @@
 2003-04-01 Jamey Hicks <jamey@handhelds.org>
         * configure.ac: updated to 0.99.65
-        * ipkg_cmd.c, ipkg_conf.c: applied ipkg dest installation patch from Ben Lau <benlau@linux.org.hk>
-        * ipkg_cmd.c: fixed probably segv when using offline_root, fixed problem installing from local file.
-        * ipkg_conf.c: 
-          - Do not add default architectures if ipkg configuration files include architecture definitions.
-          - Look for /etc/ipkg/*.conf under offline root if using offline root mode
+        * opkg_cmd.c, opkg_conf.c: applied opkg dest installation patch from Ben Lau <benlau@linux.org.hk>
+        * opkg_cmd.c: fixed probably segv when using offline_root, fixed problem installing from local file.
+        * opkg_conf.c: 
+          - Do not add default architectures if opkg configuration files include architecture definitions.
+          - Look for /etc/opkg/*.conf under offline root if using offline root mode
         * void_list.h: added void_list_empty()
         * nv_pair_list.h: added nv_pair_list_empty()
 2003-03-28 14:30  Jamey Hicks <jamey@handhelds.org> 
         * configure.ac: 0.99.64
-        * pkg_hash.c: change fprintf stderr to ipkg_message
+        * pkg_hash.c: change fprintf stderr to opkg_message
         * pkg.h: added SF_MARKED and abstract_pkg_t state_flag field
         * pkg.c: include Provides, Replaces, and Architecture in status
         file
-        * ipkg_remove.c: make sure to print each dependent package only
+        * opkg_remove.c: make sure to print each dependent package only
         once
-        * ipkg_message.h: added IPKG_DEBUG2
-        * ipkg_install.c: modify message and level depending on
+        * opkg_message.h: added OPKG_DEBUG2
+        * opkg_install.c: modify message and level depending on
         force_depends
-        * ipkg_cmd.c: call pkg_info_preinstall_check before any
+        * opkg_cmd.c: call pkg_info_preinstall_check before any
         install/upgrade/remove action
         * ChangeLog, autoconfigure.sh, includes.h,
-        ipkg_conf.c, ipkg_remove.c, pkg.c, pkg.h, update-alternatives,
+        opkg_conf.c, opkg_remove.c, pkg.c, pkg.h, update-alternatives,
         xregex.h: applied kergoth's update-alternatives patch
-        * ipkg_cmd.c, ipkg_remove.c: remove maybe_broken_removal... which
+        * opkg_cmd.c, opkg_remove.c: remove maybe_broken_removal... which
         was an expensive no-op; before removing package, make sure that
         nothing is installed that depends on the apkgs **provided** by a
@@ -613 +613 @@
 2003-03-27 18:26  jamey
         * autoconfigure.sh: accidentally committed /usr/local/bin calls
-        * ipkg_conf.c: needed a strdup, set default verbosity back to 0
+        * opkg_conf.c: needed a strdup, set default verbosity back to 0
         * familiar/postinst: default architecture priorities
-        * Makefile.in, autoconfigure.sh, ipkg_cmd.c, ipkg_conf.c, pkg.c:
+        * Makefile.in, autoconfigure.sh, opkg_cmd.c, opkg_conf.c, pkg.c:
         both name and value in nv_pair_list must be actual strings
         * pkg_hash.c: do not try to invoke NULL constraint_fcn
-        * ipkg_install.c: added file_hash_{set,get}_file_owner, created
+        * opkg_install.c: added file_hash_{set,get}_file_owner, created
         check_downgrade
-        * ipkg_conf.c, ipkg_conf.h, ipkg_remove.c, pkg.c, pkg_hash.c,
+        * opkg_conf.c, opkg_conf.h, opkg_remove.c, pkg.c, pkg_hash.c,
         pkg_hash.h: added file_hash_{set,get}_file_owner
         * hash_table.c: check for key already being present in
         hash_table_insert
         * configure.ac: update to 0.99.63
-        * ipkg_hash_test.c: update due to new prototypes
-        * ipkg_conf.c: missed a conversion from str_list to nv_pair_list
-        * ipkg_install.c: minor tweaks
+        * opkg_hash_test.c: update due to new prototypes
+        * opkg_conf.c: missed a conversion from str_list to nv_pair_list
+        * opkg_install.c: minor tweaks
         * pkg.c, pkg.h: added pkg_info_preinstall_check to update
         pkg->arch_priority
@@ -633 +633 @@
         pkg_hash_fetch_best_installation_candidate in
         pkg_hash_fetch_unsatisfied_dependencies
-        * pkg_hash.c, pkg_hash.h, ipkg_cmd.c, ipkg_upgrade.c: split
+        * pkg_hash.c, pkg_hash.h, opkg_cmd.c, opkg_upgrade.c: split
         pkg_hash_fetch_best_installation_candidate into a by name and a
         constrained version
-        * ipkg_install.c: block SIGINT while doing core of package
+        * opkg_install.c: block SIGINT while doing core of package
         installation (single package)
-        * ipkg_conf.c, ipkg_conf.h: support for architecture priority
+        * opkg_conf.c, opkg_conf.h: support for architecture priority
         * pkg_depends.c: cleanup, reindent
         * pkg.c, pkg.h: support for architecture_priority
-        * ipkg_cmd.c: installed SIGINT handler when upgrading or removing,
+        * opkg_cmd.c: installed SIGINT handler when upgrading or removing,
         support for architecture_priority
         * pkg_hash.c: added support for architecture priority, reindented
@@ -647 +647 @@
 2003-03-24  Jamey Hicks <jamey@handhelds.org>
         * configure.ac: updated to 0.99.61
-        * familiar/postinst: mkdir -p /etc/ipkg
+        * familiar/postinst: mkdir -p /etc/opkg
 2003-03-24  Jamey Hicks <jamey@handhelds.org>
         * configure.ac: updated to 0.99.61
-        * ipkg_conf.c: read configuration from all *.conf files in /etc/ipkg/
-        * familiar/postinst: create /etc/ipkg/*.conf according to platform ipkg is installed on
+        * opkg_conf.c: read configuration from all *.conf files in /etc/opkg/
+        * familiar/postinst: create /etc/opkg/*.conf according to platform opkg is installed on
 2003-03-20  Jamey Hicks <jamey@handhelds.org>
         * configure.ac: updated to 0.99.60
         * various: added support for package architectures
         * configure.ac: do not test for malloc
-2003-03-17  Aman Gupta <ipkg@themastermind1.net>
+2003-03-17  Aman Gupta <opkg@themastermind1.net>
         * configure.ac: updated to 0.99.59
         * args.c: show all verbosity levels in usage info
         * args.h: changed default verbosity level to 1
-        * ipkg_cmd.c: ipkg_multiple_files_scan() was useless, switch to using 
-        ipkg_prepare_url_for_install()
-        * ipkg_install.c: fix --force-reinstall
-        * ipkg_remove.c: stop removing of modified conffiles
+        * opkg_cmd.c: opkg_multiple_files_scan() was useless, switch to using 
+        opkg_prepare_url_for_install()
+        * opkg_install.c: fix --force-reinstall
+        * opkg_remove.c: stop removing of modified conffiles
 2003-03-04  Jamey Hicks <jamey@handhelds.org>
         * configure.ac: updated to 0.99.56
-        * ipkg_message.c: show error messages by default
-        * ipkg_message.h: protect against multiple inclusion
-        * conffile.[ch]: switch to ipkg_message, added conf argument to conffile_has_been_modified
-        * ipkg.h: move EXTENSION macros here
+        * opkg_message.c: show error messages by default
+        * opkg_message.h: protect against multiple inclusion
+        * conffile.[ch]: switch to opkg_message, added conf argument to conffile_has_been_modified
+        * opkg.h: move EXTENSION macros here
         * pkg_depends.c: minor cleanup
         * pkg.h: added prefer and obsolete flags
         * pkg.c: parse and unparse SF_PREFER and SF_OBSOLETE
-        * ipkg_install.[ch]: 
+        * opkg_install.[ch]: 
           - added {pkg,name}_mark_dependencies_for_installation, 
           - added conf argument to conffile_has_been_modified 
-          - missing ifdef IPKG_DEBUG_NO_TMP_CLEANUP
-        * ipkg_remove.c: added conf argument to conffile_has_been_modified
-        * ipkg_download.c: added ipkg_prepare_for_install
+          - missing ifdef OPKG_DEBUG_NO_TMP_CLEANUP
+        * opkg_remove.c: added conf argument to conffile_has_been_modified
+        * opkg_download.c: added opkg_prepare_for_install
 2003-03-01  Jamey Hicks <jamey@handhelds.org>
         * configure.ac: updated to 0.99.55
-        * ipkg.h: wrap #if 0 around definition of of IPKG_DEBUG_NO_TMP_CLEANUP
+        * opkg.h: wrap #if 0 around definition of of OPKG_DEBUG_NO_TMP_CLEANUP
 2003-03-01  Jamey Hicks <jamey@handhelds.org>
         * configure.ac: updated to 0.99.54
-        * ipkg_install.c: make old package SW_DEINSTALL during ipkg installation
-        * ipkg_cmd.[ch]: added some code to install packages marked SW_INSTALL, but have not enabled this code yet.
+        * opkg_install.c: make old package SW_DEINSTALL during opkg installation
+        * opkg_cmd.[ch]: added some code to install packages marked SW_INSTALL, but have not enabled this code yet.
 2003-03-01  Jamey Hicks <jamey@handhelds.org>
         * configure.ac: updated to 0.99.53
         * pkg_depends.c: let SW_INSTALL satisfy dependences (instead of SS_INSTALL)
 2003-03-01  Daniele Nicolodi <daniele@grinta.net>       
-        * ipkg_install.c: indentation fixes and finish switch to message
+        * opkg_install.c: indentation fixes and finish switch to message
         facility
-        * ipkg_cmd.c: indentation fixes, switch to message facility and
+        * opkg_cmd.c: indentation fixes, switch to message facility and
         some code cleanup
-        * ipkg_message.c (ipkg_message): check for a NULL *conf parameter
-        * ipkg_message.h: renamed IPKG_ERR in IPKG_ERROR
+        * opkg_message.c (opkg_message): check for a NULL *conf parameter
+        * opkg_message.h: renamed OPKG_ERR in OPKG_ERROR
 2003-02-28  Jamey Hicks <jamey@handhelds.org> (patch from Daniele Nicolodi <daniele@grinta.net>)
         * configure.ac: incremented version to 0.99.5
-        * ipkg_message.[ch]: added message facility
+        * opkg_message.[ch]: added message facility
         * args.[ch]: verbosity control
-        * ipkg_conf.[ch]: verbosity control
-        * ipkg_install.c: switch to using message factility
+        * opkg_conf.[ch]: verbosity control
+        * opkg_install.c: switch to using message factility
 2003-02-28  Jamey Hicks <jamey@handhelds.org>
         * configure.ac: incremented version to 0.99.51
-        * ipkg_cmd.c: added ipkg_statisfy_all_dependences, called after
+        * opkg_cmd.c: added opkg_statisfy_all_dependences, called after
         install/upgrade of packages to handle packages that were split and
         no longer provide all the resources they used to provide.
 2003-02-27  Jamey Hicks <jamey@handhelds.org>
         * configure.ac: incremented version to 0.99.50
-        * ipkg_cmd.c: write out status after doing an upgrade
+        * opkg_cmd.c: write out status after doing an upgrade
 2003-02-27  Jamey Hicks <jamey@handhelds.org> (another patch from pb)
         * configure.ac: incremented version to 0.99.49
@@ -715 +715 @@
 2003-02-27  Jamey Hicks <jamey@handhelds.org> (another patch from pb)
         * configure.ac: incremented version number to 0.99.48
-        * args.c: added help for ipkg flags sub-command
-        * ipkg_cmd.c: added ipkg_flag_cmd, do not upgrade package marked hold
-        * ipkg_install.c: do not remove obsolesced files if old_pkg is flagged noprune
-        * ipkg_remove.c: pkg->state_flag is a bitvector now
+        * args.c: added help for opkg flags sub-command
+        * opkg_cmd.c: added opkg_flag_cmd, do not upgrade package marked hold
+        * opkg_install.c: do not remove obsolesced files if old_pkg is flagged noprune
+        * opkg_remove.c: pkg->state_flag is a bitvector now
         * pkg.c: pkg->state_flag is a bitvector now
         * pkg.h: pkg->state_flag is a bitvector now
@@ -731 +731 @@
         * configure.ac: incremented version to 0.99.45
         * file_util.c: include space for null in line_size
-        * ipkg_cmd.c: sigint handler while configuring packages
-        * ipkg_install.c: state_status != SS_INSTALLED and != SS_UNPACKED
-        * ipkg_remove.c: missing i++
+        * opkg_cmd.c: sigint handler while configuring packages
+        * opkg_install.c: state_status != SS_INSTALLED and != SS_UNPACKED
+        * opkg_remove.c: missing i++
         * pkg.c: do not run scripts in offline_root mode
         * pkg_depends.c: every package provides itself
@@ -742 +742 @@
 2002-11-26  Jamey Hicks <jamey@handhelds.org>
         * configure.ac: incremented version number to 0.99.43
-        * ipkg_install.c: completely skip the space check when -force_space asserted
+        * opkg_install.c: completely skip the space check when -force_space asserted
 2002-11-23  Jamey Hicks <jamey@handhelds.org>
         * configure.ac: incremented version number to 0.99.42
@@ -748 +748 @@
 2002-11-23  Jamey Hicks <jamey@handhelds.org>
         * configure.ac: incremented version number to 0.99.41
-        * ipkg_install.c: added -force_space option to override out of space check
+        * opkg_install.c: added -force_space option to override out of space check
 2002-11-23  Aman Gupta  <oz@themastermind1.net>
         * configure.ac: incremented version number to 0.99.40
-        * ipkg_configure.c: updated to match new text output format
-        * ipkg_install.c: updated to new text output format
+        * opkg_configure.c: updated to match new text output format
+        * opkg_install.c: updated to new text output format
                           fixed problems where ipks installed from file or
                           http were being installed over newer ipks of the
                           same name
-        * ipkg_remove.c: updated to new text output format
-                         made ipkg remove do what ipkg purge originally did,
+        * opkg_remove.c: updated to new text output format
+                         made opkg remove do what opkg purge originally did,
                          by having it remove conffiles, and status entries for
-                         ipks that are removed. ipkg_purge now calls
-                         ipkg_remove
+                         ipks that are removed. opkg_purge now calls
+                         opkg_remove
 2002-11-22  Jamey Hicks <jamey.hicks@hp.com>
         * configure.ac: incremented version number to 0.99.39
@@ -772 +772 @@
 2002-10-29  Jamey Hicks <jamey.hicks@hp.com>
         * configure.ac: incremented version number to 0.99.37
-        * ipkg_cmd.c: ipkg_upgrade_cmd now installs uninstalled packages
+        * opkg_cmd.c: opkg_upgrade_cmd now installs uninstalled packages
                       instead of getting a segv 
 2002-10-29  Jamey Hicks <jamey.hicks@hp.com>
@@ -779 +779 @@
 2002-08-08  Jamey Hicks <jamey.hicks@hp.com>
         * configure.ac: incremented version number to 0.99.34
-        * ipkg_cmd.c: fixed problem stringifying HOST_CPU
+        * opkg_cmd.c: fixed problem stringifying HOST_CPU
         * Makefile.am: helped fix problem stringifying HOST_CPU
 2002-08-08  Jamey Hicks <jamey.hicks@hp.com>
         * configure.ac: incremented version number to 0.99.33
-        * ipkg_cmd.c, args.c: added print-architecture and print-installation-architecture commands
+        * opkg_cmd.c, args.c: added print-architecture and print-installation-architecture commands
         * Makefile.am: added defines for HOST_CPU and BUILD_CPU to CFLAGS and package: target
 2002-08-08  Jamey Hicks <jamey.hicks@hp.com>
@@ -791 +791 @@
         * configure.ac: incremented version number to 0.99.31
         * other: applied multiple providers patch from philip blundell
-        * ipkg_cmd.c: implemented compare_versions cmd
+        * opkg_cmd.c: implemented compare_versions cmd
 2002-07-25  Jamey Hicks <jamey.hicks@hp.com>
         * configure.ac: incremented version number to 0.99.30
-        * ipkg_conf.c: added offline_root_pre_script_cmd and offline_root_post_script_cmd
+        * opkg_conf.c: added offline_root_pre_script_cmd and offline_root_post_script_cmd
         * pkg.c: execute scripts in chroot'ed environment running
         pre_script_cmd and post_script_cmd before and after the pkg script. 
@@ -802 +802 @@
 2002-07-24  Jamey Hicks <jamey.hicks@hp.com>
         * configure.ac: incremented version number to 0.99.28
-        * ipkg_cmd.c: merged functionality from ipkg_install_cmd into
-        ipkg_upgrade_cmd with an eye towards unifying these two commands. 
-        * ipkg_install.c: installing a package that replaces other
+        * opkg_cmd.c: merged functionality from opkg_install_cmd into
+        opkg_upgrade_cmd with an eye towards unifying these two commands. 
+        * opkg_install.c: installing a package that replaces other
         packages removes them first.  (Upgrade does not do replacements automatically).
-        * ipkg_remove.c: ipkg_remove_pkg will remove a package with
+        * opkg_remove.c: opkg_remove_pkg will remove a package with
         installed dependents if state_flag == SF_REPLACE.
 2002-07-24  Jamey Hicks <jamey.hicks@hp.com>
@@ -822 +822 @@
 2002-07-17  Jamey Hicks <jamey.hicks@hp.com>
         * configure.ac: incremented version number to 0.99.23
-        * ipkg_remove.c: do not do recursive removal if force-depends is
+        * opkg_remove.c: do not do recursive removal if force-depends is
           specified
         * other-files: other cleanups to reduce code clutter
@@ -828 +828 @@
         * configure.ac: incremented version number to 0.99.22
         * user.[ch]: moved user interaction procedure here
-        * args.[ch], ipkg_conf.[ch]: added force_removal_of_dependent_packages
+        * args.[ch], opkg_conf.[ch]: added force_removal_of_dependent_packages
         * pkg.h: added state_status to abstract_pkg_t
-        * ipkg_remove.c: If package has installed dependents, then only
+        * opkg_remove.c: If package has installed dependents, then only
         remove if force_removal_of_dependent_packages is asserted in
-        ipkg.conf or on command line.  Will add user interaction option later.
+        opkg.conf or on command line.  Will add user interaction option later.
 2002-07-16  Jamey Hicks <jamey.hicks@hp.com>
         * configure.ac: incremented version number to 0.99.21 after
@@ -840 +840 @@
         
         * configure.ac: incremented version number to 0.99.20
-        * ipkg_download.c: removed useless -N flag from wget 
+        * opkg_download.c: removed useless -N flag from wget 
         * update-alternatives: 'head -1' -> 'head -n 1', no sort -k 2 for busybox
         
 2002-07-15  Karthikeyan K  <karthik@innvo.com>
         
-        * ipkg_remove.c (ipkg_remove_dependant_pkgs): removed setting the 
+        * opkg_remove.c (opkg_remove_dependant_pkgs): removed setting the 
         dependencies_checked variable in the while loop b4 actually checking
         the dependencies of that package.
-        * ipkg_cmd.c (ipkg_multiple_files_scan): added check for ".ipk" and
+        * opkg_cmd.c (opkg_multiple_files_scan): added check for ".ipk" and
         ".deb" extension, so that no caching is attempted on  arguments that
         are not local files
@@ -876 +876 @@
 
 2002-07-04  Abhaya Shenoy  <abhaya@innvo.com>
-        * ipkg_install.c (check_conflicts_for): new function to call
+        * opkg_install.c (check_conflicts_for): new function to call
         pkg_hash_fetch_conflicts and print offending packages
-        (ipkg_install_pkg): added call to check_conflicts_for
+        (opkg_install_pkg): added call to check_conflicts_for
         * pkg.c (pkg_merge): provides from oldpkg should be given
         priority
@@ -894 +894 @@
 2002-07-04  Karthikeyan K  <karthik@innvo.com>
         
-        * ipkg_cmd.c (ipkg_multiple_files_scan): new function to handle installation
+        * opkg_cmd.c (opkg_multiple_files_scan): new function to handle installation
         of already downloaded files
-        (ipkg_install_cmd): added call to ipkg_multiple_files_scan
-        (ipkg_remove_cmd): added call to possible_broken_removal_of_packages
-        * ipkg_install.c (ipkg_install_pkg): added check to remove redundant upgrade
+        (opkg_install_cmd): added call to opkg_multiple_files_scan
+        (opkg_remove_cmd): added call to possible_broken_removal_of_packages
+        * opkg_install.c (opkg_install_pkg): added check to remove redundant upgrade
         when a package to be installed is already installed as a dependancy of
         another
-        * ipkg_remove.c (possible_broken_removal_of_packages): new fnuction 
+        * opkg_remove.c (possible_broken_removal_of_packages): new fnuction 
         to check that all packages can be removed, before actually starting to
         remove them
-        (ipkg_remove_dependant_pkgs): new function to remove dependant packages
-        (ipkg_remove_pkg): added call to ipkg_remove_dependant_pkgs
+        (opkg_remove_dependant_pkgs): new function to remove dependant packages
+        (opkg_remove_pkg): added call to opkg_remove_dependant_pkgs
         * pkg.c (abstract_pkg_init): initialized dependencies_checked
         * pkg_hash.c (pkg_hash_dump): added more information to hash dump
@@ -912 +912 @@
         
         * configure.ac: incremented version number to 0.99.16
-        * ipkg_install.c: defensive programming in case pkg contains no Size: clause
+        * opkg_install.c: defensive programming in case pkg contains no Size: clause
         
 2002-07-02  Jamey Hicks <jamey.hicks@hp.com>
@@ -927 +927 @@
         
         * configure.ac: incremented version number to 0.99.12
-        * args.h, ipkg_conf.h, ipkg_install.c: Added force_overwrite
-        option.  When this is asserted, ipkg will overwrite files that
+        * args.h, opkg_conf.h, opkg_install.c: Added force_overwrite
+        option.  When this is asserted, opkg will overwrite files that
         have no owner or that belong to other packages.
-        * ipkg_conf.c, ipkg_dest.c: Update status file atomically, keeping
+        * opkg_conf.c, opkg_dest.c: Update status file atomically, keeping
         old copy of status file if cannot update new status file.  Applied
         patch from Jukka Santala for this fix.
@@ -957 +957 @@
         rather than "make install" and a strip command.
 
-        * ipkg_cmd.c (ipkg_install_cmd): Moved an error message up from
-        ipkg_install_by_name, (eventually all error messages should come
-        up out of what will become libipkg, (pkg.c, ipkg_install.c, etc.)
-        and into ipkg_cmd.c and friends).
-        (ipkg_upgrade_pkg): Pushed downgrade check down into
-        ipkg_install_by_name so that "ipkg install foo" will do the
+        * opkg_cmd.c (opkg_install_cmd): Moved an error message up from
+        opkg_install_by_name, (eventually all error messages should come
+        up out of what will become libopkg, (pkg.c, opkg_install.c, etc.)
+        and into opkg_cmd.c and friends).
+        (opkg_upgrade_pkg): Pushed downgrade check down into
+        opkg_install_by_name so that "opkg install foo" will do the
         downgrade check.
 
-        * ipkg.h: Rename some ipkg_error_t error codes to be more
+        * opkg.h: Rename some opkg_error_t error codes to be more
         consistent.
 
-        * ipkg_install.c (resolve_conffiles): Added missing removal of
+        * opkg_install.c (resolve_conffiles): Added missing removal of
         backed-up modified conffiles, (which led to bizarre, bogus
         conffile prompting the next time the package was upgraded).
         (user_prefers_old_conffile): Fixed reversed arguments to diff in
         interactive conffiles prompting.
-        (ipkg_install_by_name): Fixed "ipkg install foo" to never
-        downgrade foo, (just like "ipkg upgrade foo").
+        (opkg_install_by_name): Fixed "opkg install foo" to never
+        downgrade foo, (just like "opkg upgrade foo").
 
         * familiar/rules: Added installation of
-        /usr/share/doc/ipkg/copyright file. Fixed so that ipkg.conf goes
+        /usr/share/doc/opkg/copyright file. Fixed so that opkg.conf goes
         to /etc, not /usr/etc, (but still keep binary in /usr/bin not
-        /bin). Changed name of installed binary from ipkg-unstable to
-        ipkg.
+        /bin). Changed name of installed binary from opkg-unstable to
+        opkg.
 
         * familiar/control.in (Package): Changed package name from
-        ipkg-unstable to ipkg.
+        opkg-unstable to opkg.
 
         * pkg_parse.c (parseVersion): Fixed to ignore whitespace at
@@ -990 +990 @@
         a package paragraph without a final blank line.
 
-        * ipkg_install.c (check_data_file_clashes): Improved wording of
+        * opkg_install.c (check_data_file_clashes): Improved wording of
         file clash error message.
 
-        * ipkg_download.c (ipkg_download_pkg): Fixed segfault if package
+        * opkg_download.c (opkg_download_pkg): Fixed segfault if package
         has no src, (occurs if package had benn installed locally, then
         was removed (but not purged), then tried to reinstall eithout it
-        existing in any /usr/lib/ipkg/lists/* file).
-
-        * etc/ipkg.conf: Added a default ipkg.conf to the distribution.
+        existing in any /usr/lib/opkg/lists/* file).
+
+        * etc/opkg.conf: Added a default opkg.conf to the distribution.
 
 2002-03-13  Carl Worth  <cworth@east.isi.edu>
@@ -1007 +1007 @@
 
         * pkg.c (pkg_run_script): Added support to export
-        IPKG_OFFLINE_ROOT. This is really a nasty hack as it means scripts
-        need to be modified to check IPKG_OFFLINE_ROOT. I'd really prefer
+        OPKG_OFFLINE_ROOT. This is really a nasty hack as it means scripts
+        need to be modified to check OPKG_OFFLINE_ROOT. I'd really prefer
         coming up with a good, reliable chroot system. But for now this
         will let update-alternatives work, (which already does examine
-        IPKG_OFFLINE_ROOT).
+        OPKG_OFFLINE_ROOT).
         (pkg_run_script): Added missing brace.
 
-        * ipkg_conf.c (ipkg_conf_init): Reworked significantly to properly
+        * opkg_conf.c (opkg_conf_init): Reworked significantly to properly
         set up the pkg_dest_list stuff to account for offline_root.
 
@@ -1027 +1027 @@
         * RELEASE_NOTES: Added release notes for 0.99.6.
 
-        * ipkg_download.c (ipkg_download): Fixed bug in handling of
+        * opkg_download.c (opkg_download): Fixed bug in handling of
         "file://" URLs.
 
-        * ipkg.c (main): Fixed to abort if ipkg_conf_init fails.
-
-        * ipkg_conf.c (ipkg_conf_init): Fixed to complain if given an
+        * opkg.c (main): Fixed to abort if opkg_conf_init fails.
+
+        * opkg_conf.c (opkg_conf_init): Fixed to complain if given an
         unknown dest.
 
@@ -1046 +1046 @@
 
         * familiar/rules (binary-arch): Added strip back in in preparation
-        of non-unstable release of ipkg.
+        of non-unstable release of opkg.
 
         * str_util.c (str_starts_with): Added convenience function.
@@ -1052 +1052 @@
         * pkg_extract.c (pkg_extract_data_file_names_to_file): Fixed
         filenames in *.list files to be compatible with dpkg and the old
-        ipkg, (no prefix of "." for example).
+        opkg, (no prefix of "." for example).
 
         * pkg.c (pkg_run_script): Added export of PKG_ROOT for the benefit
         of maintainer scripts.
 
-        * ipkg_remove.c (ipkg_remove_pkg): Complain and abort if user
+        * opkg_remove.c (opkg_remove_pkg): Complain and abort if user
         attempts to remove an essential package, (also inform them of the
         force option if they insist).
 
-        * ipkg_install.c (ipkg_install_pkg): Added message about whether
+        * opkg_install.c (opkg_install_pkg): Added message about whether
         installing or upgrading.
 
-        * ipkg_download.c (ipkg_download): Added support for "file://"
+        * opkg_download.c (opkg_download): Added support for "file://"
         URLs, (untested).
-        (ipkg_download): Added support for wget proxy options.
-
-        * ipkg_conf.c (ipkg_conf_init): Added proxy support to ipkg_conf,
+        (opkg_download): Added support for wget proxy options.
+
+        * opkg_conf.c (opkg_conf_init): Added proxy support to opkg_conf,
         (http_proxy, ftp_proxy, no_proxy, proxy_user, and proxy_passwd).
 
-        * ipkg_cmd.c (ipkg_upgrade_pkg): Moved Upgrading message from
-        ipkg_upgrade_cmd to ipkg_install_pkg.
+        * opkg_cmd.c (opkg_upgrade_pkg): Moved Upgrading message from
+        opkg_upgrade_cmd to opkg_install_pkg.
 
         * args.c (args_parse): Added new option
@@ -1101 +1101 @@
         (pkg_print_field): Don't print MD5sum field if NULL.
 
-        * ipkg_install.c (satisfy_dependencies_for): Now returns error
+        * opkg_install.c (satisfy_dependencies_for): Now returns error
         status if one or more of the dependencies fail to install cleanly.
         (unpack_pkg_control_files): Fixed to not tack on a bunch of
@@ -1110 +1110 @@
         have ugly things like "///" inside them.
 
-        * ipkg_download.c (ipkg_download): Cleaned up error message.
-        (ipkg_download): Now uses new file_move function.
-        (ipkg_download_pkg): Created new function, (from old code in ipkg_install).
-
-        * ipkg_cmd.c (ipkg_download_cmd): Added new "ipkg download"
+        * opkg_download.c (opkg_download): Cleaned up error message.
+        (opkg_download): Now uses new file_move function.
+        (opkg_download_pkg): Created new function, (from old code in opkg_install).
+
+        * opkg_cmd.c (opkg_download_cmd): Added new "opkg download"
         command.
 
         * file_util.c (file_move): Created file_move, (from code that had
-        been in ipkg_download).
+        been in opkg_download).
         (file_copy): Added error message on failure.
 
@@ -1140 +1140 @@
         * pkg_hash.c (pkg_hash_pkg_owning_file): Moved this function in
         from pkg_dest.c. Also, updated it to use pkg_get_installed rather
-        than mucking around inside /usr/lib/ipkg and globbing for *.list
+        than mucking around inside /usr/lib/opkg and globbing for *.list
         files.
         (pkg_hash_fetch_best_installation_candidate): Fixed to only return
         a package that actually could be installed, (ie. it must have
         either a local_filename or a non-NULL src from which it could be
-        downloaded). This prevents a segfault during "ipkg upgrade".
+        downloaded). This prevents a segfault during "opkg upgrade".
 
         * pkg.c (pkg_get_installed_files): Fixed to not do strange things
         to filenames such as: "//./bin/sh"
 
-        * ipkg_cmd.c (ipkg_files_cmd): Added pkg_free_installed_files to
+        * opkg_cmd.c (opkg_files_cmd): Added pkg_free_installed_files to
         conserve a bit of memory.
-        (ipkg_search_cmd): Updated to use pkg_get_installed rather than
-        mucking around inside /usr/lib/ipkg and globbing for *.list files.
+        (opkg_search_cmd): Updated to use pkg_get_installed rather than
+        mucking around inside /usr/lib/opkg and globbing for *.list files.
 
         * pkg.c (pkg_free_installed_files): Added this function to free up
         memory from pkg_get_installed_files.
 
-        * ipkg_conf.c (ipkg_conf_set_option): Added force_reinstall option
+        * opkg_conf.c (opkg_conf_set_option): Added force_reinstall option
         to allow reinstallation of an installed package.
 
@@ -1170 +1170 @@
         function to plug memory leak.
 
-        * ipkg_install.c (check_data_file_clashes): Fixed crash if no
+        * opkg_install.c (check_data_file_clashes): Fixed crash if no
         package can be found owning the pre-existing file.
 
@@ -1226 +1226 @@
         the package is installed.
 
-        * ipkg_utils.c (read_raw_pkgs_from_file): Moved fclose out of
+        * opkg_utils.c (read_raw_pkgs_from_file): Moved fclose out of
         read_raw_pkgs_from_stream and into this function where it belongs,
         (since the fopen occurs here).
@@ -1232 +1232 @@
         name to make it obvious that it is allocating memory.
 
-        * ipkg_install.c (ipkg_install_from_file): Fixed to be more robust
+        * opkg_install.c (opkg_install_from_file): Fixed to be more robust
         to the fact that hash_insert_pkg sometimes frees the data that I
         pass into it (!).
@@ -1241 +1241 @@
         (satisfy_dependencies_for): Added pkg_vec_deinit to plug memory
         leak.
-        (ipkg_install_pkg): Added "run ipkg update?" hint to error
+        (opkg_install_pkg): Added "run opkg update?" hint to error
         message.
         (backup_modified_conffiles): Made more robust to the case that a
@@ -1252 +1252 @@
         leak.
 
-        * ipkg_download.c (ipkg_download): Cosmetic change to error
+        * opkg_download.c (opkg_download): Cosmetic change to error
         messages.
 
-        * ipkg_conf.c (ipkg_conf_parse_file): Plugged some small memory
+        * opkg_conf.c (opkg_conf_parse_file): Plugged some small memory
         leaks.
-        (ipkg_conf_set_option): Changed configuration options from
+        (opkg_conf_set_option): Changed configuration options from
         force-depends, force-defaults to force_depdends, force_defaults to
-        be compatible with old ipkg.conf files.
-        (ipkg_conf_set_option): Fixed bug in parsing options.
-        (ipkg_conf_write_status_files): Fixed to list all interesting
+        be compatible with old opkg.conf files.
+        (opkg_conf_set_option): Fixed bug in parsing options.
+        (opkg_conf_write_status_files): Fixed to list all interesting
         packages, (any with non-default state), in status file rather than
         just installed files.
-        (ipkg_conf_write_status_files): Plugged a memory leak.
-
-        * ipkg_cmd.c (ipkg_status_cmd): Changed "ipkg status" to use
+        (opkg_conf_write_status_files): Plugged a memory leak.
+
+        * opkg_cmd.c (opkg_status_cmd): Changed "opkg status" to use
         pkg_print_info so it is much more verbose, (includes fields such
         as Maintainer, etc. that are merged in from the lists files).
 
-        * ipkg.h (IPKG_DEBUG_NO_TMP_CLEANUP): Added compile-time option to
+        * opkg.h (OPKG_DEBUG_NO_TMP_CLEANUP): Added compile-time option to
         preserve temporary files for easier debugging.
 
@@ -1276 +1276 @@
         names.
         
-        * ipkg_conf.c (ipkg_conf_init): Added support for offline_root
+        * opkg_conf.c (opkg_conf_init): Added support for offline_root
         configuration file option.
 
@@ -1283 +1283 @@
         have any effect yet).
 
-        * ipkg_install.c (ipkg_install_pkg): Changed back to marking
+        * opkg_install.c (opkg_install_pkg): Changed back to marking
         package as installed before postinst, (the pkg_run_script wanted
-        to find the scripts in /usr/lib/ipkg/info). Actually, it could
+        to find the scripts in /usr/lib/opkg/info). Actually, it could
         probably find the script in either place at this point so maybe it
         doesn't really matter.
@@ -1291 +1291 @@
 2002-03-07  Carl Worth  <cworth@east.isi.edu>
 
-        * ipkg_install.c (ipkg_install_pkg): Changed to only mark package
-        as installed after running ipkg_configure, (to run the postinst
+        * opkg_install.c (opkg_install_pkg): Changed to only mark package
+        as installed after running opkg_configure, (to run the postinst
         script).
 
-        * RELEASED ipkg-unstable 0.99.0
+        * RELEASED opkg-unstable 0.99.0
 
         * Updated all instances of "XXX" in the code to indicate one of
@@ -1305 +1305 @@
         
         * pkg.c (pkg_print_status): Added the Depends field to package
-        paragraphs in the status file, ("ipkg remove" will need this).
-
-        * ipkg_install.c (satisfy_dependencies_for): Fixed "ipkg install"
+        paragraphs in the status file, ("opkg remove" will need this).
+
+        * opkg_install.c (satisfy_dependencies_for): Fixed "opkg install"
         to not complain several times about "Package foo already
         installed" when doing large recursive installs.
-        (ipkg_install_pkg): "ipkg install foo" for an installed package
+        (opkg_install_pkg): "opkg install foo" for an installed package
         will now check and install any missing dependencies before exiting
         with "Package foo is alrady installed."
@@ -1317 +1317 @@
 
         * pkg_dest.c (pkg_dest_pkg_owning_file_alloc): Moved this function
-        here from ipkg_install.c. Also plugged a memory leak in it with
+        here from opkg_install.c. Also plugged a memory leak in it with
         globfree.
 
         * pkg.c (pkg_remove_installed_files_list): Fixed bug that
-        prevented package.list file from ever being removed during "ipkg
+        prevented package.list file from ever being removed during "opkg
         remove".
 
-        * ipkg_remove.c (remove_data_files_and_list): Fixed noisy and
-        spurious warnings about non-empty directories. "ipkg remove"
+        * opkg_remove.c (remove_data_files_and_list): Fixed noisy and
+        spurious warnings about non-empty directories. "opkg remove"
         should now only say anything if a directory that was solely
         provided by that package is non-empty.
 
-        * ipkg_cmd.c (ipkg_install_pending_cmd): Plugged memory leak with
+        * opkg_cmd.c (opkg_install_pending_cmd): Plugged memory leak with
         globfree.
 
-        * ipkg_install.c: *Many* fixes to enable "ipkg upgrade" to more or
+        * opkg_install.c: *Many* fixes to enable "opkg upgrade" to more or
         less work. Primarily fixing file clash identification and conffile
-        handling/resolution. "ipkg upgrade" has now worked correctly on
+        handling/resolution. "opkg upgrade" has now worked correctly on
         several test cases!
 
-        * ipkg_install.c (unpack_pkg_control_files): Now initializes
+        * opkg_install.c (unpack_pkg_control_files): Now initializes
         conffiles list from the contents of conffiles control file,
         (leaves md5sum calculation until the actual conffiles are
         extracted later).
-        (ipkg_install_pkg): Separated backup_modified_conffiles and
+        (opkg_install_pkg): Separated backup_modified_conffiles and
         check_data_file_clashes into separate functions.
         (preinst_configure): Simplified this function pushing its old
@@ -1395 +1395 @@
         field.
 
-        * ipkg_install.c (remove_obsolesced_files): With the fixed
+        * opkg_install.c (remove_obsolesced_files): With the fixed
         pkg_get_installed_files_list from below, this function now seems
         to work!
-        (ipkg_install_pkg): Fixed to mark old package as uninstalled after
+        (opkg_install_pkg): Fixed to mark old package as uninstalled after
         upgrading.
 
@@ -1406 +1406 @@
         package).
 
-        * ipkg_cmd.c (ipkg_upgrade_cmd): Fixed ipkg_upgrade to not choke
+        * opkg_cmd.c (opkg_upgrade_cmd): Fixed opkg_upgrade to not choke
         if asked to upgrade an un-installed package.
-        (ipkg_upgrade_pkg): Fixed printing of version numbers.
+        (opkg_upgrade_pkg): Fixed printing of version numbers.
 
         * file_util.c (file_mkdir_hier): Abstracted call to libbb
@@ -1421 +1421 @@
 2002-03-04  Carl Worth  <cworth@east.isi.edu>
 
-        * ipkg_conf.c (ipkg_conf_init): Added support to ipkg_conf to
+        * opkg_conf.c (opkg_conf_init): Added support to opkg_conf to
         pickup command-line arguments for "force-defaults" and
         "force-depends". Things set on the command-line should take
         precedence over things found in the configuration file.
 
-        * ipkg_cmd.c (ipkg_search_cmd): Fixed formatting of "ipkg search"
+        * opkg_cmd.c (opkg_search_cmd): Fixed formatting of "opkg search"
         output.
 
@@ -1435 +1435 @@
         calls to regexec.
 
-        * ipkg_install.c (satisfy_dependencies_for): Added support for new
+        * opkg_install.c (satisfy_dependencies_for): Added support for new
         "unresolved" argument in
         pkg_hash_fetch_unsatisfied_dependencies. Cleaned up warning/error
         messages.
 
-        * ipkg_cmd.c (ipkg_search_cmd): Implemented first-cut of "ipkg search".
+        * opkg_cmd.c (opkg_search_cmd): Implemented first-cut of "opkg search".
 
         * pkg_depends.c (pkg_hash_fetch_unsatisfied_dependencies): Fixed
@@ -1447 +1447 @@
 2002-03-01  Carl Worth  <cworth@east.isi.edu>
 
-        * RELEASED ipkg-unstable 0.98.0
-
-        * ipkg_configure.c (ipkg_configure): Added flushing of stdout,
+        * RELEASED opkg-unstable 0.98.0
+
+        * opkg_configure.c (opkg_configure): Added flushing of stdout,
         (here and in a few other modules).
 
         * file_util.c (file_copy): Implemented this function here as one
         step toward isolating the calls into libbb functions. Updated old
-        copy_file calls to file_copy in both ipkg_download.c and
-        ipkg_install.c.
-
-        * ipkg_install.c, ipkg_remove.c: Demoted several "XXX" comments to
+        copy_file calls to file_copy in both opkg_download.c and
+        opkg_install.c.
+
+        * opkg_install.c, opkg_remove.c: Demoted several "XXX" comments to
         DPKG_INCOMPATIBILITY as I really don't intend on addressing them
         any time soon, (if ever).
 
-        * ipkg_cmd.c (ipkg_files_cmd): Fixed "ipkg files" from crashing on
+        * opkg_cmd.c (opkg_files_cmd): Fixed "opkg files" from crashing on
         uninstalled packages.
 
         * familiar/rules: Added support for easy building of an
-        ipkg.ipk. The version number and the architecture are
+        opkg.ipk. The version number and the architecture are
         automatically sucked in correctly from autoconf magic, (even when
         cross-compiling). Maybe autoconf will start paying off with
@@ -1473 +1473 @@
         cross-compilation.
 
-        * ipkg_cmd.c (ipkg_upgrade_pkg): BIG bugfix: Package version
+        * opkg_cmd.c (opkg_upgrade_pkg): BIG bugfix: Package version
         comparison was sign-reversed, (hence it would never upgrade).
 
 2002-02-28  Carl Worth  <cworth@east.isi.edu>
 
-        * ipkg_download.c (ipkg_download): Changed from
+        * opkg_download.c (opkg_download): Changed from
         system("/bin/cp",...) to copy_file(...)
 
@@ -1485 +1485 @@
 
         * configure.ac: Added AC_CANONICAL_HOST to automatically set the
-        correct architecture type in the ipkg control file.
+        correct architecture type in the opkg control file.
 
         * configure.ac: Changed version number to 0.98.0 in preparation
         for alpha release.
 
-        * familiar/rules: Added support for easy building of an ipkg.ipk.
+        * familiar/rules: Added support for easy building of an opkg.ipk.
 
 2002-02-27  Carl Worth  <cworth@east.isi.edu>
 
-        * ipkg_install.c (ipkg_install_pkg): Fixed to abort on failed
+        * opkg_install.c (opkg_install_pkg): Fixed to abort on failed
         download.
 
@@ -1506 +1506 @@
 
         * pkg_parse.c (pkg_parse_raw): Added parsing of "MD5Sum" in
-        addition to "MD5sum" to accomodate bug in old ipkg.
+        addition to "MD5sum" to accomodate bug in old opkg.
 
         * void_list.c (void_list_remove): Added new remove function, (also
@@ -1515 +1515 @@
         conffile_list_t datatype.
         (pkg_remove_installed_files_list): Pulled this function into
-        pkg.c, (from ipkg_remove.c), so the mallocs and frees would be in
+        pkg.c, (from opkg_remove.c), so the mallocs and frees would be in
         the same C file.
         (pkg_get_conffile): Added this convenience function.
 
-        * ipkg_remove.c: Fixed several bugs. ipkg_remove now actually
+        * opkg_remove.c: Fixed several bugs. opkg_remove now actually
         works for simple packages!
 
-        * ipkg_install.c (ipkg_install_pkg): Don't re-install if a package
+        * opkg_install.c (opkg_install_pkg): Don't re-install if a package
         is already installed.
-        (ipkg_install_pkg): Fixed major bug that all of ipkg_install's
+        (opkg_install_pkg): Fixed major bug that all of opkg_install's
         work was always being unwound even when successful.
 
-        * ipkg_cmd.c (ipkg_files_cmd): Fixed to use
+        * opkg_cmd.c (opkg_files_cmd): Fixed to use
         pkg_get_installed_files_list rather than a private implementation
         that sifted through the file lists on disk.
@@ -1534 +1534 @@
         (str_chomp): Another convenience.
 
-        * ipkg_conf.c: Moved chomp to str_util.c (str_chomp), since
+        * opkg_conf.c: Moved chomp to str_util.c (str_chomp), since
         someone else wanted it too.
 
@@ -1556 +1556 @@
         script.
 
-        * ipkg_remove.c: Fleshed out initial version of all ipkg_remove.c
+        * opkg_remove.c: Fleshed out initial version of all opkg_remove.c
         functions.
 
-        * ipkg_configure.c (ipkg_configure): Added check on return value
+        * opkg_configure.c (opkg_configure): Added check on return value
         of pkg_run script. Added comments about dpkg compliance.
 
-        * ipkg_cmd.c (ipkg_purge_cmd): Added ipkg_purge_cmd
+        * opkg_cmd.c (opkg_purge_cmd): Added opkg_purge_cmd
 
 2002-02-20  Carl Worth  <cworth@east.isi.edu>
@@ -1568 +1568 @@
         * Added USC copyright statements, (and Compaq stubs as necessary)
 
-        * ipkg_install.c: At this point "ipkg install" on a simple
+        * opkg_install.c: At this point "opkg install" on a simple
         package, (no scripts and no dependencies), works just fine. It
         might even do some of the script and dependency handling correctly
-        too, but I haven't tested that yet. "ipkg install libc6" is a nice
+        too, but I haven't tested that yet. "opkg install libc6" is a nice
         little test that should complete without any errors or
-        warnings. Follow that up with "ipkg status" to see that it worked.
+        warnings. Follow that up with "opkg status" to see that it worked.
 
         * pkg.c (pkg_run_script): Added convenience method for running
         package scripts.
 
-        * ipkg_install.c: Fixed several bugs:
+        * opkg_install.c: Fixed several bugs:
         (unpack_pkg_control_files): control files now extract to the
         correct temporary directory.
-        (ipkg_install_pkg): pkg->state_want is now properly set to SW_INSTALL
-        (ipkg_install_pkg): status file now gets written after installation
+        (opkg_install_pkg): pkg->state_want is now properly set to SW_INSTALL
+        (opkg_install_pkg): status file now gets written after installation
         (cleanup_temporary_files): All temporary files are cleaned up.
 
-        * ipkg_configure.c (ipkg_configure): Fleshed out a very simple
-        ipkg_configure, (simply runs "postinst configure"). Maybe it will
+        * opkg_configure.c (opkg_configure): Fleshed out a very simple
+        opkg_configure, (simply runs "postinst configure"). Maybe it will
         need to be smarter at some point. Moved unwritten conffiles stuff
-        back to ipkg_install.c.
-
-        * ipkg_conf.c (ipkg_conf_write_status_files): Moved this function
-        from ipkg_utils to ipkg_conf since it needs access to the
+        back to opkg_install.c.
+
+        * opkg_conf.c (opkg_conf_write_status_files): Moved this function
+        from opkg_utils to opkg_conf since it needs access to the
         pkg_dest_list.
 
@@ -1601 +1601 @@
 2002-02-19  Carl Worth  <cworth@east.isi.edu>
 
-        * ipkg_install.c: several little bug fixes. "ipkg install" will
+        * opkg_install.c: several little bug fixes. "opkg install" will
         now actually install files from a package! There are still some
         bugs, (eg. postinst scripts are not called -- probably other
@@ -1608 +1608 @@
         * pkg_dest.c (pkg_dest_init): now creates all necessary directories
 
-        * ipkg_download.c (ipkg_download): Fixed misleading parameter name.
-
-        * ipkg_conf.c (ipkg_conf_deinit): Now cleans up tmd_dir on deinit
-        ipkg.c: now calls ipkg_conf_deinit before exiting.
-        (ipkg_conf_add_nv): Fixed to set default_dest when parsing first
-        dest in ipkg.conf
-
-        * ipkg_cmd.c (ipkg_list_cmd): Fixed ugly bug in ipkg_list that led
+        * opkg_download.c (opkg_download): Fixed misleading parameter name.
+
+        * opkg_conf.c (opkg_conf_deinit): Now cleans up tmd_dir on deinit
+        opkg.c: now calls opkg_conf_deinit before exiting.
+        (opkg_conf_add_nv): Fixed to set default_dest when parsing first
+        dest in opkg.conf
+
+        * opkg_cmd.c (opkg_list_cmd): Fixed ugly bug in opkg_list that led
         to infinite loops, segfaults, string corruption, and other bizarre
         behavior.
 
-        * Added many files as we are approaching the first functional ipkg
+        * Added many files as we are approaching the first functional opkg
         implementation in C:
         file_util.c: convenience for testing if file_exists, reading files, etc.
-        ipkg_configure.c: mostly just a stub so far
-        ipkg_download.c: convenient function to download a file
+        opkg_configure.c: mostly just a stub so far
+        opkg_download.c: convenient function to download a file
         nv_pair.c: data structure to hold a name-value pair
         nv_pair_list.c: data structure to hold a list of nv_pair_t
@@ -1637 +1637 @@
         xsystem.c: wrapper around system() with error checking
 
-        * ipkg_remove.c: Just added some stubs. Nothing really works at
+        * opkg_remove.c: Just added some stubs. Nothing really works at
         all yet.
 
-        * ipkg_install.c: Large rework of ipkg_install. It's now close to
+        * opkg_install.c: Large rework of opkg_install. It's now close to
         actually being usable, (but it's not quite there yet). Revamped to
         match dpkg install order more closely, (with all the stubs in case
@@ -1646 +1646 @@
         to use a more recent deb_extract from libbb.
 
-        * ipkg_extract_test.c (main): Added support for a third arg, (the
+        * opkg_extract_test.c (main): Added support for a third arg, (the
         filename to extract to the buffer).
 
-        * ipkg_conf.c (ipkg_conf_init): Added several fields to
-        ipkg_conf_t: pkg_src_list, pkg_dest_list ,
+        * opkg_conf.c (opkg_conf_init): Added several fields to
+        opkg_conf_t: pkg_src_list, pkg_dest_list ,
         restrict_to_default_dest, default_dest, tmp_dir, lists_dir,
         pending_dir, force_depends, and pkg_hash. There's still a bit of
-        tension between options stored in the config file, (ipkg_conf_t),
+        tension between options stored in the config file, (opkg_conf_t),
         and command-line arguments, (args_t).
 
-        * ipkg_cmd.c: First version that is approaching usability. The
-        following commands are more-or-less in place: "ipkg update", "ipkg
-        list", "ipkg info", "ipkg status". While the rest are in various
+        * opkg_cmd.c: First version that is approaching usability. The
+        following commands are more-or-less in place: "opkg update", "opkg
+        list", "opkg info", "opkg status". While the rest are in various
         states of being partiallyy written or written but untested.
-        (ipkg_upgrade_cmd): Added support for restricting to a dest.  Many
+        (opkg_upgrade_cmd): Added support for restricting to a dest.  Many
         other changes, largely involving plugging into the pkg_hash for
         real for the first time, and adding multiple dest support.
 
-        * ipkg.c: Added support for setting the dest on the command-line.
-
-        * args.c: Added support for IPKG_CONF_DIR environment variable and
+        * opkg.c: Added support for setting the dest on the command-line.
+
+        * args.c: Added support for OPKG_CONF_DIR environment variable and
         -f, -conf, and -conf-file options.
 
@@ -1730 +1730 @@
         support pkg_dest
 
-        * ipkg_utils.h: Added GPL blurb
-        (IPKG_UTILS_H): Added multiple include protection
-
-        * ipkg_utils.c:
+        * opkg_utils.h: Added GPL blurb
+        (OPKG_UTILS_H): Added multiple include protection
+
+        * opkg_utils.c:
         (read_raw_pkgs_from_file): broke read_raw_pkgs into
         read_raw_pkgs_from_file and read_raw-pkgs_from_stream
-        (ipkg_write_status_file): Fixed return value
+        (opkg_write_status_file): Fixed return value
         (print_pkg_status): Moved this function to pkg.c:pkg_print_status
         (line_is_blank): Fixed const char handling
@@ -1751 +1751 @@
 2001-12-11  Carl Worth  <cworth@east.isi.edu>
 
-        * ipkg_conf.c: Now parses /etc/ipkg.conf, (and doesn't do anything
+        * opkg_conf.c: Now parses /etc/opkg.conf, (and doesn't do anything
         with it).
 
-        * ipkg.c: Started work on ipkg main, (not much here yet).
-
-        * ipkg_cmd.h: Added a tiny thing to abstract top-level ipkg
+        * opkg.c: Started work on opkg main, (not much here yet).
+
+        * opkg_cmd.h: Added a tiny thing to abstract top-level opkg
         commands, (not finished).
 

trunk/src/target/ipkg/INSTALL

@@ -1 @@
-ipkg uses autoconf and friends for configuration. The familiar steps of:
+opkg uses autoconf and friends for configuration. The familiar steps of:
 
         ./configure

trunk/src/target/ipkg/Makefile.am

@@ -4 +4 @@
 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 \
@@ -33 +33 @@
         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 \
@@ -48 +48 @@
         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= \
@@ -93 +93 @@
         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

trunk/src/target/ipkg/README

@@ -1 @@
-ipkg - The Itsy Package Management System
-
-See http://www.handhelds.org/moin/moin.cgi/Ipkg for more details about ipkg.

trunk/src/target/ipkg/TODO

@@ -1 +1 @@
 
-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).
@@ -19 +19 @@
 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. ;-)
@@ -27 +27 @@
 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
@@ -48 +48 @@
 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
@@ -65 +65 @@
 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.
 
@@ -90 +90 @@
      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? )
@@ -99 +99 @@
      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

trunk/src/target/ipkg/args.c

@@ -21 +21 @@
 #include <unistd.h>
 
-#include "ipkg.h"
+#include "opkg.h"
 
 #include "config.h"
@@ -54 +54 @@
      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;
@@ -227 +227 @@
 {
      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");
     
@@ -248 +248 @@
      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");
@@ -274 +274 @@
      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);
@@ -286 +286 @@
      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");
@@ -305 +305 @@
      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. */
@@ -314 +314 @@
 static void print_version(void)
 {
-     fprintf(stderr, "ipkg version %s\n", VERSION);
-}
+     fprintf(stderr, "opkg version %s\n", VERSION);
+}

trunk/src/target/ipkg/args.h

@@ -47 +47 @@
 
 #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

trunk/src/target/ipkg/conffile.c

@@ -19 +19 @@
 #include <stdlib.h>
 
-#include "ipkg.h"
-#include "ipkg_message.h"
+#include "opkg.h"
+#include "opkg_message.h"
 
 #include "conffile.h"
@@ -36 +36 @@
 }
 
-int conffile_has_been_modified(ipkg_conf_t *conf, conffile_t *conffile)
+int conffile_has_been_modified(opkg_conf_t *conf, conffile_t *conffile)
 {
     char *md5sum;
@@ -44 +44 @@
 
     if (conffile->value == NULL) {
-         ipkg_message(conf, IPKG_NOTICE, "%s: conffile %s has no md5sum\n", __FUNCTION__, conffile->name);
+         opkg_message(conf, OPKG_NOTICE, "%s: conffile %s has no md5sum\n", __FUNCTION__, conffile->name);
          return 1;
     }
@@ -54 +54 @@
     ret = strcmp(md5sum, conffile->value);
     if (ret) {
-      ipkg_message(conf, IPKG_NOTICE, "%s: conffile %s: \t\nold md5=%s \t\nnew md5=%s\n", __FUNCTION__,
+      opkg_message(conf, OPKG_NOTICE, "%s: conffile %s: \t\nold md5=%s \t\nnew md5=%s\n", __FUNCTION__,
               conffile->name, md5sum, conffile->value);
     }

trunk/src/target/ipkg/conffile.h

@@ -25 +25 @@
 int conffile_init(conffile_t *conffile, const char *file_name, const char *md5sum);
 void conffile_deinit(conffile_t *conffile);
-int conffile_has_been_modified(struct ipkg_conf *conf, conffile_t *conffile);
+int conffile_has_been_modified(struct opkg_conf *conf, conffile_t *conffile);
 
 #endif

trunk/src/target/ipkg/conffile_list.c

@@ -16 +16 @@
 */
 
-#include "ipkg.h"
+#include "opkg.h"
 
 #include "conffile_list.h"

trunk/src/target/ipkg/configure.ac

@@ -1 +1 @@
 # Process this file with autoconf to produce a configure script
-AC_INIT(ipkg.c)
-AM_INIT_AUTOMAKE([ipkg], [0.99.163])
+AC_INIT(opkg.c)
+AM_INIT_AUTOMAKE([opkg], [0.99.163])
 AM_CONFIG_HEADER(config.h)
 
@@ -20 +20 @@
 AC_PROG_LIBTOOL
 
-# Checks for libraries (hah! ipkg is pretty much self-contained)
+# Checks for libraries (hah! opkg is pretty much self-contained)
 PKG_CHECK_MODULES(CURL, libcurl)
 
@@ -52 +52 @@
 AC_CHECK_FUNCS([memmove memset mkdir regcomp strchr strcspn strdup strerror strndup strrchr strstr strtol strtoul sysinfo utime])
 
-ipkglibdir=
-AC_ARG_WITH(ipkglibdir,
-[  --with-ipkglibdir=DIR   specifies directory to put status and info files.
-                          "/ipkg" is always added so if you want your files 
-                          to be in /usr/lib/ipkg you should indicate 
-                          --with-ipkglibdir=/usr/lib ],
+opkglibdir=
+AC_ARG_WITH(opkglibdir,
+[  --with-opkglibdir=DIR   specifies directory to put status and info files.
+                          "/opkg" is always added so if you want your files 
+                          to be in /usr/lib/opkg you should indicate 
+                          --with-opkglibdir=/usr/lib ],
 [case "${withval}" in
-yes)    AC_MSG_ERROR(bad value ${withval} given for ipkg libs directories ) ;;
+yes)    AC_MSG_ERROR(bad value ${withval} given for opkg libs directories ) ;;
 no)     ;;
-*)      ipkglibdir=$with_ipkglibdir ;;
+*)      opkglibdir=$with_opkglibdir ;;
 esac])
 
 # Default local prefix if it is empty
-if test x$ipkglibdir = x; then
-        ipkglibdir=/usr/lib
+if test x$opkglibdir = x; then
+        opkglibdir=/usr/lib
 fi
 
-AC_SUBST(ipkglibdir)
+AC_SUBST(opkglibdir)
 
-AC_OUTPUT(Makefile etc/Makefile familiar/Makefile familiar/control familiar/control-unstripped familiar/libipkg-control  familiar/libipkg-dev-control libbb/Makefile libipkg.pc ipkg.h)
+AC_OUTPUT(Makefile etc/Makefile familiar/Makefile familiar/control familiar/control-unstripped familiar/libopkg-control  familiar/libopkg-dev-control libbb/Makefile libopkg.pc opkg.h)

trunk/src/target/ipkg/familiar/control-unstripped.in

@@ -1 @@
-Package: ipkg-unstripped
-Replaces: ipkg
+Package: opkg-unstripped
+Replaces: opkg
 Version: @VERSION@
 Section: base
@@ -7 +7 @@
 Architecture: @host_cpu@
 Maintainer: Jamey Hicks <jamey@handhelds.org>
-Source: http://www.handhelds.org/packages/ipkg/ipkg-@VERSION@.tar.gz
+Source: http://www.handhelds.org/packages/opkg/opkg-@VERSION@.tar.gz
 Depends: libc6, busybox 
 Description: lightweight package management system
- ipkg is the Itsy Package Management System, for handling
+ opkg is the Itsy Package Management System, for handling
  installation and removal of packages on a system. It can
  recursively follow dependencies and download all packages
  necessary to install a particular package.
  .
- ipkg knows how to install both .ipk and .deb packages.
+ opkg knows how to install both .ipk and .deb packages.
  .
- ipkg is intended to serve the same functions (and more) for
+ opkg is intended to serve the same functions (and more) for
  Familiar that dpkg and apt serve for Debian, (while taking
  up much less space).

trunk/src/target/ipkg/familiar/control.in

@@ -1 @@
-Package: ipkg
+Package: opkg
 Version: @VERSION@
 Section: base
@@ -6 +6 @@
 Architecture: @host_cpu@
 Maintainer: Pierluigi Frullani <pigi@frumar.it>
-Source: http://www.handhelds.org/packages/ipkg/ipkg-@VERSION@.tar.gz
-Depends: libc6, libipkg (>= @VERSION@)
+Source: http://www.handhelds.org/packages/opkg/opkg-@VERSION@.tar.gz
+Depends: libc6, libopkg (>= @VERSION@)
 Description: lightweight package management system
- ipkg is the Itsy Package Management System, for handling
+ opkg is the Itsy Package Management System, for handling
  installation and removal of packages on a system. It can
  recursively follow dependencies and download all packages
  necessary to install a particular package.
  .
- ipkg knows how to install both .ipk and .deb packages.
+ opkg knows how to install both .ipk and .deb packages.
  .
- ipkg is intended to serve the same functions (and more) for
+ opkg is intended to serve the same functions (and more) for
  Familiar that dpkg and apt serve for Debian, (while taking
  up much less space).

trunk/src/target/ipkg/familiar/libopkg-control.in

@@ -1 @@
-Package: libipkg
+Package: libopkg
 Version: @VERSION@
 Section: base
@@ -6 +6 @@
 Architecture: @host_cpu@
 Maintainer: Jamey Hicks <jamey@handhelds.org>
-Source: http://www.handhelds.org/packages/ipkg/ipkg-@VERSION@.tar.gz
+Source: http://www.handhelds.org/packages/opkg/opkg-@VERSION@.tar.gz
 Depends: libc6, busybox
 Description: lightweight package management system
- ipkg is the Itsy Package Management System, for handling
+ opkg is the Itsy Package Management System, for handling
  installation and removal of packages on a system. It can
  recursively follow dependencies and download all packages
  necessary to install a particular package.
  .
- ipkg knows how to install both .ipk and .deb packages.
+ opkg knows how to install both .ipk and .deb packages.
  .
- ipkg is intended to serve the same functions (and more) for
+ opkg is intended to serve the same functions (and more) for
  Familiar that dpkg and apt serve for Debian, (while taking
  up much less space).

trunk/src/target/ipkg/familiar/libopkg-dev-control.in

@@ -1 @@
-Package: libipkg-dev
+Package: libopkg-dev
 Version: @VERSION@
 Section: base
@@ -6 +6 @@
 Architecture: @host_cpu@
 Maintainer: Jamey Hicks <jamey@handhelds.org>
-Source: http://www.handhelds.org/packages/ipkg/ipkg-@VERSION@.tar.gz
-Depends: libipkg
+Source: http://www.handhelds.org/packages/opkg/opkg-@VERSION@.tar.gz
+Depends: libopkg
 Description: lightweight package management system
- ipkg is the Itsy Package Management System, for handling
+ opkg is the Itsy Package Management System, for handling
  installation and removal of packages on a system. It can
  recursively follow dependencies and download all packages
  necessary to install a particular package.
  .
- ipkg knows how to install both .ipk and .deb packages.
+ opkg knows how to install both .ipk and .deb packages.
  .
- ipkg is intended to serve the same functions (and more) for
+ opkg is intended to serve the same functions (and more) for
  Familiar that dpkg and apt serve for Debian, (while taking
  up much less space).

trunk/src/target/ipkg/file_util.c

@@ -16 +16 @@
 */
 
-#include "ipkg.h"
+#include "opkg.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -108 +108 @@
 
 /* I put these here to keep libbb dependencies from creeping all over
-   the ipkg code */
+   the opkg code */
 int file_copy(const char *src, const char *dest)
 {

trunk/src/target/ipkg/hash_table.c

@@ -1 @@
-/* hash.c - hash tables for ipkg
+/* hash.c - hash tables for opkg
 
    Steven M. Ayer, Jamey Hicks
@@ -21 +21 @@
 #include <string.h>
 #include "hash_table.h"
-#include "ipkg_message.h"
+#include "opkg_message.h"
 
 
@@ -93 +93 @@
     {
       if (strcmp(key, hash_entry->key) == 0) {
-         // ipkg_message(NULL, IPKG_DEBUG, "Function: %s. Key found for '%s' \n", __FUNCTION__, key);
+         // opkg_message(NULL, OPKG_DEBUG, "Function: %s. Key found for '%s' \n", __FUNCTION__, key);
          return hash_entry->data;
       }
@@ -106 +106 @@
      int ndx= hash_index(hash, key);
      hash_entry_t *hash_entry = hash->entries + ndx;
-     if (0) ipkg_message(NULL, IPKG_DEBUG2, "Function: %s. Inserting in hash for '%s' \n", __FUNCTION__, key);
+     if (0) opkg_message(NULL, OPKG_DEBUG2, "Function: %s. Inserting in hash for '%s' \n", __FUNCTION__, key);
      if (hash_entry->key) {
           if (strcmp(hash_entry->key, key) == 0) {
                /* alread in table, update the value */
-               if (0) ipkg_message(NULL, IPKG_DEBUG2, "Function: %s. Value already in hash for '%s' \n", __FUNCTION__, key);
+               if (0) opkg_message(NULL, OPKG_DEBUG2, "Function: %s. Value already in hash for '%s' \n", __FUNCTION__, key);
                hash_entry->data = value;
                return 0;
@@ -119 +119 @@
                 * before we can hook up the value
                 */
-               if (0) ipkg_message(NULL, IPKG_DEBUG2, "Function: %s. Value already in hash by collision for '%s' \n", __FUNCTION__, key);
+               if (0) opkg_message(NULL, OPKG_DEBUG2, "Function: %s. Value already in hash by collision for '%s' \n", __FUNCTION__, key);
                while (hash_entry->next)
                     hash_entry = hash_entry->next;

trunk/src/target/ipkg/hash_table.h

@@ -1 @@
-/* hash.h - hash tables for ipkg
+/* hash.h - hash tables for opkg
 
    Steven M. Ayer, Jamey Hicks

trunk/src/target/ipkg/intercept/depmod

@@ -2 +2 @@
 
 if [ "x$1" = "x-a" ] || [ "x$1" = "x-A" ]; then
-  if [ ! -f $IPKG_INTERCEPT_DIR/depmod ]; then
-    echo "depmod -A" > $IPKG_INTERCEPT_DIR/depmod
-    chmod +x $IPKG_INTERCEPT_DIR/depmod
+  if [ ! -f $OPKG_INTERCEPT_DIR/depmod ]; then
+    echo "depmod -A" > $OPKG_INTERCEPT_DIR/depmod
+    chmod +x $OPKG_INTERCEPT_DIR/depmod
   fi
   exit 0

trunk/src/target/ipkg/intercept/ldconfig

@@ -1 +1 @@
 #!/bin/sh
 
-if [ ! -f $IPKG_INTERCEPT_DIR/ldconfig ]; then
-  echo "ldconfig" > $IPKG_INTERCEPT_DIR/ldconfig
-  chmod +x $IPKG_INTERCEPT_DIR/ldconfig
+if [ ! -f $OPKG_INTERCEPT_DIR/ldconfig ]; then
+  echo "ldconfig" > $OPKG_INTERCEPT_DIR/ldconfig
+  chmod +x $OPKG_INTERCEPT_DIR/ldconfig
 fi
 

trunk/src/target/ipkg/intercept/update-modules

@@ -1 +1 @@
 #!/bin/sh
 
-if [ ! -f $IPKG_INTERCEPT_DIR/update-modules ]; then
-  echo "update-modules" > $IPKG_INTERCEPT_DIR/update-modules
-  chmod +x $IPKG_INTERCEPT_DIR/update-modules
+if [ ! -f $OPKG_INTERCEPT_DIR/update-modules ]; then
+  echo "update-modules" > $OPKG_INTERCEPT_DIR/update-modules
+  chmod +x $OPKG_INTERCEPT_DIR/update-modules
 fi
 

trunk/src/target/ipkg/libbb/libbb.h

@@ -28 +28 @@
 #include <netdb.h>
 
-// Include because of single use with ipkg
+// Include because of single use with opkg
 #define _BB_INTERNAL_H_
 #define L_archive_offset

trunk/src/target/ipkg/libbb/unarchive.c

@@ -763 +763 @@
                 return(output_buffer);
         } else if (strncmp(ar_magic, "\037\213", 2) == 0) {
-                /* it's a gz file, let's assume it's an ipkg */
-                int unzipped_ipkg_pid;
-                FILE *unzipped_ipkg_stream;
+                /* it's a gz file, let's assume it's an opkg */
+                int unzipped_opkg_pid;
+                FILE *unzipped_opkg_stream;
                 file_header_t *tar_header;
                 archive_offset = 0;
                 fseek(deb_stream, 0, SEEK_SET);
-                unzipped_ipkg_stream = gz_open(deb_stream, &unzipped_ipkg_pid);
+                unzipped_opkg_stream = gz_open(deb_stream, &unzipped_opkg_pid);
                 
-                /*fprintf(stderr, __FUNCTION__ ": processing ipkg %s -- ared_file=%s\n", package_filename, ared_file);*/
+                /*fprintf(stderr, __FUNCTION__ ": processing opkg %s -- ared_file=%s\n", package_filename, ared_file);*/
                 /* walk through outer tar file to find ared_file */
-                while ((tar_header = get_header_tar(unzipped_ipkg_stream)) != NULL) {
+                while ((tar_header = get_header_tar(unzipped_opkg_stream)) != NULL) {
                         int name_offset = 0;
                         if (strncmp(tar_header->name, "./", 2) == 0)
@@ -779 +779 @@
                         if (strcmp(ared_file, tar_header->name+name_offset) == 0) {
                                 /* open a stream of decompressed data */
-                                uncompressed_stream = gz_open(unzipped_ipkg_stream, &gunzip_pid);
+                                uncompressed_stream = gz_open(unzipped_opkg_stream, &gunzip_pid);
                                 archive_offset = 0;
                                 /*fprintf(stderr, __FUNCTION__ ":%d: here -- found file\n", __LINE__);*/
@@ -795 +795 @@
                                 break;
                         }
-                        seek_sub_file(unzipped_ipkg_stream, tar_header->size);
+                        seek_sub_file(unzipped_opkg_stream, tar_header->size);
                         free_header_tar(tar_header);
                 }
-                gz_close(unzipped_ipkg_pid);
-                fclose(unzipped_ipkg_stream);
+                gz_close(unzipped_opkg_pid);
+                fclose(unzipped_opkg_stream);
                 fclose(deb_stream);
                 free(ared_file);

trunk/src/target/ipkg/libopkg.c

@@ -1 @@
-/* ipkglib.c - the itsy package management system
+/* opkglib.c - the itsy package management system
 
    Florina Boor
@@ -16 +16 @@
 */
 
-#ifdef IPKG_LIB
-
-#include "ipkg.h"
+#ifdef OPKG_LIB
+
+#include "opkg.h"
 #include "includes.h"
-#include "libipkg.h"
+#include "libopkg.h"
 
 #include "args.h"
-#include "ipkg_conf.h"
-#include "ipkg_cmd.h"
+#include "opkg_conf.h"
+#include "opkg_cmd.h"
 #include "file_util.h"
 
 
 
-ipkg_message_callback ipkg_cb_message = NULL;
-ipkg_response_callback ipkg_cb_response = NULL;
-ipkg_status_callback ipkg_cb_status = NULL;
-ipkg_list_callback ipkg_cb_list = NULL;
-
-
-int
-ipkg_init (ipkg_message_callback mcall, 
-           ipkg_response_callback rcall,
+opkg_message_callback opkg_cb_message = NULL;
+opkg_response_callback opkg_cb_response = NULL;
+opkg_status_callback opkg_cb_status = NULL;
+opkg_list_callback opkg_cb_list = NULL;
+
+
+int
+opkg_init (opkg_message_callback mcall, 
+           opkg_response_callback rcall,
            args_t * args)
 {
-        ipkg_cb_message = mcall;
-        ipkg_cb_response = rcall;
+        opkg_cb_message = mcall;
+        opkg_cb_response = rcall;
 
         args_init (args);
@@ -50 +50 @@
 
 int
-ipkg_deinit (args_t * args)
+opkg_deinit (args_t * args)
 {
         args_deinit (args);
-        ipkg_cb_message = NULL;
-        ipkg_cb_response = NULL;
+        opkg_cb_message = NULL;
+        opkg_cb_response = NULL;
 
         /* place other cleanup stuff here */
@@ -63 +63 @@
 
 int
-ipkg_packages_list(args_t *args, 
+opkg_packages_list(args_t *args, 
                    const char *packages, 
-                   ipkg_list_callback cblist,
+                   opkg_list_callback cblist,
                    void *userdata)
 {
-        ipkg_cmd_t *cmd;
-        ipkg_conf_t ipkg_conf;
-        int err;
-
-        err = ipkg_conf_init (&ipkg_conf, args);
-        if (err)
-        {
-                return err;
-        }
-
-        ipkg_cb_list = cblist;
-        /* we need to do this because of static declarations, 
-         * maybe a good idea to change */
-        cmd = ipkg_cmd_find ("list");
+        opkg_cmd_t *cmd;
+        opkg_conf_t opkg_conf;
+        int err;
+
+        err = opkg_conf_init (&opkg_conf, args);
+        if (err)
+        {
+                return err;
+        }
+
+        opkg_cb_list = cblist;
+        /* we need to do this because of static declarations, 
+         * maybe a good idea to change */
+        cmd = opkg_cmd_find ("list");
         if (packages)
-                err = ipkg_cmd_exec (cmd, &ipkg_conf, 1, &packages, userdata);
+                err = opkg_cmd_exec (cmd, &opkg_conf, 1, &packages, userdata);
         else
-                err = ipkg_cmd_exec (cmd, &ipkg_conf, 0, NULL, userdata);
-        ipkg_cb_list = NULL;
-        ipkg_conf_deinit (&ipkg_conf);
-        return (err);
-}
-
-
-int
-ipkg_packages_status(args_t *args,
+                err = opkg_cmd_exec (cmd, &opkg_conf, 0, NULL, userdata);
+        opkg_cb_list = NULL;
+        opkg_conf_deinit (&opkg_conf);
+        return (err);
+}
+
+
+int
+opkg_packages_status(args_t *args,
                      const char *packages,
-                     ipkg_status_callback cbstatus,
+                     opkg_status_callback cbstatus,
                      void *userdata)
 {
-        ipkg_cmd_t *cmd;
-        ipkg_conf_t ipkg_conf;
-        int err;
-
-        err = ipkg_conf_init (&ipkg_conf, args);
-        if (err)
-        {
-                return err;
-        }
-
-        ipkg_cb_status = cbstatus;
+        opkg_cmd_t *cmd;
+        opkg_conf_t opkg_conf;
+        int err;
+
+        err = opkg_conf_init (&opkg_conf, args);
+        if (err)
+        {
+                return err;
+        }
+
+        opkg_cb_status = cbstatus;
 
         /* we need to do this because of static declarations,
          * maybe a good idea to change */
-        cmd = ipkg_cmd_find ("status");
+        cmd = opkg_cmd_find ("status");
         if (packages)
-                err = ipkg_cmd_exec (cmd, &ipkg_conf, 1, &packages, userdata);
+                err = opkg_cmd_exec (cmd, &opkg_conf, 1, &packages, userdata);
         else
-                err = ipkg_cmd_exec (cmd, &ipkg_conf, 0, NULL, userdata);
-
-        ipkg_cb_status = NULL;
-        ipkg_conf_deinit (&ipkg_conf);
-        return (err);
-}
-
-
-int
-ipkg_packages_info(args_t *args,
+                err = opkg_cmd_exec (cmd, &opkg_conf, 0, NULL, userdata);
+
+        opkg_cb_status = NULL;
+        opkg_conf_deinit (&opkg_conf);
+        return (err);
+}
+
+
+int
+opkg_packages_info(args_t *args,
                    const char *packages,
-                   ipkg_status_callback cbstatus,
+                   opkg_status_callback cbstatus,
                    void *userdata)
 {
-        ipkg_cmd_t *cmd;
-        ipkg_conf_t ipkg_conf;
-        int err;
-
-        err = ipkg_conf_init (&ipkg_conf, args);
-        if (err)
-        {
-                return err;
-        }
-
-        ipkg_cb_status = cbstatus;
+        opkg_cmd_t *cmd;
+        opkg_conf_t opkg_conf;
+        int err;
+
+        err = opkg_conf_init (&opkg_conf, args);
+        if (err)
+        {
+                return err;
+        }
+
+        opkg_cb_status = cbstatus;
 
         /* we need to do this because of static declarations,
          * maybe a good idea to change */
-        cmd = ipkg_cmd_find ("info");
+        cmd = opkg_cmd_find ("info");
         if (packages)
-                err = ipkg_cmd_exec (cmd, &ipkg_conf, 1, &packages, userdata);
+                err = opkg_cmd_exec (cmd, &opkg_conf, 1, &packages, userdata);
         else
-                err = ipkg_cmd_exec (cmd, &ipkg_conf, 0, NULL, userdata);
-
-        ipkg_cb_status = NULL;
-        ipkg_conf_deinit (&ipkg_conf);
-        return (err);
-}
-
-
-int
-ipkg_packages_install (args_t * args, const char *name)
-{
-        ipkg_cmd_t *cmd;
-        ipkg_conf_t ipkg_conf;
+                err = opkg_cmd_exec (cmd, &opkg_conf, 0, NULL, userdata);
+
+        opkg_cb_status = NULL;
+        opkg_conf_deinit (&opkg_conf);
+        return (err);
+}
+
+
+int
+opkg_packages_install (args_t * args, const char *name)
+{
+        opkg_cmd_t *cmd;
+        opkg_conf_t opkg_conf;
         int err;
 
@@ -167 +167 @@
                 return (-1);
 
-        err = ipkg_conf_init (&ipkg_conf, args);
+        err = opkg_conf_init (&opkg_conf, args);
         if (err)
         {
@@ -175 +175 @@
         /* we need to do this because of static declarations,
          * maybe a good idea to change */
-        cmd = ipkg_cmd_find ("install");
-        err = ipkg_cmd_exec (cmd, &ipkg_conf, 1, &name, NULL);
-
-        ipkg_conf_deinit(&ipkg_conf);
-        return (err);
-}
-
-
-int
-ipkg_packages_remove(args_t *args, const char *name, int purge)
-{
-        ipkg_cmd_t *cmd;
-        ipkg_conf_t ipkg_conf;
+        cmd = opkg_cmd_find ("install");
+        err = opkg_cmd_exec (cmd, &opkg_conf, 1, &name, NULL);
+
+        opkg_conf_deinit(&opkg_conf);
+        return (err);
+}
+
+
+int
+opkg_packages_remove(args_t *args, const char *name, int purge)
+{
+        opkg_cmd_t *cmd;
+        opkg_conf_t opkg_conf;
         int err;
 
@@ -194 +194 @@
                 return (-1);
 
-        err = ipkg_conf_init (&ipkg_conf, args);
+        err = opkg_conf_init (&opkg_conf, args);
         if (err)
         {
@@ -203 +203 @@
          * maybe a good idea to change */
         if (purge)
-                cmd = ipkg_cmd_find ("purge");
+                cmd = opkg_cmd_find ("purge");
         else
-                cmd = ipkg_cmd_find ("remove");
-
-        err = ipkg_cmd_exec (cmd, &ipkg_conf, 1, &name, NULL);
-        
-        ipkg_conf_deinit(&ipkg_conf);
+                cmd = opkg_cmd_find ("remove");
+
+        err = opkg_cmd_exec (cmd, &opkg_conf, 1, &name, NULL);
+        
+        opkg_conf_deinit(&opkg_conf);
         return (err);
 }
@@ -215 +215 @@
 
 int 
-ipkg_lists_update(args_t *args)
-{
-        ipkg_cmd_t *cmd;
-        ipkg_conf_t ipkg_conf;
-        int err;
-
-        err = ipkg_conf_init (&ipkg_conf, args);
-        if (err)
-        {
-                return err;
-        }
-
-        /* we need to do this because of static declarations, 
-         * maybe a good idea to change */
-        cmd = ipkg_cmd_find ("update");
-
-        err = ipkg_cmd_exec (cmd, &ipkg_conf, 0, NULL, NULL);
-        
-        ipkg_conf_deinit(&ipkg_conf);
+opkg_lists_update(args_t *args)
+{
+        opkg_cmd_t *cmd;
+        opkg_conf_t opkg_conf;
+        int err;
+
+        err = opkg_conf_init (&opkg_conf, args);
+        if (err)
+        {
+                return err;
+        }
+
+        /* we need to do this because of static declarations, 
+         * maybe a good idea to change */
+        cmd = opkg_cmd_find ("update");
+
+        err = opkg_cmd_exec (cmd, &opkg_conf, 0, NULL, NULL);
+        
+        opkg_conf_deinit(&opkg_conf);
         return (err);
 }
@@ -239 +239 @@
 
 int 
-ipkg_packages_upgrade(args_t *args)
-{
-        ipkg_cmd_t *cmd;
-        ipkg_conf_t ipkg_conf;
-        int err;
-
-        err = ipkg_conf_init (&ipkg_conf, args);
-        if (err)
-        {
-                return err;
-        }
-
-        /* we need to do this because of static declarations, 
-         * maybe a good idea to change */
-        cmd = ipkg_cmd_find ("upgrade");
-
-        err = ipkg_cmd_exec (cmd, &ipkg_conf, 0, NULL, NULL);
-        
-        ipkg_conf_deinit(&ipkg_conf);
-        return (err);
-}
-
-
-int
-ipkg_packages_download (args_t * args, const char *name)
-{
-        ipkg_cmd_t *cmd;
-        ipkg_conf_t ipkg_conf;
+opkg_packages_upgrade(args_t *args)
+{
+        opkg_cmd_t *cmd;
+        opkg_conf_t opkg_conf;
+        int err;
+
+        err = opkg_conf_init (&opkg_conf, args);
+        if (err)
+        {
+                return err;
+        }
+
+        /* we need to do this because of static declarations, 
+         * maybe a good idea to change */
+        cmd = opkg_cmd_find ("upgrade");
+
+        err = opkg_cmd_exec (cmd, &opkg_conf, 0, NULL, NULL);
+        
+        opkg_conf_deinit(&opkg_conf);
+        return (err);
+}
+
+
+int
+opkg_packages_download (args_t * args, const char *name)
+{
+        opkg_cmd_t *cmd;
+        opkg_conf_t opkg_conf;
         int err;
 
@@ -273 +273 @@
                 return (-1);
 
-        err = ipkg_conf_init (&ipkg_conf, args);
+        err = opkg_conf_init (&opkg_conf, args);
         if (err)
         {
@@ -281 +281 @@
         /* we need to do this because of static declarations,
          * maybe a good idea to change */
-        cmd = ipkg_cmd_find ("download");
-        err = ipkg_cmd_exec (cmd, &ipkg_conf, 1, &name, NULL);
-
-        ipkg_conf_deinit(&ipkg_conf);
-        return (err);
-}
-
-
-int
-ipkg_package_files(args_t *args, 
+        cmd = opkg_cmd_find ("download");
+        err = opkg_cmd_exec (cmd, &opkg_conf, 1, &name, NULL);
+
+        opkg_conf_deinit(&opkg_conf);
+        return (err);
+}
+
+
+int
+opkg_package_files(args_t *args, 
                    const char *name, 
-                   ipkg_list_callback cblist,
+                   opkg_list_callback cblist,
                    void *userdata)
 {
-        ipkg_cmd_t *cmd;
-        ipkg_conf_t ipkg_conf;
+        opkg_cmd_t *cmd;
+        opkg_conf_t opkg_conf;
         int err;
 
@@ -303 +303 @@
                 return (-1);
 
-        err = ipkg_conf_init (&ipkg_conf, args);
-        if (err)
-        {
-                return err;
-        }
-
-        ipkg_cb_list = cblist;
-        
-        /* we need to do this because of static declarations, 
-         * maybe a good idea to change */
-        cmd = ipkg_cmd_find ("files");
-
-        err = ipkg_cmd_exec (cmd, &ipkg_conf, 1, &name, userdata);
-        
-        ipkg_cb_list = NULL;
-        ipkg_conf_deinit(&ipkg_conf);
+        err = opkg_conf_init (&opkg_conf, args);
+        if (err)
+        {
+                return err;
+        }
+
+        opkg_cb_list = cblist;
+        
+        /* we need to do this because of static declarations, 
+         * maybe a good idea to change */
+        cmd = opkg_cmd_find ("files");
+
+        err = opkg_cmd_exec (cmd, &opkg_conf, 1, &name, userdata);
+        
+        opkg_cb_list = NULL;
+        opkg_conf_deinit(&opkg_conf);
         return (err);
 }
@@ -324 +324 @@
 
 int 
-ipkg_file_search(args_t *args, 
+opkg_file_search(args_t *args, 
                 const char *file,
-                                ipkg_list_callback cblist,
+                                opkg_list_callback cblist,
                 void *userdata)
 {
-        ipkg_cmd_t *cmd;
-        ipkg_conf_t ipkg_conf;
+        opkg_cmd_t *cmd;
+        opkg_conf_t opkg_conf;
         int err;
         
@@ -337 +337 @@
                 return (-1);
 
-        err = ipkg_conf_init (&ipkg_conf, args);
-        if (err)
-        {
-                return err;
-        }
-
-        ipkg_cb_list = cblist;
-
-        /* we need to do this because of static declarations, 
-         * maybe a good idea to change */
-        cmd = ipkg_cmd_find ("search");
-        err = ipkg_cmd_exec (cmd, &ipkg_conf, 1, &file, userdata);
-        
-        ipkg_cb_list = NULL;
-        ipkg_conf_deinit(&ipkg_conf);
+        err = opkg_conf_init (&opkg_conf, args);
+        if (err)
+        {
+                return err;
+        }
+
+        opkg_cb_list = cblist;
+
+        /* we need to do this because of static declarations, 
+         * maybe a good idea to change */
+        cmd = opkg_cmd_find ("search");
+        err = opkg_cmd_exec (cmd, &opkg_conf, 1, &file, userdata);
+        
+        opkg_cb_list = NULL;
+        opkg_conf_deinit(&opkg_conf);
         return(err);
 }
@@ -357 +357 @@
 
 int 
-ipkg_file_what(args_t *args, const char *file, const char* command)
-{
-        ipkg_cmd_t *cmd;
-        ipkg_conf_t ipkg_conf;
+opkg_file_what(args_t *args, const char *file, const char* command)
+{
+        opkg_cmd_t *cmd;
+        opkg_conf_t opkg_conf;
         int err;
         
@@ -367 +367 @@
                 return (-1);
 
-        err = ipkg_conf_init (&ipkg_conf, args);
-        if (err)
-        {
-                return err;
-        }
-
-        /* we need to do this because of static declarations, 
-         * maybe a good idea to change */
-        cmd = ipkg_cmd_find (command);
-        err = ipkg_cmd_exec (cmd, &ipkg_conf, 1, &file, NULL);
-        
-        ipkg_conf_deinit(&ipkg_conf);
+        err = opkg_conf_init (&opkg_conf, args);
+        if (err)
+        {
+                return err;
+        }
+
+        /* we need to do this because of static declarations, 
+         * maybe a good idea to change */
+        cmd = opkg_cmd_find (command);
+        err = opkg_cmd_exec (cmd, &opkg_conf, 1, &file, NULL);
+        
+        opkg_conf_deinit(&opkg_conf);
         return(err);
 }
 
-#define ipkg_package_whatdepends(args,file) ipkg_file_what(args,file,"whatdepends")
-#define ipkg_package_whatrecommends(args, file) ipkg_file_what(args,file,"whatrecommends")
-#define ipkg_package_whatprovides(args, file) ipkg_file_what(args,file,"whatprovides")
-#define ipkg_package_whatconflicts(args, file) ipkg_file_what(args,file,"whatconflicts")
-#define ipkg_package_whatreplaces(args, file) ipkg_file_what(args,file,"whatreplaces")
-
-
-int default_ipkg_message_callback(ipkg_conf_t *conf, message_level_t level, 
+#define opkg_package_whatdepends(args,file) opkg_file_what(args,file,"whatdepends")
+#define opkg_package_whatrecommends(args, file) opkg_file_what(args,file,"whatrecommends")
+#define opkg_package_whatprovides(args, file) opkg_file_what(args,file,"whatprovides")
+#define opkg_package_whatconflicts(args, file) opkg_file_what(args,file,"whatconflicts")
+#define opkg_package_whatreplaces(args, file) opkg_file_what(args,file,"whatreplaces")
+
+
+int default_opkg_message_callback(opkg_conf_t *conf, message_level_t level, 
                                   char *msg)
 {
@@ -395 +395 @@
           return 0;
      } else {
-#ifdef IPKG_LIB
-          if ( level == IPKG_ERROR ){
+#ifdef OPKG_LIB
+          if ( level == OPKG_ERROR ){
              push_error_list(&error_list, msg); 
 //           printf(msg);
@@ -406 +406 @@
 }
 
-int default_ipkg_list_callback(char *name, char *desc, char *version, 
+int default_opkg_list_callback(char *name, char *desc, char *version, 
                                pkg_state_status_t status, void *userdata)
 {
@@ -416 +416 @@
 }
 
-int default_ipkg_files_callback(char *name, char *desc, char *version,
+int default_opkg_files_callback(char *name, char *desc, char *version,
                    pkg_state_status_t status, void *userdata)
 {
@@ -424 +424 @@
 }
 
-int default_ipkg_status_callback(char *name, int istatus, char *desc,
+int default_opkg_status_callback(char *name, int istatus, char *desc,
                                  void *userdata)
 {
@@ -431 +431 @@
 }
 
-char* default_ipkg_response_callback(char *question)
+char* default_opkg_response_callback(char *question)
 {
      char *response = NULL;
@@ -444 +444 @@
 /* This is used for backward compatibility */
 int
-ipkg_op (int argc, char *argv[])
+opkg_op (int argc, char *argv[])
 {
         int err, optind;
         args_t args;
         char *cmd_name;
-        ipkg_cmd_t *cmd;
-        ipkg_conf_t ipkg_conf;
+        opkg_cmd_t *cmd;
+        opkg_conf_t opkg_conf;
 
         args_init (&args);
@@ -457 +457 @@
         if (optind == argc || optind < 0)
         {
-                args_usage ("ipkg must have one sub-command argument");
+                args_usage ("opkg must have one sub-command argument");
         }
 
@@ -486 +486 @@
 
 
-        err = ipkg_conf_init (&ipkg_conf, &args);
+        err = opkg_conf_init (&opkg_conf, &args);
         if (err)
         {
@@ -494 +494 @@
         args_deinit (&args);
 
-        ipkg_cb_message = default_ipkg_message_callback;
-        ipkg_cb_response = default_ipkg_response_callback;
-        ipkg_cb_status = default_ipkg_status_callback;
+        opkg_cb_message = default_opkg_message_callback;
+        opkg_cb_response = default_opkg_response_callback;
+        opkg_cb_status = default_opkg_status_callback;
         if ( strcmp(cmd_name, "files")==0)
-             ipkg_cb_list = default_ipkg_files_callback;
+             opkg_cb_list = default_opkg_files_callback;
         else
-             ipkg_cb_list = default_ipkg_list_callback;
-
-        cmd = ipkg_cmd_find (cmd_name);
+             opkg_cb_list = default_opkg_list_callback;
+
+        cmd = opkg_cmd_find (cmd_name);
         if (cmd == NULL)
         {
@@ -518 +518 @@
         }
 
-        err = ipkg_cmd_exec (cmd, &ipkg_conf, argc - optind, (const char **) (argv + optind), NULL);
-
-        ipkg_conf_deinit (&ipkg_conf);
+        err = opkg_cmd_exec (cmd, &opkg_conf, argc - optind, (const char **) (argv + optind), NULL);
+
+        opkg_conf_deinit (&opkg_conf);
 
         return err;
 }
 
-#endif /* IPKG_LIB */
+#endif /* OPKG_LIB */

trunk/src/target/ipkg/libopkg.h

@@ -1 @@
-/* ipkglib.h - the itsy package management system
+/* opkglib.h - the itsy package management system
 
    Florian Boor <florian.boor@kernelconcepts.de>
@@ -14 +14 @@
 */
 
-#ifndef IPKGLIB_H
-#define IPKGLIB_H
+#ifndef OPKGLIB_H
+#define OPKGLIB_H
 
 #ifdef HAVE_CONFIG_H
@@ -22 +22 @@
 
 
-#ifdef IPKG_LIB
+#ifdef OPKG_LIB
 
-#include "ipkg_conf.h"
-#include "ipkg_message.h"
+#include "opkg_conf.h"
+#include "opkg_message.h"
 
 #include "args.h"
 #include "pkg.h"
 
-typedef int (*ipkg_message_callback)(ipkg_conf_t *conf, message_level_t level, 
+typedef int (*opkg_message_callback)(opkg_conf_t *conf, message_level_t level, 
         char *msg);
-typedef int (*ipkg_list_callback)(char *name, char *desc, char *version, 
+typedef int (*opkg_list_callback)(char *name, char *desc, char *version, 
         pkg_state_status_t status, void *userdata);
-typedef int (*ipkg_status_callback)(char *name, int istatus, char *desc,
+typedef int (*opkg_status_callback)(char *name, int istatus, char *desc,
         void *userdata);
-typedef char* (*ipkg_response_callback)(char *question);
+typedef char* (*opkg_response_callback)(char *question);
 
-extern int ipkg_op(int argc, char *argv[]); /* ipkglib.c */
-extern int ipkg_init (ipkg_message_callback mcall, 
-                      ipkg_response_callback rcall,
+extern int opkg_op(int argc, char *argv[]); /* opkglib.c */
+extern int opkg_init (opkg_message_callback mcall, 
+                      opkg_response_callback rcall,
                                           args_t * args);
 
-extern int ipkg_deinit (args_t *args);
-extern int ipkg_packages_list(args_t *args, 
+extern int opkg_deinit (args_t *args);
+extern int opkg_packages_list(args_t *args, 
                               const char *packages, 
-                              ipkg_list_callback cblist,
+                              opkg_list_callback cblist,
                               void *userdata);
-extern int ipkg_packages_status(args_t *args, 
+extern int opkg_packages_status(args_t *args, 
                                 const char *packages, 
-                                ipkg_status_callback cbstatus,
+                                opkg_status_callback cbstatus,
                                                                 void *userdata);
-extern int ipkg_packages_info(args_t *args,
+extern int opkg_packages_info(args_t *args,
                               const char *packages,
-                              ipkg_status_callback cbstatus,
+                              opkg_status_callback cbstatus,
                               void *userdata);
-extern int ipkg_packages_install(args_t *args, const char *name);
-extern int ipkg_packages_remove(args_t *args, const char *name, int purge);
-extern int ipkg_lists_update(args_t *args);
-extern int ipkg_packages_upgrade(args_t *args);
-extern int ipkg_packages_download(args_t *args, const char *name);
-extern int ipkg_package_files(args_t *args,
+extern int opkg_packages_install(args_t *args, const char *name);
+extern int opkg_packages_remove(args_t *args, const char *name, int purge);
+extern int opkg_lists_update(args_t *args);
+extern int opkg_packages_upgrade(args_t *args);
+extern int opkg_packages_download(args_t *args, const char *name);
+extern int opkg_package_files(args_t *args,
                               const char *name,
-                                                          ipkg_list_callback cblist,
+                                                          opkg_list_callback cblist,
                                                           void *userdata);
-extern int ipkg_file_search(args_t *args,
+extern int opkg_file_search(args_t *args,
                             const char *file,
-                                                        ipkg_list_callback cblist,
+                                                        opkg_list_callback cblist,
                                                         void *userdata);
-extern int ipkg_package_whatdepends(args_t *args, const char *file);
-extern int ipkg_package_whatrecommends(args_t *args, const char *file);
-extern int ipkg_package_whatprovides(args_t *args, const char *file);
-extern int ipkg_package_whatconflicts(args_t *args, const char *file);
-extern int ipkg_package_whatreplaces(args_t *args, const char *file);
+extern int opkg_package_whatdepends(args_t *args, const char *file);
+extern int opkg_package_whatrecommends(args_t *args, const char *file);
+extern int opkg_package_whatprovides(args_t *args, const char *file);
+extern int opkg_package_whatconflicts(args_t *args, const char *file);
+extern int opkg_package_whatreplaces(args_t *args, const char *file);
 
-extern ipkg_message_callback ipkg_cb_message; /* ipkglib.c */
-extern ipkg_response_callback ipkg_cb_response;
-extern ipkg_status_callback ipkg_cb_status;
-extern ipkg_list_callback ipkg_cb_list;
+extern opkg_message_callback opkg_cb_message; /* opkglib.c */
+extern opkg_response_callback opkg_cb_response;
+extern opkg_status_callback opkg_cb_status;
+extern opkg_list_callback opkg_cb_list;
 extern void push_error_list(struct errlist **errors,char * msg);
 extern void reverse_error_list(struct errlist **errors);

trunk/src/target/ipkg/libopkg.pc.in

@@ -4 +4 @@
 includedir=${prefix}/include
 
-Name: libipkg
-Description: ipkg package manager library
+Name: libopkg
+Description: opkg package manager library
 Version: @VERSION@
-Libs: -L${libdir} -lipkg
-Cflags: -I${includedir}/libipkg
+Libs: -L${libdir} -lopkg
+Cflags: -I${includedir}/libopkg
 

trunk/src/target/ipkg/md5.c

@@ -21 +21 @@
 /* Hacked to work with BusyBox by Alfred M. Szmidt <ams@trillian.itslinux.org> */
 
-/* Sucked directly into ipkg since the md5sum functions aren't in libbb
-   Dropped a few functions since ipkg only needs md5_stream.
+/* Sucked directly into opkg since the md5sum functions aren't in libbb
+   Dropped a few functions since opkg only needs md5_stream.
    Got rid of evil, twisted defines of FALSE=1 and TRUE=0
    6 March 2002 Carl Worth <cworth@east.isi.edu>

trunk/src/target/ipkg/nv_pair.c

@@ -16 +16 @@
 */
 
-#include "ipkg.h"
+#include "opkg.h"
 
 #include "nv_pair.h"

trunk/src/target/ipkg/nv_pair_list.c

@@ -16 +16 @@
 */
 
-#include "ipkg.h"
+#include "opkg.h"
 
 #include "nv_pair.h"

trunk/src/target/ipkg/opkg-frontend.c

@@ -1 @@
-/* ipkg-frontend.c - the itsy package management system
+/* opkg-frontend.c - the itsy package management system
 
    Florina Boor
@@ -15 +15 @@
    General Public License for more details.
    
-   ipkg command line frontend using libipkg
+   opkg command line frontend using libopkg
    
 */
 
-#include "libipkg.h"
+#include "libopkg.h"
 
 /* This is really small, eh? ;-) */
@@ -25 +25 @@
 int main(int argc, char *argv[])
 {
-        return ipkg_op(argc,argv);      
+        return opkg_op(argc,argv);      
 }

trunk/src/target/ipkg/opkg.c

@@ -1 @@
-/* ipkg.c - the itsy package management system
+/* opkg.c - the itsy package management system
 
    Carl D. Worth
@@ -16 +16 @@
 */
 
-#include "ipkg.h"
+#include "opkg.h"
 
 #include "args.h"
-#include "ipkg_conf.h"
-#include "ipkg_cmd.h"
+#include "opkg_conf.h"
+#include "opkg_cmd.h"
 
 int main(int argc, const char *argv[])
@@ -27 +27 @@
     args_t args;
     char *cmd_name;
-    ipkg_cmd_t *cmd;
-    ipkg_conf_t ipkg_conf;
+    opkg_cmd_t *cmd;
+    opkg_conf_t opkg_conf;
 
     error_list=NULL;
@@ -36 +36 @@
     optind = args_parse(&args, argc, argv);
     if (optind == argc || optind < 0) {
-        args_usage("ipkg must have one sub-command argument");
+        args_usage("opkg must have one sub-command argument");
     }
 
     cmd_name = argv[optind++];
 
-    err = ipkg_conf_init(&ipkg_conf, &args);
+    err = opkg_conf_init(&opkg_conf, &args);
     if (err) {
         return err;
@@ -48 +48 @@
     args_deinit(&args);
 
-    cmd = ipkg_cmd_find(cmd_name);
+    cmd = opkg_cmd_find(cmd_name);
     if (cmd == NULL) {
         fprintf(stderr, "%s: unknown sub-command %s\n", argv[0], cmd_name);
@@ -60 +60 @@
     }
 
-    err = ipkg_cmd_exec(cmd, &ipkg_conf, argc - optind, argv + optind);
+    err = opkg_cmd_exec(cmd, &opkg_conf, argc - optind, argv + optind);
 
     if ( err == 0 ) {
-       ipkg_message(ipkg_conf, IPKG_NOTICE, "Succesfully done.\n");
+       opkg_message(opkg_conf, OPKG_NOTICE, "Succesfully done.\n");
     } else {
-       ipkg_message(ipkg_conf, IPKG_NOTICE, "Error returned. Return value is %d\n.",err);
+       opkg_message(opkg_conf, OPKG_NOTICE, "Error returned. Return value is %d\n.",err);
 
 }
@@ -71 +71 @@
     }
     /* XXX: FEATURE request: run ldconfig and/or depmod after package needing them are installed or removed */  
-    // ipkg_global_postinst();
+    // opkg_global_postinst();
 
-    ipkg_conf_deinit(&ipkg_conf);
+    opkg_conf_deinit(&opkg_conf);
 
     return err;

trunk/src/target/ipkg/opkg.h

@@ -1 @@
-/* ipkg.h - the itsy package management system
+/* opkg.h - the itsy package management system
 
    Carl D. Worth
@@ -16 +16 @@
 */
 
-#ifndef IPKG_H
-#define IPKG_H
+#ifndef OPKG_H
+#define OPKG_H
 
 #ifdef HAVE_CONFIG_H
@@ -24 +24 @@
 
 #if 0
-#define IPKG_DEBUG_NO_TMP_CLEANUP
+#define OPKG_DEBUG_NO_TMP_CLEANUP
 #endif
 
 #include "includes.h"
-#include "ipkg_conf.h"
-#include "ipkg_message.h"
+#include "opkg_conf.h"
+#include "opkg_message.h"
 
-#define IPKG_PKG_EXTENSION ".ipk"
+#define OPKG_PKG_EXTENSION ".ipk"
 #define DPKG_PKG_EXTENSION ".deb"
 
-#define IPKG_LEGAL_PKG_NAME_CHARS "abcdefghijklmnopqrstuvwxyz0123456789.+-"
-#define IPKG_PKG_VERSION_SEP_CHAR '_'
+#define OPKG_LEGAL_PKG_NAME_CHARS "abcdefghijklmnopqrstuvwxyz0123456789.+-"
+#define OPKG_PKG_VERSION_SEP_CHAR '_'
 
-#define IPKG_STATE_DIR_PREFIX IPKGLIBDIR"/ipkg"
-#define IPKG_LISTS_DIR_SUFFIX "lists"
-#define IPKG_INFO_DIR_SUFFIX "info"
-#define IPKG_STATUS_FILE_SUFFIX "status"
+#define OPKG_STATE_DIR_PREFIX OPKGLIBDIR"/opkg"
+#define OPKG_LISTS_DIR_SUFFIX "lists"
+#define OPKG_INFO_DIR_SUFFIX "info"
+#define OPKG_STATUS_FILE_SUFFIX "status"
 
-#define IPKG_BACKUP_SUFFIX "-ipkg.backup"
+#define OPKG_BACKUP_SUFFIX "-opkg.backup"
 
-#define IPKG_LIST_DESCRIPTION_LENGTH 128
+#define OPKG_LIST_DESCRIPTION_LENGTH 128
 
-enum ipkg_error {
-    IPKG_SUCCESS = 0,
-    IPKG_PKG_DEPS_UNSATISFIED,
-    IPKG_PKG_IS_ESSENTIAL,
-    IPKG_PKG_HAS_DEPENDENTS,
-    IPKG_PKG_HAS_NO_CANDIDATE
+enum opkg_error {
+    OPKG_SUCCESS = 0,
+    OPKG_PKG_DEPS_UNSATISFIED,
+    OPKG_PKG_IS_ESSENTIAL,
+    OPKG_PKG_HAS_DEPENDENTS,
+    OPKG_PKG_HAS_NO_CANDIDATE
 };
-typedef enum ipkg_error ipkg_error_t;
+typedef enum opkg_error opkg_error_t;
 
-extern int ipkg_state_changed;
+extern int opkg_state_changed;
 
 

trunk/src/target/ipkg/opkg.h.in

@@ -1 @@
-/* ipkg.h - the itsy package management system
+/* opkg.h - the itsy package management system
 
    Carl D. Worth
@@ -16 +16 @@
 */
 
-#ifndef IPKG_H
-#define IPKG_H
+#ifndef OPKG_H
+#define OPKG_H
 
 #ifdef HAVE_CONFIG_H
@@ -24 +24 @@
 
 #if 0
-#define IPKG_DEBUG_NO_TMP_CLEANUP
+#define OPKG_DEBUG_NO_TMP_CLEANUP
 #endif
 
 #include "includes.h"
-#include "ipkg_conf.h"
-#include "ipkg_message.h"
+#include "opkg_conf.h"
+#include "opkg_message.h"
 
-#define IPKG_PKG_EXTENSION ".ipk"
+#define OPKG_PKG_EXTENSION ".ipk"
 #define DPKG_PKG_EXTENSION ".deb"
 
-#define IPKG_LEGAL_PKG_NAME_CHARS "abcdefghijklmnopqrstuvwxyz0123456789.+-"
-#define IPKG_PKG_VERSION_SEP_CHAR '_'
+#define OPKG_LEGAL_PKG_NAME_CHARS "abcdefghijklmnopqrstuvwxyz0123456789.+-"
+#define OPKG_PKG_VERSION_SEP_CHAR '_'
 
-#define IPKG_STATE_DIR_PREFIX IPKGLIBDIR"/ipkg"
-#define IPKG_LISTS_DIR_SUFFIX "lists"
-#define IPKG_INFO_DIR_SUFFIX "info"
-#define IPKG_STATUS_FILE_SUFFIX "status"
+#define OPKG_STATE_DIR_PREFIX OPKGLIBDIR"/opkg"
+#define OPKG_LISTS_DIR_SUFFIX "lists"
+#define OPKG_INFO_DIR_SUFFIX "info"
+#define OPKG_STATUS_FILE_SUFFIX "status"
 
-#define IPKG_BACKUP_SUFFIX "-ipkg.backup"
+#define OPKG_BACKUP_SUFFIX "-opkg.backup"
 
-#define IPKG_LIST_DESCRIPTION_LENGTH 128
+#define OPKG_LIST_DESCRIPTION_LENGTH 128
 
-enum ipkg_error {
-    IPKG_SUCCESS = 0,
-    IPKG_PKG_DEPS_UNSATISFIED,
-    IPKG_PKG_IS_ESSENTIAL,
-    IPKG_PKG_HAS_DEPENDENTS,
-    IPKG_PKG_HAS_NO_CANDIDATE
+enum opkg_error {
+    OPKG_SUCCESS = 0,
+    OPKG_PKG_DEPS_UNSATISFIED,
+    OPKG_PKG_IS_ESSENTIAL,
+    OPKG_PKG_HAS_DEPENDENTS,
+    OPKG_PKG_HAS_NO_CANDIDATE
 };
-typedef enum ipkg_error ipkg_error_t;
+typedef enum opkg_error opkg_error_t;
 
-extern int ipkg_state_changed;
+extern int opkg_state_changed;
 
 

trunk/src/target/ipkg/opkg_cmd.c

@@ -1 @@
-/* ipkg_cmd.c - the itsy package management system
+/* opkg_cmd.c - the itsy package management system
 
    Carl D. Worth
@@ -18 +18 @@
 #include <string.h>
 
-#include "ipkg.h"
+#include "opkg.h"
 #include <libgen.h>
 #include <glob.h>
@@ -28 +28 @@
 #include <dirent.h>
 
-#include "ipkg_conf.h"
-#include "ipkg_cmd.h"
-#include "ipkg_message.h"
+#include "opkg_conf.h"
+#include "opkg_cmd.h"
+#include "opkg_message.h"
 #include "pkg.h"
 #include "pkg_dest.h"
@@ -43 +43 @@
 
 
-#include "ipkg_download.h"
-#include "ipkg_install.h"
-#include "ipkg_upgrade.h"
-#include "ipkg_remove.h"
-#include "ipkg_configure.h"
-#include "ipkg_message.h"
-
-#ifdef IPKG_LIB
-#include "libipkg.h"
+#include "opkg_download.h"
+#include "opkg_install.h"
+#include "opkg_upgrade.h"
+#include "opkg_remove.h"
+#include "opkg_configure.h"
+#include "opkg_message.h"
+
+#ifdef OPKG_LIB
+#include "libopkg.h"
 static void *p_userdata = NULL;
 #endif
 
-static int ipkg_update_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_upgrade_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_list_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_info_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_status_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_install_pending_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_install_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_list_installed_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_remove_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_purge_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_flag_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_files_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_search_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_download_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_depends_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_whatdepends_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_whatdepends_recursively_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_whatsuggests_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_whatrecommends_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_whatprovides_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_whatconflicts_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_whatreplaces_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_compare_versions_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_print_architecture_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_configure_cmd(ipkg_conf_t *conf, int argc, char **argv);
+static int opkg_update_cmd(opkg_conf_t *conf, int argc, char **argv);
+static int opkg_upgrade_cmd(opkg_conf_t *conf, int argc, char **argv);
+static int opkg_list_cmd(opkg_conf_t *conf, int argc, char **argv);
+static int opkg_info_cmd(opkg_conf_t *conf, int argc, char **argv);
+static int opkg_status_cmd(opkg_conf_t *conf, int argc, char **argv);
+static int opkg_install_pending_cmd(opkg_conf_t *conf, int argc, char **argv);
+static int opkg_install_cmd(opkg_conf_t *conf, int argc, char **argv);
+static int opkg_list_installed_cmd(opkg_conf_t *conf, int argc, char **argv);
+static int opkg_remove_cmd(opkg_conf_t *conf, int argc, char **argv);
+static int opkg_purge_cmd(opkg_conf_t *conf, int argc, char **argv);
+static int opkg_flag_cmd(opkg_conf_t *conf, int argc, char **argv);
+static int opkg_files_cmd(opkg_conf_t *conf, int argc, char **argv);
+static int opkg_search_cmd(opkg_conf_t *conf, int argc, char **argv);
+static int opkg_download_cmd(opkg_conf_t *conf, int argc, char **argv);
+static int opkg_depends_cmd(opkg_conf_t *conf, int argc, char **argv);
+static int opkg_whatdepends_cmd(opkg_conf_t *conf, int argc, char **argv);
+static int opkg_whatdepends_recursively_cmd(opkg_conf_t *conf, int argc, char **argv);
+static int opkg_whatsuggests_cmd(opkg_conf_t *conf, int argc, char **argv);
+static int opkg_whatrecommends_cmd(opkg_conf_t *conf, int argc, char **argv);
+static int opkg_whatprovides_cmd(opkg_conf_t *conf, int argc, char **argv);
+static int opkg_whatconflicts_cmd(opkg_conf_t *conf, int argc, char **argv);
+static int opkg_whatreplaces_cmd(opkg_conf_t *conf, int argc, char **argv);
+static int opkg_compare_versions_cmd(opkg_conf_t *conf, int argc, char **argv);
+static int opkg_print_architecture_cmd(opkg_conf_t *conf, int argc, char **argv);
+static int opkg_configure_cmd(opkg_conf_t *conf, int argc, char **argv);
 
 /* XXX: CLEANUP: The usage strings should be incorporated into this
    array for easier maintenance */
-static ipkg_cmd_t cmds[] = {
-     {"update", 0, (ipkg_cmd_fun_t)ipkg_update_cmd}, 
-     {"upgrade", 0, (ipkg_cmd_fun_t)ipkg_upgrade_cmd},
-     {"list", 0, (ipkg_cmd_fun_t)ipkg_list_cmd},
-     {"list_installed", 0, (ipkg_cmd_fun_t)ipkg_list_installed_cmd},
-     {"info", 0, (ipkg_cmd_fun_t)ipkg_info_cmd},
-     {"flag", 1, (ipkg_cmd_fun_t)ipkg_flag_cmd},
-     {"status", 0, (ipkg_cmd_fun_t)ipkg_status_cmd},
-     {"install_pending", 0, (ipkg_cmd_fun_t)ipkg_install_pending_cmd},
-     {"install", 1, (ipkg_cmd_fun_t)ipkg_install_cmd},
-     {"remove", 1, (ipkg_cmd_fun_t)ipkg_remove_cmd},
-     {"purge", 1, (ipkg_cmd_fun_t)ipkg_purge_cmd},
-     {"configure", 0, (ipkg_cmd_fun_t)ipkg_configure_cmd},
-     {"files", 1, (ipkg_cmd_fun_t)ipkg_files_cmd},
-     {"search", 1, (ipkg_cmd_fun_t)ipkg_search_cmd},
-     {"download", 1, (ipkg_cmd_fun_t)ipkg_download_cmd},
-     {"compare_versions", 1, (ipkg_cmd_fun_t)ipkg_compare_versions_cmd},
-     {"compare-versions", 1, (ipkg_cmd_fun_t)ipkg_compare_versions_cmd},
-     {"print-architecture", 0, (ipkg_cmd_fun_t)ipkg_print_architecture_cmd},
-     {"print_architecture", 0, (ipkg_cmd_fun_t)ipkg_print_architecture_cmd},
-     {"print-installation-architecture", 0, (ipkg_cmd_fun_t)ipkg_print_architecture_cmd},
-     {"print_installation_architecture", 0, (ipkg_cmd_fun_t)ipkg_print_architecture_cmd},
-     {"depends", 1, (ipkg_cmd_fun_t)ipkg_depends_cmd},
-     {"whatdepends", 1, (ipkg_cmd_fun_t)ipkg_whatdepends_cmd},
-     {"whatdependsrec", 1, (ipkg_cmd_fun_t)ipkg_whatdepends_recursively_cmd},
-     {"whatrecommends", 1, (ipkg_cmd_fun_t)ipkg_whatrecommends_cmd},
-     {"whatsuggests", 1, (ipkg_cmd_fun_t)ipkg_whatsuggests_cmd},
-     {"whatprovides", 1, (ipkg_cmd_fun_t)ipkg_whatprovides_cmd},
-     {"whatreplaces", 1, (ipkg_cmd_fun_t)ipkg_whatreplaces_cmd},
-     {"whatconflicts", 1, (ipkg_cmd_fun_t)ipkg_whatconflicts_cmd},
+static opkg_cmd_t cmds[] = {
+     {"update", 0, (opkg_cmd_fun_t)opkg_update_cmd}, 
+     {"upgrade", 0, (opkg_cmd_fun_t)opkg_upgrade_cmd},
+     {"list", 0, (opkg_cmd_fun_t)opkg_list_cmd},
+     {"list_installed", 0, (opkg_cmd_fun_t)opkg_list_installed_cmd},
+     {"info", 0, (opkg_cmd_fun_t)opkg_info_cmd},
+     {"flag", 1, (opkg_cmd_fun_t)opkg_flag_cmd},
+     {"status", 0, (opkg_cmd_fun_t)opkg_status_cmd},
+     {"install_pending", 0, (opkg_cmd_fun_t)opkg_install_pending_cmd},
+     {"install", 1, (opkg_cmd_fun_t)opkg_install_cmd},
+     {"remove", 1, (opkg_cmd_fun_t)opkg_remove_cmd},
+     {"purge", 1, (opkg_cmd_fun_t)opkg_purge_cmd},
+     {"configure", 0, (opkg_cmd_fun_t)opkg_configure_cmd},
+     {"files", 1, (opkg_cmd_fun_t)opkg_files_cmd},
+     {"search", 1, (opkg_cmd_fun_t)opkg_search_cmd},
+     {"download", 1, (opkg_cmd_fun_t)opkg_download_cmd},
+     {"compare_versions", 1, (opkg_cmd_fun_t)opkg_compare_versions_cmd},
+     {"compare-versions", 1, (opkg_cmd_fun_t)opkg_compare_versions_cmd},
+     {"print-architecture", 0, (opkg_cmd_fun_t)opkg_print_architecture_cmd},
+     {"print_architecture", 0, (opkg_cmd_fun_t)opkg_print_architecture_cmd},
+     {"print-installation-architecture", 0, (opkg_cmd_fun_t)opkg_print_architecture_cmd},
+     {"print_installation_architecture", 0, (opkg_cmd_fun_t)opkg_print_architecture_cmd},
+     {"depends", 1, (opkg_cmd_fun_t)opkg_depends_cmd},
+     {"whatdepends", 1, (opkg_cmd_fun_t)opkg_whatdepends_cmd},
+     {"whatdependsrec", 1, (opkg_cmd_fun_t)opkg_whatdepends_recursively_cmd},
+     {"whatrecommends", 1, (opkg_cmd_fun_t)opkg_whatrecommends_cmd},
+     {"whatsuggests", 1, (opkg_cmd_fun_t)opkg_whatsuggests_cmd},
+     {"whatprovides", 1, (opkg_cmd_fun_t)opkg_whatprovides_cmd},
+     {"whatreplaces", 1, (opkg_cmd_fun_t)opkg_whatreplaces_cmd},
+     {"whatconflicts", 1, (opkg_cmd_fun_t)opkg_whatconflicts_cmd},
 };
 
-int ipkg_state_changed;
-static void write_status_files_if_changed(ipkg_conf_t *conf)
-{
-     if (ipkg_state_changed && !conf->noaction) {
-          ipkg_message(conf, IPKG_INFO,
+int opkg_state_changed;
+static void write_status_files_if_changed(opkg_conf_t *conf)
+{
+     if (opkg_state_changed && !conf->noaction) {
+          opkg_message(conf, OPKG_INFO,
                        "  writing status file\n");
-          ipkg_conf_write_status_files(conf);
+          opkg_conf_write_status_files(conf);
           pkg_write_changed_filelists(conf);
      } else { 
-          ipkg_message(conf, IPKG_NOTICE, "Nothing to be done\n");
-     }
-}
-
-
-static int num_cmds = sizeof(cmds) / sizeof(ipkg_cmd_t);
-
-ipkg_cmd_t *ipkg_cmd_find(const char *name)
+          opkg_message(conf, OPKG_NOTICE, "Nothing to be done\n");
+     }
+}
+
+
+static int num_cmds = sizeof(cmds) / sizeof(opkg_cmd_t);
+
+opkg_cmd_t *opkg_cmd_find(const char *name)
 {
      int i;
-     ipkg_cmd_t *cmd;
+     opkg_cmd_t *cmd;
 
      for (i=0; i < num_cmds; i++) {
@@ -146 +146 @@
 }
 
-#ifdef IPKG_LIB
-int ipkg_cmd_exec(ipkg_cmd_t *cmd, ipkg_conf_t *conf, int argc, const char **argv, void *userdata)
+#ifdef OPKG_LIB
+int opkg_cmd_exec(opkg_cmd_t *cmd, opkg_conf_t *conf, int argc, const char **argv, void *userdata)
 {
         int result;
@@ -155 +155 @@
         result = (cmd->fun)(conf, argc, argv);
         if ( result == 0 ) {
-           ipkg_message(conf, IPKG_NOTICE, "Successfully terminated.\n");
+           opkg_message(conf, OPKG_NOTICE, "Successfully terminated.\n");
         } else {
-           ipkg_message(conf, IPKG_NOTICE, "An error ocurred, return value: %d.\n", result);
+           opkg_message(conf, OPKG_NOTICE, "An error ocurred, return value: %d.\n", result);
 
         }
@@ -163 +163 @@
            reverse_error_list(&error_list);
 
-           ipkg_message(conf, IPKG_NOTICE, "Collected errors:\n");
+           opkg_message(conf, OPKG_NOTICE, "Collected errors:\n");
            /* Here we print the errors collected and free the list */
            while (error_list != NULL) {
-                 ipkg_message(conf, IPKG_NOTICE, "%s",error_list->errmsg);
+                 opkg_message(conf, OPKG_NOTICE, "%s",error_list->errmsg);
                  error_list = error_list->next;
 
@@ -178 +178 @@
 }
 #else
-int ipkg_cmd_exec(ipkg_cmd_t *cmd, ipkg_conf_t *conf, int argc, const char **argv)
+int opkg_cmd_exec(opkg_cmd_t *cmd, opkg_conf_t *conf, int argc, const char **argv)
 {
      return (cmd->fun)(conf, argc, argv);
@@ -184 +184 @@
 #endif
 
-static int ipkg_update_cmd(ipkg_conf_t *conf, int argc, char **argv)
+static int opkg_update_cmd(opkg_conf_t *conf, int argc, char **argv)
 {
      int err;
@@ -197 +197 @@
     if (! file_is_dir(lists_dir)) {
           if (file_exists(lists_dir)) {
-               ipkg_message(conf, IPKG_ERROR,
+               opkg_message(conf, OPKG_ERROR,
                             "%s: ERROR: %s exists, but is not a directory\n",
                             __FUNCTION__, lists_dir);
@@ -205 +205 @@
           err = file_mkdir_hier(lists_dir, 0755);
           if (err) {
-               ipkg_message(conf, IPKG_ERROR,
+               opkg_message(conf, OPKG_ERROR,
                             "%s: ERROR: failed to make directory %s: %s\n",
                             __FUNCTION__, lists_dir, strerror(errno));
@@ -231 +231 @@
               FILE *in, *out;
 
-              tmp = strdup ("/tmp/ipkg.XXXXXX");
+              tmp = strdup ("/tmp/opkg.XXXXXX");
 
               if (mkdtemp (tmp) == NULL) {
@@ -240 +240 @@
               
               sprintf_alloc (&tmp_file_name, "%s/%s.gz", tmp, src->name);
-              err = ipkg_download(conf, url, tmp_file_name);
+              err = opkg_download(conf, url, tmp_file_name);
               if (err == 0) {
-                   ipkg_message (conf, IPKG_NOTICE, "Inflating %s\n", url);
+                   opkg_message (conf, OPKG_NOTICE, "Inflating %s\n", url);
                    in = fopen (tmp_file_name, "r");
                    out = fopen (list_file_name, "w");
@@ -258 +258 @@
               }
           } else
-              err = ipkg_download(conf, url, list_file_name);
+              err = opkg_download(conf, url, list_file_name);
           if (err) {
                failures++;
           } else {
-               ipkg_message(conf, IPKG_NOTICE,
+               opkg_message(conf, OPKG_NOTICE,
                             "Updated list of available packages in %s\n",
                             list_file_name);
@@ -274 +274 @@
 #warning here
      /* clear SW_INSTALL on any package where state is SS_NOT_INSTALLED.
-      * this is a hack to work around poor bookkeeping in old ipkg upgrade code 
+      * this is a hack to work around poor bookkeeping in old opkg upgrade code 
       * -Jamey 3/1/03
       */
@@ -282 +282 @@
           pkg_vec_t *available = pkg_vec_alloc();
           pkg_hash_fetch_available(&conf->pkg_hash, available);
-          ipkg_message(conf, IPKG_DEBUG, "Clearing SW_INSTALL for SS_NOT_INSTALLED packages.\n");
+          opkg_message(conf, OPKG_DEBUG, "Clearing SW_INSTALL for SS_NOT_INSTALLED packages.\n");
           for (i = 0; i < available->len; i++) {
                pkg_t *pkg = available->pkgs[i];
                if (pkg->state_want == SW_INSTALL && pkg->state_status == SS_NOT_INSTALLED) {
-                    ipkg_message(conf, IPKG_DEBUG, "Clearing SW_INSTALL on package %s.\n", pkg->name);
+                    opkg_message(conf, OPKG_DEBUG, "Clearing SW_INSTALL on package %s.\n", pkg->name);
                     pkg->state_want = SW_UNKNOWN;
                     changed = 1;
@@ -303 +303 @@
 
 /* scan the args passed and cache the local filenames of the packages */
-int ipkg_multiple_files_scan(ipkg_conf_t *conf, int argc, char **argv)
+int opkg_multiple_files_scan(opkg_conf_t *conf, int argc, char **argv)
 {
      int i;
@@ -318 +318 @@
           //int tmplen = strlen (tmp);
 
-          //if (strcmp (tmp + (tmplen - strlen (IPKG_PKG_EXTENSION)), IPKG_PKG_EXTENSION) != 0)
+          //if (strcmp (tmp + (tmplen - strlen (OPKG_PKG_EXTENSION)), OPKG_PKG_EXTENSION) != 0)
           //     continue;
           //if (strcmp (tmp + (tmplen - strlen (DPKG_PKG_EXTENSION)), DPKG_PKG_EXTENSION) != 0)
           //     continue;
         
-          ipkg_message(conf, IPKG_DEBUG2, "Debug mfs: %s  \n",filename );
-
-          err = ipkg_prepare_url_for_install(conf, filename, &argv[i]);
+          opkg_message(conf, OPKG_DEBUG2, "Debug mfs: %s  \n",filename );
+
+          err = opkg_prepare_url_for_install(conf, filename, &argv[i]);
           if (err)
             return err;
@@ -332 +332 @@
 }
 
-struct ipkg_intercept
+struct opkg_intercept
 {
     char *oldpath;
@@ -338 +338 @@
 };
 
-typedef struct ipkg_intercept *ipkg_intercept_t;
-
-ipkg_intercept_t ipkg_prep_intercepts(ipkg_conf_t *conf)
-{
-    ipkg_intercept_t ctx;
+typedef struct opkg_intercept *opkg_intercept_t;
+
+opkg_intercept_t opkg_prep_intercepts(opkg_conf_t *conf)
+{
+    opkg_intercept_t ctx;
     char *newpath;
     int gen;
@@ -349 +349 @@
     ctx->oldpath = strdup (getenv ("PATH"));
 
-    sprintf_alloc (&newpath, "%s/ipkg/intercept:%s", DATADIR, ctx->oldpath);
+    sprintf_alloc (&newpath, "%s/opkg/intercept:%s", DATADIR, ctx->oldpath);
     setenv ("PATH", newpath, 1);
     free (newpath);
@@ -355 +355 @@
     gen = 0;
  retry:
-    sprintf_alloc (&ctx->statedir, "/tmp/ipkg-intercept-%d-%d", getpid (), gen);
+    sprintf_alloc (&ctx->statedir, "/tmp/opkg-intercept-%d-%d", getpid (), gen);
     if (mkdir (ctx->statedir, 0770) < 0) {
         if (errno == EEXIST) {
@@ -365 +365 @@
         return NULL;
     }
-    setenv ("IPKG_INTERCEPT_DIR", ctx->statedir, 1);
+    setenv ("OPKG_INTERCEPT_DIR", ctx->statedir, 1);
     return ctx;
 }
 
-int ipkg_finalize_intercepts(ipkg_intercept_t ctx)
+int opkg_finalize_intercepts(opkg_intercept_t ctx)
 {
     char *cmd;
@@ -409 +409 @@
 }
 
-int ipkg_configure_packages(ipkg_conf_t *conf, char *pkg_name)
+int opkg_configure_packages(opkg_conf_t *conf, char *pkg_name)
 {
      pkg_vec_t *all;
      int i;
      pkg_t *pkg;
-     ipkg_intercept_t ic;
+     opkg_intercept_t ic;
      int r, err = 0;
 
-     ipkg_message(conf, IPKG_INFO,
+     opkg_message(conf, OPKG_INFO,
                   "Configuring unpacked packages\n");
      fflush( stdout );
@@ -424 +424 @@
      pkg_hash_fetch_available(&conf->pkg_hash, all);
 
-     ic = ipkg_prep_intercepts (conf);
+     ic = opkg_prep_intercepts (conf);
     
      for(i = 0; i < all->len; i++) {
@@ -433 +433 @@
 
           if (pkg->state_status == SS_UNPACKED) {
-               ipkg_message(conf, IPKG_NOTICE,
+               opkg_message(conf, OPKG_NOTICE,
                             "Configuring %s\n", pkg->name);
                fflush( stdout );
-               r = ipkg_configure(conf, pkg);
+               r = opkg_configure(conf, pkg);
                if (r == 0) {
                     pkg->state_status = SS_INSTALLED;
@@ -448 +448 @@
      }
 
-     r = ipkg_finalize_intercepts (ic);
+     r = opkg_finalize_intercepts (ic);
      if (r && !err)
          err = r;
@@ -456 +456 @@
 }
 
-static ipkg_conf_t *global_conf;
+static opkg_conf_t *global_conf;
 
 static void sigint_handler(int sig)
 {
      signal(sig, SIG_DFL);
-     ipkg_message(NULL, IPKG_NOTICE,
-                  "ipkg: interrupted. writing out status database\n");
+     opkg_message(NULL, OPKG_NOTICE,
+                  "opkg: interrupted. writing out status database\n");
      write_status_files_if_changed(global_conf);
      exit(128 + sig);
 }
 
-static int ipkg_install_cmd(ipkg_conf_t *conf, int argc, char **argv)
+static int opkg_install_cmd(opkg_conf_t *conf, int argc, char **argv)
 {
      int i;
@@ -482 +482 @@
           arg = argv[i];
 
-          ipkg_message(conf, IPKG_DEBUG2, "Debug install_cmd: %s  \n",arg );
-          err = ipkg_prepare_url_for_install(conf, arg, &argv[i]);
+          opkg_message(conf, OPKG_DEBUG2, "Debug install_cmd: %s  \n",arg );
+          err = opkg_prepare_url_for_install(conf, arg, &argv[i]);
           if (err != EINVAL && err != 0)
               return err;
@@ -492 +492 @@
           arg = argv[i];
           if (conf->multiple_providers)
-               err = ipkg_install_multi_by_name(conf, arg);
+               err = opkg_install_multi_by_name(conf, arg);
           else{
-               err = ipkg_install_by_name(conf, arg);
+               err = opkg_install_by_name(conf, arg);
           }
-          if (err == IPKG_PKG_HAS_NO_CANDIDATE) {
-               ipkg_message(conf, IPKG_ERROR,
+          if (err == OPKG_PKG_HAS_NO_CANDIDATE) {
+               opkg_message(conf, OPKG_ERROR,
                             "Cannot find package %s.\n"
-                            "Check the spelling or perhaps run 'ipkg update'\n",
+                            "Check the spelling or perhaps run 'opkg update'\n",
                             arg);
           }
@@ -505 +505 @@
 
      /* recheck to verify that all dependences are satisfied */
-     if (0) ipkg_satisfy_all_dependences(conf);
-
-     ipkg_configure_packages(conf, NULL);
+     if (0) opkg_satisfy_all_dependences(conf);
+
+     opkg_configure_packages(conf, NULL);
 
      write_status_files_if_changed(conf);
@@ -514 +514 @@
 }
 
-static int ipkg_upgrade_cmd(ipkg_conf_t *conf, int argc, char **argv)
+static int opkg_upgrade_cmd(opkg_conf_t *conf, int argc, char **argv)
 {
      int i;
@@ -527 +527 @@
                char *arg = argv[i];
 
-               err = ipkg_prepare_url_for_install(conf, arg, &arg);
+               err = opkg_prepare_url_for_install(conf, arg, &arg);
                if (err != EINVAL && err != 0)
                    return err;
@@ -540 +540 @@
                                                                 conf->default_dest);
                     if (pkg == NULL) {
-                         ipkg_message(conf, IPKG_NOTICE,
+                         opkg_message(conf, OPKG_NOTICE,
                                       "Package %s not installed in %s\n",
                                       argv[i], conf->default_dest->name);
@@ -550 +550 @@
                }
                if (pkg)
-                    ipkg_upgrade_pkg(conf, pkg);
+                    opkg_upgrade_pkg(conf, pkg);
                else {
-                    ipkg_install_by_name(conf, arg);
+                    opkg_install_by_name(conf, arg);
                }
           }
@@ -563 +563 @@
           for (i = 0; i < installed->len; i++) {
                pkg = installed->pkgs[i];
-               ipkg_upgrade_pkg(conf, pkg);
+               opkg_upgrade_pkg(conf, pkg);
           }
           pkg_vec_free(installed);
@@ -569 +569 @@
 
      /* recheck to verify that all dependences are satisfied */
-     if (0) ipkg_satisfy_all_dependences(conf);
-
-     ipkg_configure_packages(conf, NULL);
+     if (0) opkg_satisfy_all_dependences(conf);
+
+     opkg_configure_packages(conf, NULL);
 
      write_status_files_if_changed(conf);
@@ -578 +578 @@
 }
 
-static int ipkg_download_cmd(ipkg_conf_t *conf, int argc, char **argv)
+static int opkg_download_cmd(opkg_conf_t *conf, int argc, char **argv)
 {
      int i, err;
@@ -590 +590 @@
           pkg = pkg_hash_fetch_best_installation_candidate_by_name(conf, arg);
           if (pkg == NULL) {
-               ipkg_message(conf, IPKG_ERROR,
+               opkg_message(conf, OPKG_ERROR,
                             "Cannot find package %s.\n"
-                            "Check the spelling or perhaps run 'ipkg update'\n",
+                            "Check the spelling or perhaps run 'opkg update'\n",
                             arg);
                continue;
           }
 
-          err = ipkg_download_pkg(conf, pkg, ".");
+          err = opkg_download_pkg(conf, pkg, ".");
 
           if (err) {
-               ipkg_message(conf, IPKG_ERROR,
+               opkg_message(conf, OPKG_ERROR,
                             "Failed to download %s\n", pkg->name);
           } else {
-               ipkg_message(conf, IPKG_NOTICE,
+               opkg_message(conf, OPKG_NOTICE,
                             "Downloaded %s as %s\n",
                             pkg->name, pkg->local_filename);
@@ -613 +613 @@
 
 
-static int ipkg_list_cmd(ipkg_conf_t *conf, int argc, char **argv)
+static int opkg_list_cmd(opkg_conf_t *conf, int argc, char **argv)
 {
      int i ;
      pkg_vec_t *available;
      pkg_t *pkg;
-     char desc_short[IPKG_LIST_DESCRIPTION_LENGTH];
+     char desc_short[OPKG_LIST_DESCRIPTION_LENGTH];
      char *newline;
      char *pkg_name = NULL;
@@ -634 +634 @@
                continue;
           if (pkg->description) {
-               strncpy(desc_short, pkg->description, IPKG_LIST_DESCRIPTION_LENGTH);
+               strncpy(desc_short, pkg->description, OPKG_LIST_DESCRIPTION_LENGTH);
           } else {
                desc_short[0] = '\0';
           }
-          desc_short[IPKG_LIST_DESCRIPTION_LENGTH - 1] = '\0';
+          desc_short[OPKG_LIST_DESCRIPTION_LENGTH - 1] = '\0';
           newline = strchr(desc_short, '\n');
           if (newline) {
                *newline = '\0';
           }
-#ifndef IPKG_LIB
+#ifndef OPKG_LIB
           printf("%s - %s\n", pkg->name, desc_short);
 #else
-          if (ipkg_cb_list) {
+          if (opkg_cb_list) {
                 version_str = pkg_version_str_alloc(pkg);
-                ipkg_cb_list(pkg->name,desc_short,
+                opkg_cb_list(pkg->name,desc_short,
                                              version_str,
                                          pkg->state_status,
@@ -662 +662 @@
 
 
-static int ipkg_list_installed_cmd(ipkg_conf_t *conf, int argc, char **argv)
+static int opkg_list_installed_cmd(opkg_conf_t *conf, int argc, char **argv)
 {
      int i ;
      pkg_vec_t *available;
      pkg_t *pkg;
-     char desc_short[IPKG_LIST_DESCRIPTION_LENGTH];
+     char desc_short[OPKG_LIST_DESCRIPTION_LENGTH];
      char *newline;
      char *pkg_name = NULL;
@@ -683 +683 @@
                continue;
           if (pkg->description) {
-               strncpy(desc_short, pkg->description, IPKG_LIST_DESCRIPTION_LENGTH);
+               strncpy(desc_short, pkg->description, OPKG_LIST_DESCRIPTION_LENGTH);
           } else {
                desc_short[0] = '\0';
           }
-          desc_short[IPKG_LIST_DESCRIPTION_LENGTH - 1] = '\0';
+          desc_short[OPKG_LIST_DESCRIPTION_LENGTH - 1] = '\0';
           newline = strchr(desc_short, '\n');
           if (newline) {
                *newline = '\0';
           }
-#ifndef IPKG_LIB
+#ifndef OPKG_LIB
           printf("%s - %s\n", pkg->name, desc_short);
 #else
-          if (ipkg_cb_list) {
+          if (opkg_cb_list) {
                 version_str = pkg_version_str_alloc(pkg);
-                ipkg_cb_list(pkg->name,desc_short,
+                opkg_cb_list(pkg->name,desc_short,
                                              version_str,
                                          pkg->state_status,
@@ -709 +709 @@
 }
 
-static int ipkg_info_status_cmd(ipkg_conf_t *conf, int argc, char **argv, int installed_only)
+static int opkg_info_status_cmd(opkg_conf_t *conf, int argc, char **argv, int installed_only)
 {
      int i;
@@ -737 +737 @@
                continue;
           }
-#ifndef IPKG_LIB
+#ifndef OPKG_LIB
           if (n_fields) {
                for (j = 0; j < n_fields; j++)
@@ -748 +748 @@
           buff = pkg_formatted_info(pkg);
           if ( buff ) {
-               if (ipkg_cb_status) ipkg_cb_status(pkg->name,
+               if (opkg_cb_status) opkg_cb_status(pkg->name,
                                                   pkg->state_status,
                                                   buff,
@@ -764 +764 @@
                     conffile_t *cf = iter->data;
                     int modified = conffile_has_been_modified(conf, cf);
-                    ipkg_message(conf, IPKG_NOTICE, "conffile=%s md5sum=%s modified=%d\n",
+                    opkg_message(conf, OPKG_NOTICE, "conffile=%s md5sum=%s modified=%d\n",
                                  cf->name, cf->value, modified);
                }
           }
      }
-#ifndef IPKG_LIB
+#ifndef OPKG_LIB
      if (buff)
           free(buff);
@@ -778 +778 @@
 }
 
-static int ipkg_info_cmd(ipkg_conf_t *conf, int argc, char **argv)
-{
-     return ipkg_info_status_cmd(conf, argc, argv, 0);
-}
-
-static int ipkg_status_cmd(ipkg_conf_t *conf, int argc, char **argv)
-{
-     return ipkg_info_status_cmd(conf, argc, argv, 1);
-}
-
-static int ipkg_configure_cmd(ipkg_conf_t *conf, int argc, char **argv)
+static int opkg_info_cmd(opkg_conf_t *conf, int argc, char **argv)
+{
+     return opkg_info_status_cmd(conf, argc, argv, 0);
+}
+
+static int opkg_status_cmd(opkg_conf_t *conf, int argc, char **argv)
+{
+     return opkg_info_status_cmd(conf, argc, argv, 1);
+}
+
+static int opkg_configure_cmd(opkg_conf_t *conf, int argc, char **argv)
 {
      
@@ -797 +797 @@
           pkg_name = argv[0];
 
-          err = ipkg_configure_packages (conf, pkg_name);
+          err = opkg_configure_packages (conf, pkg_name);
      
      } else {
-          err = ipkg_configure_packages (conf, NULL);
+          err = opkg_configure_packages (conf, NULL);
      }
 
@@ -808 +808 @@
 }
 
-static int ipkg_install_pending_cmd(ipkg_conf_t *conf, int argc, char **argv)
+static int opkg_install_pending_cmd(opkg_conf_t *conf, int argc, char **argv)
 {
      int i, err;
@@ -814 +814 @@
      glob_t globbuf;
     
-     sprintf_alloc(&globpattern, "%s/*" IPKG_PKG_EXTENSION, conf->pending_dir);
+     sprintf_alloc(&globpattern, "%s/*" OPKG_PKG_EXTENSION, conf->pending_dir);
      err = glob(globpattern, 0, NULL, &globbuf);
      free(globpattern);
@@ -821 +821 @@
      }
 
-     ipkg_message(conf, IPKG_NOTICE,
+     opkg_message(conf, OPKG_NOTICE,
                   "The following packages in %s will now be installed.\n",
                   conf->pending_dir);
      for (i = 0; i < globbuf.gl_pathc; i++) {
-          ipkg_message(conf, IPKG_NOTICE,
+          opkg_message(conf, OPKG_NOTICE,
                        "%s%s", i == 0 ? "" : " ", globbuf.gl_pathv[i]);
      }
-     ipkg_message(conf, IPKG_NOTICE, "\n");
+     opkg_message(conf, OPKG_NOTICE, "\n");
      for (i = 0; i < globbuf.gl_pathc; i++) {
-          err = ipkg_install_from_file(conf, globbuf.gl_pathv[i]);
+          err = opkg_install_from_file(conf, globbuf.gl_pathv[i]);
           if (err == 0) {
                err = unlink(globbuf.gl_pathv[i]);
                if (err) {
-                    ipkg_message(conf, IPKG_ERROR,
+                    opkg_message(conf, OPKG_ERROR,
                                  "%s: ERROR: failed to unlink %s: %s\n",
                                  __FUNCTION__, globbuf.gl_pathv[i], strerror(err));
@@ -846 +846 @@
 }
 
-static int ipkg_remove_cmd(ipkg_conf_t *conf, int argc, char **argv)
+static int opkg_remove_cmd(opkg_conf_t *conf, int argc, char **argv)
 {
      int i,a,done;
@@ -881 +881 @@
         
                if (pkg == NULL) {
-                    ipkg_message(conf, IPKG_ERROR, "Package %s is not installed.\n", pkg->name);
+                    opkg_message(conf, OPKG_ERROR, "Package %s is not installed.\n", pkg->name);
                     continue;
                }
                if (pkg->state_status == SS_NOT_INSTALLED) {    // Added the control, so every already removed package could be skipped
-                    ipkg_message(conf, IPKG_ERROR, "Package seems to be %s not installed (STATUS = NOT_INSTALLED).\n", pkg->name);
+                    opkg_message(conf, OPKG_ERROR, "Package seems to be %s not installed (STATUS = NOT_INSTALLED).\n", pkg->name);
                     continue;
                }
-               ipkg_remove_pkg(conf, pkg_to_remove,0);
+               opkg_remove_pkg(conf, pkg_to_remove,0);
                done = 1;
            }
@@ -908 +908 @@
                } else {
                     if (!pkg_has_installed_dependents(conf, pkg->parent, pkg, NULL))
-                         ipkg_message(conf, IPKG_NOTICE, "Non-user leaf package: %s\n", pkg->name);
+                         opkg_message(conf, OPKG_NOTICE, "Non-user leaf package: %s\n", pkg->name);
                }
           }
           if (!flagged_pkg_count) {
-               ipkg_message(conf, IPKG_NOTICE, "No packages flagged as installed by user, \n"
+               opkg_message(conf, OPKG_NOTICE, "No packages flagged as installed by user, \n"
                             "so refusing to uninstall unflagged non-leaf packages\n");
                return 0;
@@ -927 +927 @@
                         && !pkg_has_installed_dependents(conf, pkg->parent, pkg, NULL)) {
                          removed++;
-                         ipkg_message(conf, IPKG_NOTICE, "Removing non-user leaf package %s\n");
-                         ipkg_remove_pkg(conf, pkg,0);
+                         opkg_message(conf, OPKG_NOTICE, "Removing non-user leaf package %s\n");
+                         opkg_remove_pkg(conf, pkg,0);
                          done = 1;
                     }
@@ -937 +937 @@
 
      if ( done == 0 ) 
-        ipkg_message(conf, IPKG_NOTICE, "No packages removed.\n");
+        opkg_message(conf, OPKG_NOTICE, "No packages removed.\n");
 
      write_status_files_if_changed(conf);
@@ -943 +943 @@
 }
 
-static int ipkg_purge_cmd(ipkg_conf_t *conf, int argc, char **argv)
+static int opkg_purge_cmd(opkg_conf_t *conf, int argc, char **argv)
 {
      int i;
@@ -963 +963 @@
 
           if (pkg == NULL) {
-               ipkg_message(conf, IPKG_ERROR,
+               opkg_message(conf, OPKG_ERROR,
                             "Package %s is not installed.\n", argv[i]);
                continue;
           }
-          ipkg_purge_pkg(conf, pkg);
+          opkg_purge_pkg(conf, pkg);
      }
 
@@ -974 +974 @@
 }
 
-static int ipkg_flag_cmd(ipkg_conf_t *conf, int argc, char **argv)
+static int opkg_flag_cmd(opkg_conf_t *conf, int argc, char **argv)
 {
      int i;
@@ -993 +993 @@
 
           if (pkg == NULL) {
-               ipkg_message(conf, IPKG_ERROR,
+               opkg_message(conf, OPKG_ERROR,
                             "Package %s is not installed.\n", argv[i]);
                continue;
@@ -1006 +1006 @@
               pkg->state_status = pkg_state_status_from_str(flags);
           }
-          ipkg_state_changed++;
-          ipkg_message(conf, IPKG_NOTICE,
+          opkg_state_changed++;
+          opkg_message(conf, OPKG_NOTICE,
                        "Setting flags for package %s to %s\n",
                        pkg->name, flags);
@@ -1016 +1016 @@
 }
 
-static int ipkg_files_cmd(ipkg_conf_t *conf, int argc, char **argv)
+static int opkg_files_cmd(opkg_conf_t *conf, int argc, char **argv)
 {
      pkg_t *pkg;
@@ -1039 +1039 @@
                                             argv[0]);
      if (pkg == NULL) {
-          ipkg_message(conf, IPKG_ERROR,
+          opkg_message(conf, OPKG_ERROR,
                        "Package %s not installed.\n", argv[0]);
           return 0;
@@ -1047 +1047 @@
      pkg_version = pkg_version_str_alloc(pkg);
 
-#ifndef IPKG_LIB
+#ifndef OPKG_LIB
      printf("Package %s (%s) is installed on %s and has the following files:\n",
             pkg->name, pkg_version, pkg->dest->name);
@@ -1072 +1072 @@
                strncat(buff, "\n", buff_len);
           } 
-          if (ipkg_cb_list) ipkg_cb_list(pkg->name,
+          if (opkg_cb_list) opkg_cb_list(pkg->name,
                                          buff,
                                          pkg_version_str_alloc(pkg),
@@ -1087 +1087 @@
 }
 
-static int ipkg_depends_cmd(ipkg_conf_t *conf, int argc, char **argv)
+static int opkg_depends_cmd(opkg_conf_t *conf, int argc, char **argv)
 {
 
@@ -1105 +1105 @@
                int j;
 
-               ipkg_message(conf, IPKG_ERROR, "target=%s\n", target);
+               opkg_message(conf, OPKG_ERROR, "target=%s\n", target);
 
                for (j = 0; j < available_pkgs->len; j++) {
@@ -1112 +1112 @@
                          int k;
                          int count = pkg->depends_count + pkg->pre_depends_count;
-                         ipkg_message(conf, IPKG_ERROR, "What %s (arch=%s) %s\n",
+                         opkg_message(conf, OPKG_ERROR, "What %s (arch=%s) %s\n",
                                       target, pkg->architecture, rel_str);
                          for (k = 0; k < count; k++) {
@@ -1119 +1119 @@
                               for (l = 0; l < cdepend->possibility_count; l++) {
                                    depend_t *possibility = cdepend->possibilities[l];
-                                   ipkg_message(conf, IPKG_ERROR, "    %s", possibility->pkg->name);
+                                   opkg_message(conf, OPKG_ERROR, "    %s", possibility->pkg->name);
                                    if (conf->verbosity > 0) {
                                         // char *ver = abstract_pkg_version_str_alloc(possibility->pkg); 
-                                        ipkg_message(conf, IPKG_NOTICE, " %s", possibility->version);
+                                        opkg_message(conf, OPKG_NOTICE, " %s", possibility->version);
                                         if (possibility->version) {
                                              char *typestr = NULL;
@@ -1133 +1133 @@
                                              case LATER: typestr = ">"; break;
                                              }
-                                             ipkg_message(conf, IPKG_NOTICE, " (%s %s)", typestr, possibility->version);
+                                             opkg_message(conf, OPKG_NOTICE, " (%s %s)", typestr, possibility->version);
                                         }
                                         // free(ver);
                                    }
-                                   ipkg_message(conf, IPKG_ERROR, "\n");
+                                   opkg_message(conf, OPKG_ERROR, "\n");
                               }
                          }
@@ -1157 +1157 @@
 };
 
-static int ipkg_what_depends_conflicts_cmd(ipkg_conf_t *conf, enum what_field_type what_field_type, int recursive, int argc, char **argv)
+static int opkg_what_depends_conflicts_cmd(opkg_conf_t *conf, enum what_field_type what_field_type, int recursive, int argc, char **argv)
 {
 
@@ -1182 +1182 @@
           /* mark the root set */
           pkg_vec_clear_marks(available_pkgs);
-          ipkg_message(conf, IPKG_NOTICE, "Root set:\n");
+          opkg_message(conf, OPKG_NOTICE, "Root set:\n");
           for (i = 0; i < argc; i++) {
                const char *dependee_pattern = argv[i];
@@ -1192 +1192 @@
                     /* mark the parent (abstract) package */
                     pkg_mark_provides(pkg);
-                    ipkg_message(conf, IPKG_NOTICE, "  %s\n", pkg->name);
+                    opkg_message(conf, OPKG_NOTICE, "  %s\n", pkg->name);
                }
           }
 
-          ipkg_message(conf, IPKG_NOTICE, "What %s root set\n", rel_str);
+          opkg_message(conf, OPKG_NOTICE, "What %s root set\n", rel_str);
           do {
                int j;
@@ -1223 +1223 @@
                                    changed++;
 
-                                   ipkg_message(conf, IPKG_NOTICE, "    %s", pkg->name);
+                                   opkg_message(conf, OPKG_NOTICE, "    %s", pkg->name);
                                    if (conf->verbosity > 0) {
                                         char *ver = pkg_version_str_alloc(pkg); 
-                                        ipkg_message(conf, IPKG_NOTICE, " %s", ver);
-                                        ipkg_message(conf, IPKG_NOTICE, "\t%s %s", rel_str, possibility->pkg->name);
+                                        opkg_message(conf, OPKG_NOTICE, " %s", ver);
+                                        opkg_message(conf, OPKG_NOTICE, "\t%s %s", rel_str, possibility->pkg->name);
                                         if (possibility->version) {
                                              char *typestr = NULL;
@@ -1238 +1238 @@
                                              case LATER: typestr = ">"; break;
                                              }
-                                             ipkg_message(conf, IPKG_NOTICE, " (%s %s)", typestr, possibility->version);
+                                             opkg_message(conf, OPKG_NOTICE, " (%s %s)", typestr, possibility->version);
                                         }
                                         free(ver);
                                         if (!pkg_dependence_satisfiable(conf, possibility))
-                                             ipkg_message(conf, IPKG_NOTICE, " unsatisfiable");
+                                             opkg_message(conf, OPKG_NOTICE, " unsatisfiable");
                                    }
-                                   ipkg_message(conf, IPKG_NOTICE, "\n");
+                                   opkg_message(conf, OPKG_NOTICE, "\n");
                                    goto next_package;
                               }
@@ -1271 +1271 @@
 }
 
-static int ipkg_whatdepends_recursively_cmd(ipkg_conf_t *conf, int argc, char **argv)
-{
-     return ipkg_what_depends_conflicts_cmd(conf, WHATDEPENDS, 1, argc, argv);
-}
-static int ipkg_whatdepends_cmd(ipkg_conf_t *conf, int argc, char **argv)
-{
-     return ipkg_what_depends_conflicts_cmd(conf, WHATDEPENDS, 0, argc, argv);
-}
-
-static int ipkg_whatsuggests_cmd(ipkg_conf_t *conf, int argc, char **argv)
-{
-     return ipkg_what_depends_conflicts_cmd(conf, WHATSUGGESTS, 0, argc, argv);
-}
-
-static int ipkg_whatrecommends_cmd(ipkg_conf_t *conf, int argc, char **argv)
-{
-     return ipkg_what_depends_conflicts_cmd(conf, WHATRECOMMENDS, 0, argc, argv);
-}
-
-static int ipkg_whatconflicts_cmd(ipkg_conf_t *conf, int argc, char **argv)
-{
-     return ipkg_what_depends_conflicts_cmd(conf, WHATCONFLICTS, 0, argc, argv);
-}
-
-static int ipkg_what_provides_replaces_cmd(ipkg_conf_t *conf, enum what_field_type what_field_type, int argc, char **argv)
+static int opkg_whatdepends_recursively_cmd(opkg_conf_t *conf, int argc, char **argv)
+{
+     return opkg_what_depends_conflicts_cmd(conf, WHATDEPENDS, 1, argc, argv);
+}
+static int opkg_whatdepends_cmd(opkg_conf_t *conf, int argc, char **argv)
+{
+     return opkg_what_depends_conflicts_cmd(conf, WHATDEPENDS, 0, argc, argv);
+}
+
+static int opkg_whatsuggests_cmd(opkg_conf_t *conf, int argc, char **argv)
+{
+     return opkg_what_depends_conflicts_cmd(conf, WHATSUGGESTS, 0, argc, argv);
+}
+
+static int opkg_whatrecommends_cmd(opkg_conf_t *conf, int argc, char **argv)
+{
+     return opkg_what_depends_conflicts_cmd(conf, WHATRECOMMENDS, 0, argc, argv);
+}
+
+static int opkg_whatconflicts_cmd(opkg_conf_t *conf, int argc, char **argv)
+{
+     return opkg_what_depends_conflicts_cmd(conf, WHATCONFLICTS, 0, argc, argv);
+}
+
+static int opkg_what_provides_replaces_cmd(opkg_conf_t *conf, enum what_field_type what_field_type, int argc, char **argv)
 {
 
@@ -1313 +1313 @@
                int j;
 
-               ipkg_message(conf, IPKG_ERROR, "What %s %s\n",
+               opkg_message(conf, OPKG_ERROR, "What %s %s\n",
                             rel_str, target);
                for (j = 0; j < available_pkgs->len; j++) {
@@ -1325 +1325 @@
                                : pkg->replaces[k]);
                          if (fnmatch(target, apkg->name, 0) == 0) {
-                              ipkg_message(conf, IPKG_ERROR, "    %s", pkg->name);
+                              opkg_message(conf, OPKG_ERROR, "    %s", pkg->name);
                               if (strcmp(target, apkg->name) != 0)
-                                   ipkg_message(conf, IPKG_ERROR, "\t%s %s\n", rel_str, apkg->name);
-                              ipkg_message(conf, IPKG_ERROR, "\n");
+                                   opkg_message(conf, OPKG_ERROR, "\t%s %s\n", rel_str, apkg->name);
+                              opkg_message(conf, OPKG_ERROR, "\n");
                          }
                     }
@@ -1338 +1338 @@
 }
 
-static int ipkg_whatprovides_cmd(ipkg_conf_t *conf, int argc, char **argv)
-{
-     return ipkg_what_provides_replaces_cmd(conf, WHATPROVIDES, argc, argv);
-}
-
-static int ipkg_whatreplaces_cmd(ipkg_conf_t *conf, int argc, char **argv)
-{
-     return ipkg_what_provides_replaces_cmd(conf, WHATREPLACES, argc, argv);
-}
-
-static int ipkg_search_cmd(ipkg_conf_t *conf, int argc, char **argv)
+static int opkg_whatprovides_cmd(opkg_conf_t *conf, int argc, char **argv)
+{
+     return opkg_what_provides_replaces_cmd(conf, WHATPROVIDES, argc, argv);
+}
+
+static int opkg_whatreplaces_cmd(opkg_conf_t *conf, int argc, char **argv)
+{
+     return opkg_what_provides_replaces_cmd(conf, WHATREPLACES, argc, argv);
+}
+
+static int opkg_search_cmd(opkg_conf_t *conf, int argc, char **argv)
 {
      int i;
@@ -1373 +1373 @@
                installed_file = iter->data;
                if (fnmatch(argv[0], installed_file, 0)==0)  {
-#ifndef IPKG_LIB
+#ifndef OPKG_LIB
                     printf("%s: %s\n", pkg->name, installed_file);
 #else
-                        if (ipkg_cb_list) ipkg_cb_list(pkg->name, 
+                        if (opkg_cb_list) opkg_cb_list(pkg->name, 
                                                        installed_file, 
                                                        pkg_version_str_alloc(pkg), 
@@ -1395 +1395 @@
 }
 
-static int ipkg_compare_versions_cmd(ipkg_conf_t *conf, int argc, char **argv)
+static int opkg_compare_versions_cmd(opkg_conf_t *conf, int argc, char **argv)
 {
      if (argc == 3) {
@@ -1404 +1404 @@
           return pkg_version_satisfied(&p1, &p2, argv[1]);
      } else {
-          ipkg_message(conf, IPKG_ERROR,
-                       "ipkg compare_versions <v1> <op> <v2>\n"
+          opkg_message(conf, OPKG_ERROR,
+                       "opkg compare_versions <v1> <op> <v2>\n"
                        "<op> is one of <= >= << >> =\n");
           return -1;
@@ -1417 +1417 @@
 #endif
 
-static int ipkg_print_architecture_cmd(ipkg_conf_t *conf, int argc, char **argv)
+static int opkg_print_architecture_cmd(opkg_conf_t *conf, int argc, char **argv)
 {
      nv_pair_list_elt_t *l;

trunk/src/target/ipkg/opkg_cmd.h

@@ -1 @@
-/* ipkg_cmd.h - the itsy package management system
+/* opkg_cmd.h - the itsy package management system
 
    Carl D. Worth
@@ -16 +16 @@
 */
 
-#ifndef IPKG_CMD_H
-#define IPKG_CMD_H
+#ifndef OPKG_CMD_H
+#define OPKG_CMD_H
 
-typedef int (*ipkg_cmd_fun_t)(ipkg_conf_t *conf, int argc, const char **argv);
+typedef int (*opkg_cmd_fun_t)(opkg_conf_t *conf, int argc, const char **argv);
 
-struct ipkg_cmd
+struct opkg_cmd
 {
     char *name;
     int requires_args;
-    ipkg_cmd_fun_t fun;
+    opkg_cmd_fun_t fun;
 };
-typedef struct ipkg_cmd ipkg_cmd_t;
+typedef struct opkg_cmd opkg_cmd_t;
 
-ipkg_cmd_t *ipkg_cmd_find(const char *name);
-#ifdef IPKG_LIB
-int ipkg_cmd_exec(ipkg_cmd_t *cmd, ipkg_conf_t *conf, int argc, 
+opkg_cmd_t *opkg_cmd_find(const char *name);
+#ifdef OPKG_LIB
+int opkg_cmd_exec(opkg_cmd_t *cmd, opkg_conf_t *conf, int argc, 
                   const char **argv, void *userdata);
 #else
-int ipkg_cmd_exec(ipkg_cmd_t *cmd, ipkg_conf_t *conf, int argc, const char **argv);
+int opkg_cmd_exec(opkg_cmd_t *cmd, opkg_conf_t *conf, int argc, const char **argv);
 #endif
-int ipkg_multiple_files_scan (ipkg_conf_t *conf, int argc, char *argv[]);
+int opkg_multiple_files_scan (opkg_conf_t *conf, int argc, char *argv[]);
 /* install any packges with state_want == SW_INSTALL */
-int ipkg_install_wanted_packages(ipkg_conf_t *conf);
+int opkg_install_wanted_packages(opkg_conf_t *conf);
 /* ensure that all dependences are satisfied */
-int ipkg_configure_packages(ipkg_conf_t *conf, char *pkg_name);
+int opkg_configure_packages(opkg_conf_t *conf, char *pkg_name);
 
 int pkg_mark_provides(pkg_t *pkg);

trunk/src/target/ipkg/opkg_conf.c

@@ -1 @@
-/* ipkg_conf.c - the itsy package management system
+/* opkg_conf.c - the itsy package management system
 
    Carl D. Worth
@@ -18 +18 @@
 #include <glob.h>
 
-#include "ipkg.h"
-#include "ipkg_conf.h"
+#include "opkg.h"
+#include "opkg_conf.h"
 
 #include "xregex.h"
 #include "sprintf_alloc.h"
-#include "ipkg_conf.h"
-#include "ipkg_message.h"
+#include "opkg_conf.h"
+#include "opkg_message.h"
 #include "file_util.h"
 #include "str_util.h"
 #include "xsystem.h"
 
-static int ipkg_conf_parse_file(ipkg_conf_t *conf, const char *filename,
+static int opkg_conf_parse_file(opkg_conf_t *conf, const char *filename,
                                 pkg_src_list_t *pkg_src_list,
                                 nv_pair_list_t *tmp_dest_nv_pair_list,
                                 char **tmp_lists_dir);
-static int ipkg_init_options_array(const ipkg_conf_t *conf, ipkg_option_t **options);
-static int ipkg_conf_set_option(const ipkg_option_t *options,
+static int opkg_init_options_array(const opkg_conf_t *conf, opkg_option_t **options);
+static int opkg_conf_set_option(const opkg_option_t *options,
                                 const char *name, const char *value);
-static int ipkg_conf_set_default_dest(ipkg_conf_t *conf,
+static int opkg_conf_set_default_dest(opkg_conf_t *conf,
                                       const char *default_dest_name);
-static int set_and_load_pkg_src_list(ipkg_conf_t *conf,
+static int set_and_load_pkg_src_list(opkg_conf_t *conf,
                                      pkg_src_list_t *nv_pair_list);
-static int set_and_load_pkg_dest_list(ipkg_conf_t *conf,
+static int set_and_load_pkg_dest_list(opkg_conf_t *conf,
                                       nv_pair_list_t *nv_pair_list, char * lists_dir);
 
-int ipkg_init_options_array(const ipkg_conf_t *conf, ipkg_option_t **options)
-{
-     ipkg_option_t tmp[] = {
-          { "force_defaults", IPKG_OPT_TYPE_BOOL, &conf->force_defaults },
-          { "force_depends", IPKG_OPT_TYPE_BOOL, &conf->force_depends },
-          { "force_overwrite", IPKG_OPT_TYPE_BOOL, &conf->force_overwrite },
-          { "force_downgrade", IPKG_OPT_TYPE_BOOL, &conf->force_downgrade },
-          { "force_reinstall", IPKG_OPT_TYPE_BOOL, &conf->force_reinstall },
-          { "force_space", IPKG_OPT_TYPE_BOOL, &conf->force_space },
-          { "ftp_proxy", IPKG_OPT_TYPE_STRING, &conf->ftp_proxy },
-          { "http_proxy", IPKG_OPT_TYPE_STRING, &conf->http_proxy },
-          { "multiple_providers", IPKG_OPT_TYPE_BOOL, &conf->multiple_providers },
-          { "no_proxy", IPKG_OPT_TYPE_STRING, &conf->no_proxy },
-          { "test", IPKG_OPT_TYPE_INT, &conf->noaction },
-          { "noaction", IPKG_OPT_TYPE_INT, &conf->noaction },
-          { "nodeps", IPKG_OPT_TYPE_BOOL, &conf->nodeps },
-          { "offline_root", IPKG_OPT_TYPE_STRING, &conf->offline_root },
-          { "offline_root_post_script_cmd", IPKG_OPT_TYPE_STRING, &conf->offline_root_post_script_cmd },
-          { "offline_root_pre_script_cmd", IPKG_OPT_TYPE_STRING, &conf->offline_root_pre_script_cmd },
-          { "proxy_passwd", IPKG_OPT_TYPE_STRING, &conf->proxy_passwd },
-          { "proxy_user", IPKG_OPT_TYPE_STRING, &conf->proxy_user },
-          { "query-all", IPKG_OPT_TYPE_BOOL, &conf->query_all },
-          { "verbose-wget", IPKG_OPT_TYPE_BOOL, &conf->verbose_wget },
-          { "verbosity", IPKG_OPT_TYPE_BOOL, &conf->verbosity },
+int opkg_init_options_array(const opkg_conf_t *conf, opkg_option_t **options)
+{
+     opkg_option_t tmp[] = {
+          { "force_defaults", OPKG_OPT_TYPE_BOOL, &conf->force_defaults },
+          { "force_depends", OPKG_OPT_TYPE_BOOL, &conf->force_depends },
+          { "force_overwrite", OPKG_OPT_TYPE_BOOL, &conf->force_overwrite },
+          { "force_downgrade", OPKG_OPT_TYPE_BOOL, &conf->force_downgrade },
+          { "force_reinstall", OPKG_OPT_TYPE_BOOL, &conf->force_reinstall },
+          { "force_space", OPKG_OPT_TYPE_BOOL, &conf->force_space },
+          { "ftp_proxy", OPKG_OPT_TYPE_STRING, &conf->ftp_proxy },
+          { "http_proxy", OPKG_OPT_TYPE_STRING, &conf->http_proxy },
+          { "multiple_providers", OPKG_OPT_TYPE_BOOL, &conf->multiple_providers },
+          { "no_proxy", OPKG_OPT_TYPE_STRING, &conf->no_proxy },
+          { "test", OPKG_OPT_TYPE_INT, &conf->noaction },
+          { "noaction", OPKG_OPT_TYPE_INT, &conf->noaction },
+          { "nodeps", OPKG_OPT_TYPE_BOOL, &conf->nodeps },
+          { "offline_root", OPKG_OPT_TYPE_STRING, &conf->offline_root },
+          { "offline_root_post_script_cmd", OPKG_OPT_TYPE_STRING, &conf->offline_root_post_script_cmd },
+          { "offline_root_pre_script_cmd", OPKG_OPT_TYPE_STRING, &conf->offline_root_pre_script_cmd },
+          { "proxy_passwd", OPKG_OPT_TYPE_STRING, &conf->proxy_passwd },
+          { "proxy_user", OPKG_OPT_TYPE_STRING, &conf->proxy_user },
+          { "query-all", OPKG_OPT_TYPE_BOOL, &conf->query_all },
+          { "verbose-wget", OPKG_OPT_TYPE_BOOL, &conf->verbose_wget },
+          { "verbosity", OPKG_OPT_TYPE_BOOL, &conf->verbosity },
           { NULL }
      };
 
-     *options = (ipkg_option_t *)malloc(sizeof(tmp));
+     *options = (opkg_option_t *)malloc(sizeof(tmp));
      if ( options == NULL ){
         fprintf(stderr,"%s: Unable to allocate memory\n",__FUNCTION__);
@@ -80 +80 @@
 };