r4559 - trunk/src/target/opkg/libopkg

[tick at docs.openmoko.org]

Author: tick
Date: 2008-07-28 11:50:19 +0200 (Mon, 28 Jul 2008)
New Revision: 4559

Modified:
   trunk/src/target/opkg/libopkg/args.c
   trunk/src/target/opkg/libopkg/opkg_defines.h
   trunk/src/target/opkg/libopkg/opkg_download.c
   trunk/src/target/opkg/libopkg/opkg_install.c
   trunk/src/target/opkg/libopkg/pkg.c
   trunk/src/target/opkg/libopkg/pkg_parse.c
Log:
opkg: make .opk as the default opkg file extension


Modified: trunk/src/target/opkg/libopkg/args.c
===================================================================
--- trunk/src/target/opkg/libopkg/args.c	2008-07-27 15:05:01 UTC (rev 4558)
+++ trunk/src/target/opkg/libopkg/args.c	2008-07-28 09:50:19 UTC (rev 4559)
@@ -244,7 +244,7 @@
      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");

Modified: trunk/src/target/opkg/libopkg/opkg_defines.h
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_defines.h	2008-07-27 15:05:01 UTC (rev 4558)
+++ trunk/src/target/opkg/libopkg/opkg_defines.h	2008-07-28 09:50:19 UTC (rev 4559)
@@ -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.+-"

Modified: trunk/src/target/opkg/libopkg/opkg_download.c
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_download.c	2008-07-27 15:05:01 UTC (rev 4558)
+++ trunk/src/target/opkg/libopkg/opkg_download.c	2008-07-28 09:50:19 UTC (rev 4559)
@@ -154,7 +154,7 @@
     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 @@
 	  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);

Modified: trunk/src/target/opkg/libopkg/opkg_install.c
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_install.c	2008-07-27 15:05:01 UTC (rev 4558)
+++ trunk/src/target/opkg/libopkg/opkg_install.c	2008-07-28 09:50:19 UTC (rev 4559)
@@ -521,7 +521,7 @@
      * 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;

Modified: trunk/src/target/opkg/libopkg/pkg.c
===================================================================
--- trunk/src/target/opkg/libopkg/pkg.c	2008-07-27 15:05:01 UTC (rev 4558)
+++ trunk/src/target/opkg/libopkg/pkg.c	2008-07-28 09:50:19 UTC (rev 4559)
@@ -1079,7 +1079,7 @@
 	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

Modified: trunk/src/target/opkg/libopkg/pkg_parse.c
===================================================================
--- trunk/src/target/opkg/libopkg/pkg_parse.c	2008-07-27 15:05:01 UTC (rev 4558)
+++ trunk/src/target/opkg/libopkg/pkg_parse.c	2008-07-28 09:50:19 UTC (rev 4559)
@@ -369,7 +369,7 @@
 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;