Commit 0ee87d56 authored by Vitaly Lipatov's avatar Vitaly Lipatov

epm repack: set TMPDIR if missed, set _allow_root_build in temp. .rpmmacros

parent fc1577c9
...@@ -165,12 +165,17 @@ __apply_fix_code() ...@@ -165,12 +165,17 @@ __apply_fix_code()
__create_rpmmacros() __create_rpmmacros()
{ {
# FIXME:
[ -n "$TMPDIR" ] || TMPDIR=/tmp
cat <<EOF >$HOME/.rpmmacros cat <<EOF >$HOME/.rpmmacros
%_topdir $HOME/RPM %_topdir $HOME/RPM
%_tmppath $TMPDIR %_tmppath $TMPDIR
%packager EPM <support@etersoft.ru> %packager EPM <support@etersoft.ru>
%_gpg_name support@etersoft.ru %_gpg_name support@etersoft.ru
%_allow_root_build 1
EOF EOF
to_remove_pkg_files="$to_remove_pkg_files $HOME/.rpmmacros" to_remove_pkg_files="$to_remove_pkg_files $HOME/.rpmmacros"
} }
...@@ -189,7 +194,7 @@ __epm_repack_to_rpm() ...@@ -189,7 +194,7 @@ __epm_repack_to_rpm()
# install epm-repack for static (package based) dependencies # install epm-repack for static (package based) dependencies
assure_exists alien || fatal assure_exists alien || fatal
assure_exists /usr/bin/rpmbuild || fatal assure_exists /usr/bin/rpmbuild rpm-build || fatal
# TODO: improve # TODO: improve
if echo "$pkgs" | grep -q "\.deb" ; then if echo "$pkgs" | grep -q "\.deb" ; then
...@@ -289,11 +294,11 @@ __epm_repack_to_rpm() ...@@ -289,11 +294,11 @@ __epm_repack_to_rpm()
__apply_fix_code $pkgname $tmpbuilddir/$subdir $spec __apply_fix_code $pkgname $tmpbuilddir/$subdir $spec
# TODO: we need these dirs to be created # TODO: we need these dirs to be created
to_remove_pkg_dirs="$to_remove_pkg_dirs $HOME/RPM/BUILD $HOME/RPM" to_remove_pkg_dirs="$to_remove_pkg_dirs $HOME/RPM/BUILD $HOME/RPM"
showcmd rpmbuild --buildroot $tmpbuilddir/$subdir --define='_allow_root_build 1' -bb $spec showcmd rpmbuild --buildroot $tmpbuilddir/$subdir -bb $spec
if [ -n "$verbose" ] ; then if [ -n "$verbose" ] ; then
a='' rpmbuild --buildroot $tmpbuilddir/$subdir --define='_allow_root_build 1' -bb $spec || fatal a='' rpmbuild --buildroot $tmpbuilddir/$subdir -bb $spec || fatal
else else
a='' rpmbuild --buildroot $tmpbuilddir/$subdir --define='_allow_root_build 1' -bb $spec >/dev/null || fatal a='' rpmbuild --buildroot $tmpbuilddir/$subdir -bb $spec >/dev/null || fatal
fi fi
# remove copy of source binary package (don't mix with generated) # remove copy of source binary package (don't mix with generated)
rm -f $tmpbuilddir/../$alpkg rm -f $tmpbuilddir/../$alpkg
......
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