r4561 - trunk/src/host/opkg-utils
tick at docs.openmoko.org
tick at docs.openmoko.org
Mon Jul 28 13:58:02 CEST 2008
Author: tick
Date: 2008-07-28 13:58:02 +0200 (Mon, 28 Jul 2008)
New Revision: 4561
Modified:
trunk/src/host/opkg-utils/opkg-build
trunk/src/host/opkg-utils/opkg.py
Log:
make ipk as default opk as an option
Modified: trunk/src/host/opkg-utils/opkg-build
===================================================================
--- trunk/src/host/opkg-utils/opkg-build 2008-07-28 10:29:45 UTC (rev 4560)
+++ trunk/src/host/opkg-utils/opkg-build 2008-07-28 11:58:02 UTC (rev 4561)
@@ -158,13 +158,15 @@
ogargs=""
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
o ) owner=$OPTARG
ogargs="--owner=$owner"
;;
+ O ) opkext=1
+ ;;
g ) group=$OPTARG
ogargs="$ogargs --group=$group"
;;
@@ -172,8 +174,6 @@
;;
C ) noclean=1
;;
- i ) ipkext=1
- ;;
v ) echo $version
exit 0
;;
@@ -239,10 +239,10 @@
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
rm -f $pkg_file
Modified: trunk/src/host/opkg-utils/opkg.py
===================================================================
--- trunk/src/host/opkg-utils/opkg.py 2008-07-28 10:29:45 UTC (rev 4560)
+++ trunk/src/host/opkg-utils/opkg.py 2008-07-28 11:58:02 UTC (rev 4561)
@@ -139,6 +139,7 @@
self.installed_size = None
self.filename = None
self.isdeb = 0
+ self.file_ext_opk = "ipk"
self.homepage = None
self.oe = None
self.priority = None
@@ -320,6 +321,12 @@
f.close()
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()
file = open("%s/control" % self.meta_dir, 'w')
@@ -355,7 +362,7 @@
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,
file,
More information about the commitlog
mailing list