diff options
| -rw-r--r-- | libopkg/args.c | 2 | ||||
| -rw-r--r-- | libopkg/opkg_defines.h | 3 | ||||
| -rw-r--r-- | libopkg/opkg_download.c | 3 | ||||
| -rw-r--r-- | libopkg/opkg_install.c | 2 | ||||
| -rw-r--r-- | libopkg/pkg.c | 2 | ||||
| -rw-r--r-- | libopkg/pkg_parse.c | 2 |
6 files changed, 8 insertions, 6 deletions
diff --git a/libopkg/args.c b/libopkg/args.c index 564e05c..85d7d7e 100644 --- a/libopkg/args.c +++ b/libopkg/args.c @@ -244,7 +244,7 @@ void args_usage(char *complaint) printf("\tupdate Update list of available packages\n"); printf("\tupgrade Upgrade all installed packages to latest version\n"); printf("\tinstall <pkg> Download and install <pkg> (and dependencies)\n"); - printf("\tinstall <file.ipk> Install package <file.ipk>\n"); + printf("\tinstall <file.opk> Install package <file.opk>\n"); printf("\tconfigure [<pkg>] Configure unpacked packages\n"); printf("\tremove <pkg|regexp> Remove package <pkg|packages following regexp>\n"); printf("\tflag <flag> <pkg> ... Flag package(s) <pkg>\n"); diff --git a/libopkg/opkg_defines.h b/libopkg/opkg_defines.h index 1fdef18..090d7d4 100644 --- a/libopkg/opkg_defines.h +++ b/libopkg/opkg_defines.h @@ -16,7 +16,8 @@ #ifndef OPKG_DEFINES_H #define OPKG_DEFINES_H -#define OPKG_PKG_EXTENSION ".ipk" +#define OPKG_PKG_EXTENSION ".opk" +#define IPKG_PKG_EXTENSION ".ipk" #define DPKG_PKG_EXTENSION ".deb" #define OPKG_LEGAL_PKG_NAME_CHARS "abcdefghijklmnopqrstuvwxyz0123456789.+-" diff --git a/libopkg/opkg_download.c b/libopkg/opkg_download.c index 629aa79..a8f03e2 100644 --- a/libopkg/opkg_download.c +++ b/libopkg/opkg_download.c @@ -154,7 +154,7 @@ int opkg_download_pkg(opkg_conf_t *conf, pkg_t *pkg, const char *dir) sprintf_alloc(&url, "%s/%s", pkg->src->value, pkg->filename); /* XXX: BUG: The pkg->filename might be something like - "../../foo.ipk". While this is correct, and exactly what we + "../../foo.opk". While this is correct, and exactly what we want to use to construct url above, here we actually need to use just the filename part, without any directory. */ @@ -202,6 +202,7 @@ int opkg_prepare_url_for_install(opkg_conf_t *conf, const char *url, char **name free(file_basec); } else if (strcmp(&url[strlen(url) - 4], OPKG_PKG_EXTENSION) == 0 + || strcmp(&url[strlen(url) - 4], IPKG_PKG_EXTENSION) == 0 || strcmp(&url[strlen(url) - 4], DPKG_PKG_EXTENSION) == 0) { err = pkg_init_from_file(pkg, url); diff --git a/libopkg/opkg_install.c b/libopkg/opkg_install.c index a3893c7..47554d0 100644 --- a/libopkg/opkg_install.c +++ b/libopkg/opkg_install.c @@ -521,7 +521,7 @@ static int verify_pkg_installable(opkg_conf_t *conf, pkg_t *pkg) * XXX: BUG easy for cworth * 1) please point the call below to the correct current root destination * 2) we need to resolve how to check the required space for a pending pkg, - * my diddling with the .ipk file size below isn't going to cut it. + * my diddling with the .opk file size below isn't going to cut it. * 3) return a proper error code instead of 1 */ int comp_size, blocks_available; diff --git a/libopkg/pkg.c b/libopkg/pkg.c index 26b6efe..d662664 100644 --- a/libopkg/pkg.c +++ b/libopkg/pkg.c @@ -1079,7 +1079,7 @@ void pkg_print_status(pkg_t * pkg, FILE * file) can be found in th available file. But, someone proposed the idea to make it possible to - reconstruct a .ipk from an installed package, (ie. for beaming + reconstruct a .opk from an installed package, (ie. for beaming from one handheld to another). So, maybe we actually want a few more fields here, (depends, suggests, etc.), so that that would be guaranteed to work even in the absence of more information diff --git a/libopkg/pkg_parse.c b/libopkg/pkg_parse.c index 9b43754..af5ead7 100644 --- a/libopkg/pkg_parse.c +++ b/libopkg/pkg_parse.c @@ -369,7 +369,7 @@ int pkg_parse_raw(pkg_t *pkg, char ***raw, pkg_src_t *src, pkg_dest_t *dest) out:; *raw = lines; -/* If the ipk has not a Provides line, we insert our false line */ +/* If the opk has not a Provides line, we insert our false line */ if ( pkg_false_provides==1) { pkg->provides_count = 1; |