Changeset 4559

Timestamp:

07/28/08 11:50:19 (5 years ago)

Author:

tick

Message:

opkg: make .opk as the default opkg file extension

Location:

trunk/src/target/opkg/libopkg

Files:

• args.c (modified) (1 diff)
• opkg_defines.h (modified) (1 diff)
• opkg_download.c (modified) (2 diffs)
• opkg_install.c (modified) (1 diff)
• pkg.c (modified) (1 diff)
• pkg_parse.c (modified) (1 diff)

trunk/src/target/opkg/libopkg/args.c

@@ -245 +245 @@
      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");

trunk/src/target/opkg/libopkg/opkg_defines.h

@@ -17 +17 @@
 #define OPKG_DEFINES_H
 
-#define OPKG_PKG_EXTENSION ".ipk"
+#define OPKG_PKG_EXTENSION ".opk"
+#define IPKG_PKG_EXTENSION ".ipk"
 #define DPKG_PKG_EXTENSION ".deb"
 

trunk/src/target/opkg/libopkg/opkg_download.c

@@ -155 +155 @@
 
     /* 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. */
@@ -203 +203 @@
 
      } 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) {
 

trunk/src/target/opkg/libopkg/opkg_install.c

@@ -522 +522 @@
      * 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
      */

trunk/src/target/opkg/libopkg/pkg.c

@@ -1080 +1080 @@
 
         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

trunk/src/target/opkg/libopkg/pkg_parse.c

@@ -370 +370 @@
     
     *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)
     {