Skip to content

E
etersoft-build-utils
Commit efb8ce70 authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

rpmbs: improve copying tarball function (convert to tar.bz2, add md5sum)

see http://rt.etersoft.ru/Ticket/Display.html?id=11058
parent a26b6bda
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 3 deletions
bin/rpmbs
View file @ efb8ce70
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
# load common functions, compatible with local and installed script # load common functions, compatible with local and installed script
. `dirname $0`/../share/eterbuild/functions/common . `dirname $0`/../share/eterbuild/functions/common
load_mod rpm load_mod rpm tarball
SIGN= SIGN=
UPLOADNOW= UPLOADNOW=
...@@ -118,13 +118,18 @@ check_gear_and_tag() ...@@ -118,13 +118,18 @@ check_gear_and_tag()
fi fi
} }
# SRC.RPM DIR
extract_tarball_to_dest() extract_tarball_to_dest()
{ {
local TDIR=$(mktemp -d || fatal "can't create tmp dir") local TDIR=$(mktemp -d || fatal "can't create tmp dir")
cd $TDIR cd $TDIR
cat "$1" | rpm2cpio | cpio -i "*.tar*" cat "$1" | rpm2cpio | cpio -i "*.tar*"
cp -fv *.tar* $2 #cp -fv *.tar* $2
local TARNAME=$(rpm -q -p --queryformat "%{NAME}-%{VERSION}" $1)
local TARGETTARNAME=$(rpm -q -p --queryformat "%{NAME}-%{VERSION}-%{RELEASE}" $1)
copy_tarball_to_tar_bz2 $TARNAME*.tar* $2/$TARGETTARNAME.tar.bz2
cd - cd -
make_md5sum $2 $TARGETTARNAME.tar.bz2
rm -f $TDIR/* rm -f $TDIR/*
rmdir $TDIR rmdir $TDIR
} }
...@@ -228,6 +233,7 @@ if [ -n "${DELETENOW}" ]; then ...@@ -228,6 +233,7 @@ if [ -n "${DELETENOW}" ]; then
fi fi
# Sign src.rpm and upload it
if [ -n "$SIGN" ]; then if [ -n "$SIGN" ]; then
release_check $LISTBUILT release_check $LISTBUILT
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment