Lubuntu/calamares-settings-ubuntu
4
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-qt-code/+git/calamares-settings-ubuntu synced 2025-07-31 10:14:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

[pkgselect] Temporarily add Calamares and KDialog to the final install list for Lubuntu

Browse Source 
As a temporary measure until OEM is refactored in the 25.10 cycle, we need to
ensure that Calamares and its necessary dependencies are installed on the
target, iff this is a stacked squashfs *and* it is an OEM install. We're doing
this in pkgselect instead of pkgselectprocess because pkgselect already knows
about stacked squashfses, it's what provides the final "additional install
list" to be considered by checkpackage-backend, and this is a temporary fix
anyway (LP: #2104343).
This commit is contained in:
Simon Quigley 2025-04-12 21:34:02 -05:00
parent 197d24e295
commit 5a1835af47
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
common/modules/pkgselect/PackageSelectViewStep.cpp
View File

@ -324,6 +324,23 @@ void PackageSelectViewStep::onLeave()
presentSnapList.append(snapId); presentSnapList.append(snapId);
} }
// As a temporary measure until OEM is refactored in the 25.10 cycle,
// we need to ensure that Calamares and its necessary dependencies are
// installed on the target, iff this is a stacked squashfs.
// FIXME: remove in favor of more nuanced stacked squashfs
// functionality in 25.10
// Ref: https://discourse.ubuntu.com/t/implementation-of-ship-live-within-a-squashfs/57510
// LP: #2104343
if (isStackedSquashfs) {
QVector<QString> stage_two_packages = {"calamares", "kdialog"};
for (QString& package_name : stage_two_packages) {
QVariantMap package_details;
package_details.insert("id", package_name);
package_details.insert("snap", false);
selectedPackagesList.append(package_details);
}
}
globalData.insert("packages_to_install", selectedPackagesList); globalData.insert("packages_to_install", selectedPackagesList);
if (!isStackedSquashfs) { if (!isStackedSquashfs) {
QVariantList installerPackages = m_configurationMap.value("packages").toMap().value("installer_remove_packages").toList(); QVariantList installerPackages = m_configurationMap.value("packages").toMap().value("installer_remove_packages").toList();

7
debian/changelog vendored
View File

@ -6,6 +6,13 @@ calamares-settings-ubuntu (1:25.04.25) UNRELEASED; urgency=medium
this list, use FindGrp instead of FindPkg, and only add it to the list if this list, use FindGrp instead of FindPkg, and only add it to the list if
there is a valid candidate. Additionally, add these items to an unordered there is a valid candidate. Additionally, add these items to an unordered
set, to eliminate deduplication (LP: #2106773). set, to eliminate deduplication (LP: #2106773).
* [pkgselect] As a temporary measure until OEM is refactored in the 25.10
cycle, we need to ensure that Calamares and its necessary dependencies are
installed on the target, iff this is a stacked squashfs. We're doing this
in pkgselect instead of pkgselectprocess because pkgselect already knows
about stacked squashfses, it's what provides the final "additional install
list" to be considered by checkpackage-backend, and this is a temporary
fix anyway (LP: #2104343).
-- Simon Quigley <tsimonq2@ubuntu.com> Sat, 12 Apr 2025 00:23:39 -0500 -- Simon Quigley <tsimonq2@ubuntu.com> Sat, 12 Apr 2025 00:23:39 -0500