Skip to content

E
eepm
Commit fff45018 authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

epm repack: pass origin package path to repack script

parent 94de8466
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
bin/epm-repack-rpm
View file @ fff45018
...@@ -76,7 +76,7 @@ __apply_fix_code() ...@@ -76,7 +76,7 @@ __apply_fix_code()
export PATH=$PROGDIR:$PATH export PATH=$PROGDIR:$PATH
local bashopt='' local bashopt=''
[ -n "$verbose" ] && bashopt='-x' [ -n "$verbose" ] && bashopt='-x'
( unset EPMCURDIR ; docmd $CMDSHELL $bashopt $repackcode "$1" "$2" "$3" ) || fatal "There is an error from $repackcode script" ( unset EPMCURDIR ; docmd $CMDSHELL $bashopt $repackcode "$1" "$2" "$3" "$4" ) || fatal "There is an error from $repackcode script"
} }
__create_rpmmacros() __create_rpmmacros()
...@@ -180,9 +180,9 @@ __epm_repack_to_rpm() ...@@ -180,9 +180,9 @@ __epm_repack_to_rpm()
cd $buildroot || fatal cd $buildroot || fatal
__fix_spec $pkgname $buildroot $spec __fix_spec $pkgname $buildroot $spec
__apply_fix_code "generic" $buildroot $spec $pkgname __apply_fix_code "generic" $buildroot $spec $pkgname $abspkg
[ -n "$SUBGENERIC" ] && __apply_fix_code "generic-$SUBGENERIC" $buildroot $spec [ -n "$SUBGENERIC" ] && __apply_fix_code "generic-$SUBGENERIC" $buildroot $spec $pkgname $abspkg
__apply_fix_code $pkgname $buildroot $spec $pkgname __apply_fix_code $pkgname $buildroot $spec $pkgname $abspkg
cd - >/dev/null cd - >/dev/null
TARGETARCH=$(epm print info -a | sed -e 's|^x86$|i586|') TARGETARCH=$(epm print info -a | sed -e 's|^x86$|i586|')
......
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