From 4efcc46d100c294eb05bb7ddb4f2d63404b2a0da Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Thu, 7 Apr 2011 16:20:46 +0200
Subject: [PATCH] Maemo: Fix tarball installation.

Busybox tar does not have --absolute-names.
---
 .../qt4projectmanager/qt-maemo/maemopackageinstaller.cpp    | 6 ++++--
 .../qt4projectmanager/qt-maemo/maemopackageinstaller.h      | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackageinstaller.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemopackageinstaller.cpp
index 7e2793af6e4..1a3d8214ae5 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopackageinstaller.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemopackageinstaller.cpp
@@ -67,7 +67,9 @@ void AbstractMaemoPackageInstaller::installPackage(const SshConnection::Ptr &con
         SLOT(handleInstallationFinished(int)));
 
     const QString space = QLatin1String(" ");
-    QString cmdLine = MaemoGlobal::remoteSudo(m_installer->connection()->connectionParameters().userName)
+    QString cmdLine = QLatin1String("cd ") + workingDirectory()
+        + QLatin1String(" && ")
+        + MaemoGlobal::remoteSudo(m_installer->connection()->connectionParameters().userName)
         + space + installCommand()
         + space + installCommandArguments().join(space) + space
         + packageFilePath;
@@ -205,7 +207,7 @@ QString MaemoTarPackageInstaller::installCommand() const
 
 QStringList MaemoTarPackageInstaller::installCommandArguments() const
 {
-    return QStringList() << QLatin1String("--absolute-names -xvf");
+    return QStringList() << QLatin1String("xvf");
 }
 
 } // namespace Internal
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackageinstaller.h b/src/plugins/qt4projectmanager/qt-maemo/maemopackageinstaller.h
index c587ba20c42..2b61f356d31 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopackageinstaller.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemopackageinstaller.h
@@ -73,6 +73,7 @@ private slots:
 
 private:
     virtual void prepareInstallation() {}
+    virtual QString workingDirectory() const { return QLatin1String("/tmp"); }
     virtual QString installCommand() const=0;
     virtual QStringList installCommandArguments() const=0;
     virtual QString errorString() const { return QString(); }
@@ -122,6 +123,7 @@ public:
 private:
     virtual QString installCommand() const;
     virtual QStringList installCommandArguments() const;
+    virtual QString workingDirectory() const { return QLatin1String("/"); }
 };