Changeset 4560

Timestamp:

07/28/08 12:29:45 (5 years ago)

Author:

tick

Message:

opkg-util make .opk as the default file extension

"opkg-build -i ..." means creating .ipk file for backward support

Location:

trunk/src/host/opkg-utils

Files:

• arfile.py (modified) (1 diff)
• makePackage (modified) (1 diff)
• opkg-build (modified) (5 diffs)
• opkg-buildpackage (modified) (2 diffs)
• opkg-diff (modified) (1 diff)
• opkg-extract-file (modified) (2 diffs)
• opkg-list-fields (modified) (1 diff)
• opkg-make-index (modified) (1 diff)
• opkg-unbuild (modified) (2 diffs)
• opkg.py (modified) (1 diff)

trunk/src/host/opkg-utils/arfile.py

@@ -112 +112 @@
         dir = sys.argv[1]
     for f in os.listdir(dir):
-        if not f.endswith(".ipk"): continue
+        if not f.endswith(".opk") and not f.endswith(".ipk"): continue
 
         print "=== %s ===" % f

trunk/src/host/opkg-utils/makePackage

@@ -5 +5 @@
 #   Insert the filename, size, and md5 lines before the description.
 # Call it like this:
-#  find . -name \*.ipk | xargs -n 1 makePackage > Packages
+#  find . -name \*.opk | xargs -n 1 makePackage > Packages
 
 import sys

trunk/src/host/opkg-utils/opkg-build

@@ -1 +1 @@
 #!/bin/sh
 
-# opkg-build -- construct a .ipk from a directory
+# opkg-build -- construct a .opk from a directory
 # Carl Worth <cworth@east.isi.edu>
 # based on a script by Steve Redler IV, steve@sr-tech.com 5-21-2001
@@ -113 +113 @@
             echo "used to build this package.  Either gnu-style tarballs or Debian source packages "
             echo "are acceptable.  Relative filenames may be used if they are distributed in the same"
-            echo "directory as the .ipk file."
+            echo "directory as the .opk file."
         fi
 
@@ -159 +159 @@
 outer=ar
 noclean=0
-usage="Usage: $0 [-c] [-C] [-o owner] [-g group] <pkg_directory> [<destination_directory>]"
+ipkext=0
+usage="Usage: $0 [-c] [-C] [-i] [-o owner] [-g group] <pkg_directory> [<destination_directory>]"
 while getopts "cg:ho:v" opt; do
     case $opt in
@@ -172 +173 @@
         C ) noclean=1
             ;;
+        i ) ipkext=1
+            ;;
         v ) echo $version
             exit 0
             ;;
-        h )     echo $usage  >&2 ;;
-        \? )    echo $usage  >&2
+        h )     
+            echo $usage  >&2 
+            exit 0
+            ;;
+        \? )    
+            echo $usage  >&2
         esac
 done
@@ -233 +240 @@
 echo "2.0" > $tmp_dir/debian-binary
 
-pkg_file=$dest_dir/${pkg}_${version}_${arch}.ipk
+if (( $ipkext == 1)); then 
+        pkg_file=$dest_dir/${pkg}_${version}_${arch}.ipk
+else
+        pkg_file=$dest_dir/${pkg}_${version}_${arch}.opk
+fi
+
 rm -f $pkg_file
 if [ "$outer" = "ar" ] ; then

trunk/src/host/opkg-utils/opkg-buildpackage

@@ -24 +24 @@
 #
 # You should run this with fakeroot (1) or as root.
-# If all went well, you will find a diff file and an *.ipk file in the
+# If all went well, you will find a diff file and an *.opk file in the
 # directory above.
 
@@ -207 +207 @@
 done
 
-# build the ipk package
+# build the opk package
 owd=`pwd`
 cd ..

trunk/src/host/opkg-utils/opkg-diff

@@ -2 +2 @@
 
 pkg1=$1
-dir1=`echo $pkg1 | sed s/.ipk//`
+dir1=`echo $pkg1 | sed s/.opk//`
 dir1=`basename $dir1` 
 pkg2=$2
-dir2=`echo $pkg2 | sed s/.ipk//`
+dir2=`echo $pkg2 | sed s/.opk//`
 dir2=`basename $dir2` 
 

trunk/src/host/opkg-utils/opkg-extract-file

@@ -4 +4 @@
 
 if [ $# -lt 1 ]; then
-        echo "usage: $0: package.ipk filename ..."
+        echo "usage: $0: package.opk filename ..."
         exit 1
 fi
@@ -33 +33 @@
 mkdir $tmpdir
 
-pkgdir=$tmpdir/`basename $opkgfilename | sed 's/.*\///;s/.ipk$//;s/.deb$//'`
+pkgdir=$tmpdir/`basename $opkgfilename | sed 's/.*\///;s/.opk$//;s/.deb$//;s/.ipk$//'`
 
 mkdir -p $pkgdir/CONTROL

trunk/src/host/opkg-utils/opkg-list-fields

@@ -4 +4 @@
 
 def usage():
-     sys.stderr.write("%s ipk\n" % (sys.argv[0],))
+     sys.stderr.write("%s opk\n" % (sys.argv[0],))
      sys.exit(-1)
 

trunk/src/host/opkg-utils/opkg-make-index

@@ -94 +94 @@
 if (verbose):
      sys.stderr.write("Reading in all the package info from %s\n" % (pkg_dir, ))
-files=glob(pkg_dir + '/*.ipk') + glob(pkg_dir + '/*.deb')
+files=glob(pkg_dir + '/*.opk') + glob(pkg_dir + '/*.deb') + glob(pkg_dir + '/*.ipk')
 files.sort()
 for filename in files:

trunk/src/host/opkg-utils/opkg-unbuild

@@ -4 +4 @@
 
 if (len(sys.argv) == 0):
-    print 'usage: %s: package.ipk' % sys.argv[0]
+    print 'usage: %s: package.opk' % sys.argv[0]
     sys.exit(1)
 
@@ -10 +10 @@
     m = re.match('((.*/)*)(.*)', filename)
     pkg = m.group(3)
-    m = re.match('(.*)((.ipk)|(.deb))', filename)
+    m = re.match('(.*)((.opk)|(.deb)|(.ipk))', filename)
     if m:
         pkg = m.group(1)

trunk/src/host/opkg-utils/opkg.py

@@ -356 +356 @@
                 bits = bits + " data.tar.gz"
 
-        file = "%s_%s_%s.ipk" % (self.package, self.version, self.architecture)
+        file = "%s_%s_%s.opk" % (self.package, self.version, self.architecture)
         cmd = "cd %s ; tar cvfz %s/%s %s" % (self.scratch_dir,
                                              dirname,