Changeset 4561

Timestamp:

07/28/08 13:58:02 (5 years ago)

Author:

tick

Message:

make ipk as default opk as an option

Location:

trunk/src/host/opkg-utils

Files:

• opkg-build (modified) (4 diffs)
• opkg.py (modified) (3 diffs)

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

@@ -159 +159 @@
 outer=ar
 noclean=0
-ipkext=0
-usage="Usage: $0 [-c] [-C] [-i] [-o owner] [-g group] <pkg_directory> [<destination_directory>]"
+opkext=0
+usage="Usage: $0 [-c] [-C] [-O] [-o owner] [-g group] <pkg_directory> [<destination_directory>]"
 while getopts "cg:ho:v" opt; do
     case $opt in
@@ -166 +166 @@
             ogargs="--owner=$owner"
             ;;
+        O ) opkext=1
+            ;;
         g ) group=$OPTARG
             ogargs="$ogargs --group=$group"
@@ -173 +175 @@
         C ) noclean=1
             ;;
-        i ) ipkext=1
-            ;;
         v ) echo $version
             exit 0
@@ -240 +240 @@
 echo "2.0" > $tmp_dir/debian-binary
 
-if (( $ipkext == 1)); then 
+if (( $opkext == 1)); then 
+        pkg_file=$dest_dir/${pkg}_${version}_${arch}.opk
+else
         pkg_file=$dest_dir/${pkg}_${version}_${arch}.ipk
-else
-        pkg_file=$dest_dir/${pkg}_${version}_${arch}.opk
 fi
 

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

@@ -140 +140 @@
         self.filename = None
         self.isdeb = 0
+        self.file_ext_opk = "ipk"
         self.homepage = None
         self.oe = None
@@ -321 +322 @@
         return self.file_list
 
+    def set_package_extension(self, ext="ipk"):
+        self.file_ext_opk = ext
+
+    def get_package_extension(self):
+        return self.file_ext_opk
+
     def write_package(self, dirname):
         buf = self.render_control()
@@ -356 +363 @@
                 bits = bits + " data.tar.gz"
 
-        file = "%s_%s_%s.opk" % (self.package, self.version, self.architecture)
+        file = "%s_%s_%s.%s" % (self.package, self.version, self.architecture, self.get_package_extension())
         cmd = "cd %s ; tar cvfz %s/%s %s" % (self.scratch_dir,
                                              dirname,