Merge branch 'meta-packages' into 'master'

ssuks: switch from patterns to meta-packages See merge request mer-core/ssu!51
sailfishos · Dec 2, 2020 · 71a4bcd · 71a4bcd
2 parents a3013d7 + 055c1be
commit 71a4bcd
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/ssuks/ssukickstarter.cpp b/ssuks/ssukickstarter.cpp
@@ -148,10 +148,11 @@ QStringList SsuKickstarter::packagesSection(const QString &name)
     QStringList result;
 
     if (name == "packages") {
-        // insert @vendor configuration device
-        QString configuration = QString("@%1 Configuration %2")
-                                .arg(repoOverride.value("brand"))
-                                .arg(deviceModel);
+        // insert patterns-sailfish-device-configuration-<device>
+        QString dashedDeviceModel = deviceModel;
+        dashedDeviceModel.replace(' ', '-');
+        QString configuration = QString("patterns-sailfish-device-configuration-%1")
+                                .arg(dashedDeviceModel);
         result.append(configuration);
 
         result.sort();