Commit fffde283 authored by Vitaly Lipatov's avatar Vitaly Lipatov

move build_buildroot to rpm functions file

parent a7414eab
...@@ -22,21 +22,6 @@ if [ "$1" = "--helper" ]; then ...@@ -22,21 +22,6 @@ if [ "$1" = "--helper" ]; then
exit $? exit $?
fi fi
# get correct BUILDROOT, run build_rpms_name before!
build_buildroot()
{
test -z "$BASENAME" && fatal "Use build_buildroot with BASENAME defined"
# ALT Only?
BUILDROOT=`rpm --eval %buildroot | subst_namever`
test -z "$BUILDROOT" && fatal "Fix rpm's buildroot"
if [ "$BUILDROOT" = "%buildroot" ] ; then
BUILDROOT="$HOME/tmp/$BASENAME-buildroot"
warning "Can't get buildroot from RPM, set to $BUILDROOT"
return 1
fi
return 0
}
############################# #############################
Usage="Usage: $name [-c -p -i -r] spec..." Usage="Usage: $name [-c -p -i -r] spec..."
......
...@@ -31,6 +31,21 @@ uni_rpmbuild() ...@@ -31,6 +31,21 @@ uni_rpmbuild()
[ -n "$VERBOSE" ] && echo "Run $COMMAND $ONEPARAM $@" || : [ -n "$VERBOSE" ] && echo "Run $COMMAND $ONEPARAM $@" || :
} }
# get correct BUILDROOT, run build_rpms_name before!
build_buildroot()
{
test -z "$BASENAME" && fatal "Use build_buildroot with BASENAME defined"
# ALT Only?
BUILDROOT=`rpm --eval %buildroot | subst_namever`
test -z "$BUILDROOT" && fatal "Fix rpm's buildroot"
if [ "$BUILDROOT" = "%buildroot" ] ; then
BUILDROOT="$HOME/tmp/$BASENAME-buildroot"
warning "Can't get buildroot from RPM, set to $BUILDROOT"
return 1
fi
return 0
}
# . # .
# ! # !
# Name: # Name:
......
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