Maemo: Several Meego fixes.

- Deploy to sysroot via xrpm in case of RPM-based target.
- Set sensible default attributes in spec file.
- Add "/usr" to spec file as default. Should suffice in the common case.
- Adapt target removal message to fit the RPM case as well.
This commit is contained in:
Christian Kandeler
2011-02-01 14:05:28 +01:00
parent eeedd340a8
commit ad905869fe
3 changed files with 8 additions and 3 deletions

View File

@@ -613,7 +613,9 @@ void MaemoDeployStep::installToSysroot()
const Qt4BuildConfiguration * const bc
= static_cast<Qt4BuildConfiguration *>(buildConfiguration());
const QtVersion * const qtVersion = bc->qtVersion();
const QStringList args = QStringList() << QLatin1String("xdpkg")
const QString command = QLatin1String(
packagingStep()->debBasedMaemoTarget() ? "xdpkg" : "xrpm");
const QStringList args = QStringList() << command
<< QLatin1String("-i") << packagingStep()->packageFilePath();
MaemoGlobal::callMadAdmin(*m_sysrootInstaller, args, qtVersion, true);
if (!m_sysrootInstaller->waitForStarted()) {