summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-04-15 03:12:31 (UTC)
committer kergoth <kergoth>2003-04-15 03:12:31 (UTC)
commit7d32077ab9c4e33fb82390cd5279f049000a0e0c (patch) (side-by-side diff)
treecd0f88932101eca6dbcd0f9cf6ff659840738e13
parent35edf52692c9f5e68b07072dd79b857d16d79559 (diff)
downloadopie-7d32077ab9c4e33fb82390cd5279f049000a0e0c.zip
opie-7d32077ab9c4e33fb82390cd5279f049000a0e0c.tar.gz
opie-7d32077ab9c4e33fb82390cd5279f049000a0e0c.tar.bz2
Ipkg-build that strips out epoch from package version when naming
the file.
Diffstat (more/less context) (show whitespace changes)
-rwxr-xr-xscripts/ipkg-build16
1 files changed, 9 insertions, 7 deletions
diff --git a/scripts/ipkg-build b/scripts/ipkg-build
index 0533048..c6af056 100755
--- a/scripts/ipkg-build
+++ b/scripts/ipkg-build
@@ -57,5 +57,5 @@ You probably want to chown these to a system user: " >&2
[ "$?" -ne 0 ] && PKG_ERROR=1
- version=`required_field Version | sed 's/.*://;'`
+ version=`required_field Version | sed 's/Version://; s/^.://g;'`
[ "$?" -ne 0 ] && PKG_ERROR=1
@@ -122,6 +122,7 @@ You probably want to chown these to a system user: " >&2
###
ogargs=""
-usage="Usage: $0 [-o owner] [-g group] [-c] <pkg_directory> [<destination_directory>]"
-while getopts ":o:g:c" opt; do
+outer=ar
+usage="Usage: $0 [-c] [-o owner] [-g group] <pkg_directory> [<destination_directory>]"
+while getopts "cg:o:" opt; do
case $opt in
o ) owner=$OPTARG
@@ -131,5 +132,5 @@ while getopts ":o:g:c" opt; do
ogargs="$ogargs --group=$group"
;;
- c ) classic=1
+ c ) outer=tar
;;
\? ) echo $usage >&2
@@ -187,9 +188,10 @@ echo "2.0" > $tmp_dir/debian-binary
pkg_file=$dest_dir/${pkg}_${version}_${arch}.ipk
here_dir=$PWD
+## tar -C $tmp_dir -czf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz
rm -f $pkg_file
-if [ -n "$classic" ]; then
- tar -C $tmp_dir -czf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz
-else
+if [ "$outer" = "ar" ] ; then
cd $tmp_dir ; ar crf $here_dir/$pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz
+else
+ cd $tmp_dir ; tar -zcf $here_dir/$pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz
fi
cd $here_dir