Commit 6d01f38f authored by Vitaly Lipatov's avatar Vitaly Lipatov

epm repack common.sh: add install_requires() and call it when PREINSTALL_PACKAGES is set

parent 8627e1b9
...@@ -61,9 +61,8 @@ cleanup() ...@@ -61,9 +61,8 @@ cleanup()
install_deps() install_deps()
{ {
[ "$(epm print info -s)" = "alt" ] || return
# install all requires packages before packing (the list have got with rpmreqs package | xargs echo) # install all requires packages before packing (the list have got with rpmreqs package | xargs echo)
epm install --skip-installed at-spi2-atk file GConf glib2 grep libatk libat-spi2-core libalsa libcairo libcups libdbus libdrm libexpat libgbm libgdk-pixbuf libgio libgtk+3 libnspr libnss libpango \ install_requires at-spi2-atk file GConf glib2 grep libatk libat-spi2-core libalsa libcairo libcups libdbus libdrm libexpat libgbm libgdk-pixbuf libgio libgtk+3 libnspr libnss libpango \
libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXtst sed which xdg-utils xprop libsecret libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXtst sed which xdg-utils xprop libsecret
} }
......
...@@ -263,6 +263,13 @@ add_requires() ...@@ -263,6 +263,13 @@ add_requires()
subst "1iRequires: $*" $SPEC subst "1iRequires: $*" $SPEC
} }
install_requires()
{
if [ "$(epm print info -s)" = "alt" ] ; then
epm install --skip-installed "$@"
fi
}
filter_from_requires() filter_from_requires()
{ {
local i local i
...@@ -316,3 +323,5 @@ if [ -n "$PRODUCTDIR" ] && [ "$(dirname "$PRODUCTDIR" )" != "/" ] && [ "$(dirnam ...@@ -316,3 +323,5 @@ if [ -n "$PRODUCTDIR" ] && [ "$(dirname "$PRODUCTDIR" )" != "/" ] && [ "$(dirnam
fi fi
[ -d "$BUILDROOT$PRODUCTBASEDIR" ] && pack_dir "$PRODUCTBASEDIR" [ -d "$BUILDROOT$PRODUCTBASEDIR" ] && pack_dir "$PRODUCTBASEDIR"
[ -n "$PREINSTALL_PACKAGES" ] && install_requires $PREINSTALL_PACKAGES
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