CRUX-ARM :
Home
Home
::
Documentation
::
Download
::
Development
::
Community
::
Ports
::
Packages
::
Bugs
::
Links
::
About
::
Donors
development
/
pkgutils-cross.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug #581: Users may choose from gz/bz2/xz for the compression mode now.
[pkgutils-cross.git]
/
pkgmk.in
diff --git
a/pkgmk.in
b/pkgmk.in
index c7f54321065ce46beb0b97cf9edf02361cd0e349..2a6a27d1cbbaba9da59283605152533c6f23cc73 100755
(executable)
--- a/
pkgmk.in
+++ b/
pkgmk.in
@@
-162,7
+162,7
@@
unpack_source() {
for FILE in ${source[@]}; do
LOCAL_FILENAME=`get_filename $FILE`
case $LOCAL_FILENAME in
for FILE in ${source[@]}; do
LOCAL_FILENAME=`get_filename $FILE`
case $LOCAL_FILENAME in
- *.tar.gz|*.tar.Z|*.tgz|*.tar.bz2|*.t
ar.xz|*.tar.lzma|*.zip
)
+ *.tar.gz|*.tar.Z|*.tgz|*.tar.bz2|*.t
bz2|*.tar.xz|*.txz|*.tar.lzma|*.zip|*.rpm
)
COMMAND="bsdtar -p -o -C $SRC -xf $LOCAL_FILENAME" ;;
*)
COMMAND="cp $LOCAL_FILENAME $SRC" ;;
COMMAND="bsdtar -p -o -C $SRC -xf $LOCAL_FILENAME" ;;
*)
COMMAND="cp $LOCAL_FILENAME $SRC" ;;
@@
-353,6
+353,7
@@
remove_work_dir() {
build_package() {
local BUILD_SUCCESSFUL="no"
build_package() {
local BUILD_SUCCESSFUL="no"
+ local COMPRESSION
check_file "$TARGET"
make_work_dir
check_file "$TARGET"
make_work_dir
@@
-377,8
+378,14
@@
build_package() {
cd $PKG
info "Build result:"
cd $PKG
info "Build result:"
- tar czvvf $TARGET *
-
+
+ case $PKGMK_COMPRESSION_MODE in
+ gz) COMPRESSION="-z" ;;
+ bz2) COMPRESSION="-j" ;;
+ xz) COMPRESSION="-J" ;;
+ esac
+ bsdtar -c $COMPRESSION -f $TARGET * && bsdtar -t -v -f $TARGET
+
if [ $? = 0 ]; then
BUILD_SUCCESSFUL="yes"
if [ $? = 0 ]; then
BUILD_SUCCESSFUL="yes"
@@
-606,9
+613,17
@@
main() {
check_directory "`dirname $PKGMK_WORK_DIR`"
check_pkgfile
check_directory "`dirname $PKGMK_WORK_DIR`"
check_pkgfile
-
- TARGET="$PKGMK_PACKAGE_DIR/$name#$version-$release.pkg.tar.gz"
-
+
+ case $PKGMK_COMPRESSION_MODE in
+ gz|bz2|xz)
+ TARGET="$PKGMK_PACKAGE_DIR/$name#$version-$release.pkg.tar.$PKGMK_COMPRESSION_MODE"
+ ;;
+ *)
+ error "Compression mode '$PKGMK_COMPRESSION_MODE' not supported"
+ exit 1
+ ;;
+ esac
+
if [ "$PKGMK_CLEAN" = "yes" ]; then
clean
exit 0
if [ "$PKGMK_CLEAN" = "yes" ]; then
clean
exit 0
@@
-682,6
+697,8
@@
PKGMK_SOURCE_DIR="$PWD"
PKGMK_PACKAGE_DIR="$PWD"
PKGMK_WORK_DIR="$PWD/work"
PKGMK_PACKAGE_DIR="$PWD"
PKGMK_WORK_DIR="$PWD/work"
+PKGMK_COMPRESSION_MODE="gz"
+
PKGMK_INSTALL="no"
PKGMK_RECURSIVE="no"
PKGMK_DOWNLOAD="no"
PKGMK_INSTALL="no"
PKGMK_RECURSIVE="no"
PKGMK_DOWNLOAD="no"