Skip to content

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

detect package arch from spec

parent dc79733c
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
share/eterbuild/functions/rpm
View file @ a276a0f0
...@@ -70,7 +70,7 @@ build_buildroot() ...@@ -70,7 +70,7 @@ build_buildroot()
build_rpms_name() build_rpms_name()
{ {
local tmprpm CATSPEC NAMESPEC local tmprpm CATSPEC NAMESPEC PKGARCH
#TODO change : to = and execute? #TODO change : to = and execute?
NAMESPEC=$1 NAMESPEC=$1
shift shift
...@@ -89,7 +89,11 @@ build_rpms_name() ...@@ -89,7 +89,11 @@ build_rpms_name()
TARBALLNAME=$($CATSPEC | get_var "Source.*") TARBALLNAME=$($CATSPEC | get_var "Source.*")
[ -n "$TARBALLNAME" ] && TARBALLNAME=$(basename $TARBALLNAME) [ -n "$TARBALLNAME" ] && TARBALLNAME=$(basename $TARBALLNAME)
rm -f $tmprpm rm -f $tmprpm
NAMERPMIN=$BASENAME-$VERSION-$RELEASE.$DEFAULTARCH.rpm PKGARCH=$($CATSPEC | get_var "BuildArch")
if [ "$PKGARCH" != "noarch" ] ; then
PKGARCH=$DEFAULTARCH
fi
NAMERPMIN=$BASENAME-$VERSION-$RELEASE.$PKGARCH.rpm
NAMESRPMIN=$BASENAME-$VERSION-$RELEASE.src.rpm NAMESRPMIN=$BASENAME-$VERSION-$RELEASE.src.rpm
#RPMSOURCEDIR=$RPMDIR/SOURCES #RPMSOURCEDIR=$RPMDIR/SOURCES
......
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