Commit 75292049 authored by Vitaly Lipatov's avatar Vitaly Lipatov

epm repack: use cpio fixing only for rpm/deb

parent 43e54e54
...@@ -86,7 +86,7 @@ __apply_fix_code() ...@@ -86,7 +86,7 @@ __apply_fix_code()
[ "$PROGDIR" = "/usr/bin" ] && SCPATH="$PATH" || SCPATH="$PROGDIR:$PATH" [ "$PROGDIR" = "/usr/bin" ] && SCPATH="$PATH" || SCPATH="$PROGDIR:$PATH"
local bashopt='' local bashopt=''
[ -n "$debug" ] && bashopt='-x' [ -n "$debug" ] && bashopt='-x'
( unset EPMCURDIR ; export PATH=$SCPATH ; docmd $CMDSHELL $bashopt $repackcode "$1" "$2" "$3" "$4" ) || fatal "There is an error from $repackcode script" ( unset EPMCURDIR ; export PATH=$SCPATH ; docmd $CMDSHELL $bashopt $repackcode "$1" "$2" "$3" "$4" "$5" ) || fatal "There is an error from $repackcode script"
} }
__create_rpmmacros() __create_rpmmacros()
...@@ -214,7 +214,7 @@ __epm_repack_to_rpm() ...@@ -214,7 +214,7 @@ __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 $abspkg __apply_fix_code "generic" $buildroot $spec $pkgname $abspkg $SUBGENERIC
__apply_fix_code "generic-$SUBGENERIC" $buildroot $spec $pkgname $abspkg __apply_fix_code "generic-$SUBGENERIC" $buildroot $spec $pkgname $abspkg
__apply_fix_code $pkgname $buildroot $spec $pkgname $abspkg __apply_fix_code $pkgname $buildroot $spec $pkgname $abspkg
if ! has_repack_script $pkgname ; then if ! has_repack_script $pkgname ; then
......
...@@ -4,6 +4,7 @@ BUILDROOT="$1" ...@@ -4,6 +4,7 @@ BUILDROOT="$1"
SPEC="$2" SPEC="$2"
PRODUCT="$3" PRODUCT="$3"
PKG="$4" PKG="$4"
SUBGENERIC="$5"
# firstly, pack $PRODUCTDIR if used # firstly, pack $PRODUCTDIR if used
. $(dirname $0)/common.sh . $(dirname $0)/common.sh
...@@ -96,4 +97,7 @@ else ...@@ -96,4 +97,7 @@ else
subst "s|^\((Converted from a\) \(.*\) \(package.*\)|(Repacked from binary \2 package with $(epm --short --version))\n\1 \2 \3|" $SPEC subst "s|^\((Converted from a\) \(.*\) \(package.*\)|(Repacked from binary \2 package with $(epm --short --version))\n\1 \2 \3|" $SPEC
fi fi
fix_cpio_bug_links # only for rpm
if [ -z "$SUBGENERIC" ] ; then
fix_cpio_bug_links
fi
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