Search
SailfishOS Open Build Service
>
Projects
>
home:plfiorini
:
maui:devel
:
x86_64
>
build
> _service:tar_git:0018-Fix-for-more-than-one-sb2install-packages.patch
Log In
Username
Password
Cancel
Overview
Repositories
Revisions
Requests
Users
Advanced
Attributes
Meta
File _service:tar_git:0018-Fix-for-more-than-one-sb2install-packages.patch of Package build
From d56b23d3cb85689fdf2181239f79756fe21d9c10 Mon Sep 17 00:00:00 2001 From: Juha Kallioinen <juha.kallioinen@jollamobile.com> Date: Wed, 19 Jun 2013 12:12:52 +0000 Subject: [PATCH 18/18] Fix for more than one sb2install packages If more than one sb2install packages are given, make sure no to try to install packages multiple times. Patch from Carsten Munk. Signed-off-by: Juha Kallioinen <juha.kallioinen@jollamobile.com> --- init_buildsystem | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/init_buildsystem b/init_buildsystem index 85d97bf..b88c509 100755 --- a/init_buildsystem +++ b/init_buildsystem @@ -740,16 +740,19 @@ else # SB2 installs aren't part of the natural order, filter them out if test -n "$PACKAGES_TO_SB2INSTALL" ; then - for SB2PKG in $PACKAGES_TO_SB2INSTALL ; do - for PKG in $PACKAGES_TO_INSTALL ; do - if [ "x$PKG" != "x$SB2PKG" ]; then - NEWPACKAGES_TO_INSTALL="$NEWPACKAGES_TO_INSTALL $PKG" - fi - done - PACKAGES_TO_INSTALL="$NEWPACKAGES_TO_INSTALL" - done + NEW2PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL" + for SB2PKG in $PACKAGES_TO_SB2INSTALL ; do + NEWPACKAGES_TO_INSTALL="" + for PKG in $NEW2PACKAGES_TO_INSTALL ; do + if [ "x$PKG" != "x$SB2PKG" ]; then + NEWPACKAGES_TO_INSTALL="$NEWPACKAGES_TO_INSTALL $PKG" + fi + done + NEW2PACKAGES_TO_INSTALL="$NEWPACKAGES_TO_INSTALL" + done + PACKAGES_TO_INSTALL="$NEW2PACKAGES_TO_INSTALL" fi - + test -n "$PACKAGES_TO_CBPREINSTALL" && echo "cbpreinstall: $PACKAGES_TO_CBPREINSTALL" test -n "$PACKAGES_TO_CBINSTALL" && echo "cbinstall : $PACKAGES_TO_CBINSTALL" test -n "$PACKAGES_TO_SB2INSTALL" && echo "sb2install : $PACKAGES_TO_SB2INSTALL" -- 1.7.10.3