Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package calamares for openSUSE:Factory checked in at 2026-08-04 21:30:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/calamares (Old) and /work/SRC/openSUSE:Factory/.calamares.new.16738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "calamares" Tue Aug 4 21:30:26 2026 rev:21 rq:1369085 version:3.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/calamares/calamares.changes 2025-03-21 20:22:42.979493958 +0100 +++ /work/SRC/openSUSE:Factory/.calamares.new.16738/calamares.changes 2026-08-04 21:30:37.756205628 +0200 @@ -1,0 +2,33 @@ +Sun Aug 2 09:08:53 UTC 2026 - Mindaugas Baranauskas <[email protected]> + +- Update calamares.keyring + +------------------------------------------------------------------- +Tue May 6 21:00:00 UTC 2026 - Don Clermont <[email protected]> + +- 3.4-bootloader.conf.patch: The efiBootloaderId is kept pinned to + "opensuse" so the EFI directory layout still matches what the + openSUSE shim expects when it is added back later. +- Add 3.4-partition.conf.patch to enable SWAP partition. +- 3.2.15-unpackfs.conf_Leap15.patch renamed to 3.4-unpackfs.conf_Leap15.patch + +------------------------------------------------------------------- +Tue Jan 13 16:16:31 UTC 2026 - Luan C. Adão <[email protected]> + +- Update to 3.4.0. +- Drop webview module. +- Use Qt6 instead of Qt5. +- Update and rename patch files: + * 3.2-bootloader.conf.patch renamed to 3.4-bootloader.conf.patch + * 3.2-networkcfg.patch renamed to 3.4-networkcfg.patch + * 3.2-packages.conf.patch renamed to 3.4-packages.conf.patch + * 3.2-removeuser.conf.patch renamed to 3.4-removeuser.conf.patch + * 3.2-settings.conf.patch renamed to 3.4-settings.conf.patch + * 3.2-show.qml.patch renamed to 3.4-show.qml.patch + * 3.2-welcome.conf.patch renamed to 3.4-welcome.conf.patch + * 3.2.15-configuring_autologin_in_sysconfig.patch renamed to + 3.4-configuring_autologin_in_sysconfig.patch +- Add 3.4-dracut.conf.patch not to use initramfs-freebsd.img name + for initram + +------------------------------------------------------------------- Old: ---- 3.2-bootloader.conf.patch 3.2-networkcfg.patch 3.2-packages.conf.patch 3.2-removeuser.conf.patch 3.2-settings.conf.patch 3.2-show.qml.patch 3.2-welcome.conf.patch 3.2.15-configuring_autologin_in_sysconfig.patch 3.2.15-unpackfs.conf_Leap15.patch calamares-3.2.62.tar.gz calamares-3.2.62.tar.gz.asc New: ---- 3.4-bootloader.conf.patch 3.4-configuring_autologin_in_sysconfig.patch 3.4-dracut.conf.patch 3.4-networkcfg.patch 3.4-packages.conf.patch 3.4-partition.conf.patch 3.4-removeuser.conf.patch 3.4-settings.conf.patch 3.4-show.qml.patch 3.4-unpackfs.conf_Leap15.patch 3.4-welcome.conf.patch calamares-3.4.0.tar.gz calamares-3.4.0.tar.gz.asc ----------(Old B)---------- Old:- Update and rename patch files: * 3.2-bootloader.conf.patch renamed to 3.4-bootloader.conf.patch * 3.2-networkcfg.patch renamed to 3.4-networkcfg.patch Old: * 3.2-bootloader.conf.patch renamed to 3.4-bootloader.conf.patch * 3.2-networkcfg.patch renamed to 3.4-networkcfg.patch * 3.2-packages.conf.patch renamed to 3.4-packages.conf.patch Old: * 3.2-networkcfg.patch renamed to 3.4-networkcfg.patch * 3.2-packages.conf.patch renamed to 3.4-packages.conf.patch * 3.2-removeuser.conf.patch renamed to 3.4-removeuser.conf.patch Old: * 3.2-packages.conf.patch renamed to 3.4-packages.conf.patch * 3.2-removeuser.conf.patch renamed to 3.4-removeuser.conf.patch * 3.2-settings.conf.patch renamed to 3.4-settings.conf.patch Old: * 3.2-removeuser.conf.patch renamed to 3.4-removeuser.conf.patch * 3.2-settings.conf.patch renamed to 3.4-settings.conf.patch * 3.2-show.qml.patch renamed to 3.4-show.qml.patch Old: * 3.2-settings.conf.patch renamed to 3.4-settings.conf.patch * 3.2-show.qml.patch renamed to 3.4-show.qml.patch * 3.2-welcome.conf.patch renamed to 3.4-welcome.conf.patch Old: * 3.2-show.qml.patch renamed to 3.4-show.qml.patch * 3.2-welcome.conf.patch renamed to 3.4-welcome.conf.patch * 3.2.15-configuring_autologin_in_sysconfig.patch renamed to Old: * 3.2-welcome.conf.patch renamed to 3.4-welcome.conf.patch * 3.2.15-configuring_autologin_in_sysconfig.patch renamed to 3.4-configuring_autologin_in_sysconfig.patch Old:- Add 3.4-partition.conf.patch to enable SWAP partition. - 3.2.15-unpackfs.conf_Leap15.patch renamed to 3.4-unpackfs.conf_Leap15.patch ----------(Old E)---------- ----------(New B)---------- New: - 3.4-bootloader.conf.patch: The efiBootloaderId is kept pinned to "opensuse" so the EFI directory layout still matches what the New: * 3.2.15-configuring_autologin_in_sysconfig.patch renamed to 3.4-configuring_autologin_in_sysconfig.patch - Add 3.4-dracut.conf.patch not to use initramfs-freebsd.img name New: 3.4-configuring_autologin_in_sysconfig.patch - Add 3.4-dracut.conf.patch not to use initramfs-freebsd.img name for initram New: * 3.2-bootloader.conf.patch renamed to 3.4-bootloader.conf.patch * 3.2-networkcfg.patch renamed to 3.4-networkcfg.patch * 3.2-packages.conf.patch renamed to 3.4-packages.conf.patch New: * 3.2-networkcfg.patch renamed to 3.4-networkcfg.patch * 3.2-packages.conf.patch renamed to 3.4-packages.conf.patch * 3.2-removeuser.conf.patch renamed to 3.4-removeuser.conf.patch New: openSUSE shim expects when it is added back later. - Add 3.4-partition.conf.patch to enable SWAP partition. - 3.2.15-unpackfs.conf_Leap15.patch renamed to 3.4-unpackfs.conf_Leap15.patch New: * 3.2-packages.conf.patch renamed to 3.4-packages.conf.patch * 3.2-removeuser.conf.patch renamed to 3.4-removeuser.conf.patch * 3.2-settings.conf.patch renamed to 3.4-settings.conf.patch New: * 3.2-removeuser.conf.patch renamed to 3.4-removeuser.conf.patch * 3.2-settings.conf.patch renamed to 3.4-settings.conf.patch * 3.2-show.qml.patch renamed to 3.4-show.qml.patch New: * 3.2-settings.conf.patch renamed to 3.4-settings.conf.patch * 3.2-show.qml.patch renamed to 3.4-show.qml.patch * 3.2-welcome.conf.patch renamed to 3.4-welcome.conf.patch New:- Add 3.4-partition.conf.patch to enable SWAP partition. - 3.2.15-unpackfs.conf_Leap15.patch renamed to 3.4-unpackfs.conf_Leap15.patch New: * 3.2-show.qml.patch renamed to 3.4-show.qml.patch * 3.2-welcome.conf.patch renamed to 3.4-welcome.conf.patch * 3.2.15-configuring_autologin_in_sysconfig.patch renamed to ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ calamares.spec ++++++ --- /var/tmp/diff_new_pack.4xJGp6/_old 2026-08-04 21:30:39.768277833 +0200 +++ /var/tmp/diff_new_pack.4xJGp6/_new 2026-08-04 21:30:39.776278120 +0200 @@ -1,7 +1,7 @@ # # spec file for package calamares # -# Copyright (c) 2025 SUSE LLC +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,14 +21,15 @@ %define _sover 3 Name: calamares -Version: 3.2.62 +Version: 3.4.0 Release: 0 Summary: Installer from a live CD/DVD/USB to disk License: GPL-3.0-or-later Group: System/Management URL: https://calamares.io/ -Source0: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz -Source1: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz.asc +Source0: https://codeberg.org/Calamares/%{name}/releases/download/v%{version}/calamares-%{version}.tar.gz +Source1: https://codeberg.org/Calamares/%{name}/releases/download/v%{version}/calamares-%{version}.tar.gz.asc +# Keyring from https://codeberg.org/adridg.gpg Source2: calamares.keyring # new generic branding.desc with explanations in comments Source3: branding.desc @@ -36,43 +37,75 @@ # .desktop file customizations to use kdesu from kde-cli-tools5 instead of Polkit pkexec Patch0: %{name}-desktop-file.patch # adjust some default settings (default shipped .conf files) for openSUSE and openSUSE based appliances -Patch1: 3.2-packages.conf.patch -Patch2: 3.2-bootloader.conf.patch -Patch3: 3.2-show.qml.patch -Patch4: 3.2-settings.conf.patch -Patch5: 3.2.15-unpackfs.conf_Leap15.patch -Patch6: 3.2.15-configuring_autologin_in_sysconfig.patch -Patch7: 3.2-removeuser.conf.patch -Patch8: 3.2-welcome.conf.patch -Patch9: 3.2-networkcfg.patch +Patch1: 3.4-packages.conf.patch +Patch2: 3.4-bootloader.conf.patch +Patch3: 3.4-show.qml.patch +Patch4: 3.4-settings.conf.patch +Patch5: 3.4-unpackfs.conf_Leap15.patch +Patch6: 3.4-configuring_autologin_in_sysconfig.patch +Patch7: 3.4-removeuser.conf.patch +Patch8: 3.4-welcome.conf.patch +Patch9: 3.4-networkcfg.patch +Patch10: 3.4-dracut.conf.patch +Patch11: 3.4-partition.conf.patch Provides: %{name}-libs%{_sover} = %{version} Obsoletes: %{name}-libs%{_sover} < %{version} -BuildRequires: cmake >= 3.5 + +# Compilation +BuildRequires: cmake +BuildRequires: gcc-c++ BuildRequires: desktop-file-utils -BuildRequires: extra-cmake-modules >= 0.0.13 +BuildRequires: extra-cmake-modules BuildRequires: gettext +BuildRequires: qt6-macros +BuildRequires: kf6-extra-cmake-modules + +# QT6 +BuildRequires: cmake(Qt6Concurrent) +BuildRequires: cmake(Qt6Core) +BuildRequires: cmake(Qt6DBus) +BuildRequires: cmake(Qt6Gui) +BuildRequires: cmake(Qt6LinguistTools) +BuildRequires: cmake(Qt6Network) +BuildRequires: cmake(Qt6Svg) +BuildRequires: cmake(Qt6Widgets) +BuildRequires: cmake(Qt6Quick) +BuildRequires: cmake(Qt6QuickWidgets) +BuildRequires: cmake(PolkitQt6-1) + +# KF6 +BuildRequires: cmake(KF6CoreAddons) +BuildRequires: cmake(KF6Config) +BuildRequires: cmake(KF6Crash) +BuildRequires: cmake(KF6DBusAddons) +BuildRequires: cmake(KF6I18n) +BuildRequires: cmake(KF6Package) +BuildRequires: cmake(KF6Parts) +BuildRequires: cmake(KF6Service) +BuildRequires: cmake(KF6WidgetsAddons) + +# Plasma +BuildRequires: cmake(Plasma) + +BuildRequires: cmake(KPMcore) + +# Python +BuildRequires: python3-devel >= 3.3 +BuildRequires: libboost_python3-devel +BuildRequires: boost-devel +BuildRequires: python3-PyYAML +BuildRequires: python3-jsonschema + +BuildRequires: cmake(AppStreamQt) +BuildRequires: libpwquality-devel +BuildRequires: libxcrypt-devel + # Calamares is only supported where live images (and GRUB) are. (rh#1171380) BuildRequires: grub2 BuildRequires: hicolor-icon-theme -BuildRequires: kconfig-devel -BuildRequires: kcoreaddons-devel -BuildRequires: ki18n-devel -BuildRequires: kiconthemes-devel -BuildRequires: kio-devel -BuildRequires: kparts-devel -BuildRequires: kpmcore-devel >= 3.3 -BuildRequires: kservice-devel BuildRequires: libatasmart-devel -BuildRequires: libboost_python3-devel -BuildRequires: libpolkit-qt5-1-devel -BuildRequires: libqt5-qtbase-devel >= 5.7 -BuildRequires: libqt5-qtdeclarative-devel >= 5.7 -BuildRequires: libqt5-qtsvg-devel >= 5.7 -BuildRequires: libqt5-qttools-devel >= 5.7 -BuildRequires: libqt5-qtwebengine-devel >= 5.7 BuildRequires: parted-devel BuildRequires: pkg-config -BuildRequires: python3-devel >= 3.3 BuildRequires: solid-devel BuildRequires: update-desktop-files BuildRequires: yaml-cpp-devel >= 0.5.1 @@ -87,7 +120,7 @@ Requires: gawk Requires: gptfdisk Requires: grub2 -Requires: kde-cli-tools5 +Requires: kde-cli-tools6 Requires: kpmcore >= 3.3 Requires: ntfsprogs Requires: os-prober @@ -105,6 +138,9 @@ Requires: xdg-utils Requires: xkbutils Requires: zypper +Requires: dosfstools +Requires: shadow +Requires: efibootmgr Recommends: btrfsprogs Recommends: hfsutils Recommends: jfsutils @@ -121,14 +157,6 @@ from a live CD/DVD/USB environment to a hard disk. It includes a graphical installation program based on Qt 5. Calamares can replace YaST2 Live Installer. -%package webview -Summary: Calamares webview module -Group: System/Management -Requires: %{name}%{?_isa} = %{version} - -%description webview -Optional webview module for the Calamares installer. - %package branding-upstream Summary: Branding for %{name} # This theme is nor pure upstream, nor specific to openSUSE, @@ -160,11 +188,22 @@ find . -wholename "./src/modules/*/main.py" -exec sed -re "1s/^#\!\/usr\/bin\/env python3/#\!\/usr\/bin\/python3/" -i {} \; %build -%cmake_kf5 -d build -- -DINSTALL_CONFIG=ON -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" -DSKIP_MODULES="plasmalnf" -DBoost_NO_BOOST_CMAKE=ON -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -make %{?_smp_mflags} +%cmake_kf6 -DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" \ + -DINSTALL_CONFIG=ON \ + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DCMAKE_INSTALL_LIBDIR=%{_libdir} \ + -DCMAKE_C_COMPILER_WORKS=1 \ + -DCMAKE_CXX_COMPILER_WORKS=1 \ + -DSKIP_MODULES="plasmalnf" \ + -DWITH_QT6:BOOL=ON \ + -DBUILD_TESTING:BOOL=OFF \ + %{nil} + +# make %{?_smp_mflags} +cmake --build build %install -%kf5_makeinstall -C build +DESTDIR=%{buildroot} cmake --install build # if we don't want polkit (and you want use kdesu from kde-cli-tools5 instead) %if 0%{?suse_version} == 1500 rm -fr %{buildroot}%{_datadir}/polkit-1 @@ -182,7 +221,6 @@ rm -fr %{buildroot}%{_libdir}/cmake/Calamares/ # fix exec bits chmod +x %{buildroot}%{_libdir}/%{name}/modules/unpackfs/runtests.sh -%suse_update_desktop_file -r %{name} Qt System PackageManager # localization %find_lang %{name}-python @@ -213,28 +251,21 @@ %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg # if we want polkit (you can use kdesu from kde-cli-tools5 instead) %if 0%{?suse_version} > 1500 -%{_datadir}/polkit-1/actions/com.github.%{name}.%{name}.policy +%{_datadir}/polkit-1/actions/io.%{name}.%{name}.policy %endif %{_libdir}/lib%{name}.so.* %{_libdir}/lib%{name}ui.so.* %dir %{_libdir}/%{name}/ %{_libdir}/%{name}/lib%{name}.so %{_libdir}/%{name}/modules/ -%exclude %{_libdir}/%{name}/modules/webview/ %files lang -f %{name}-python.lang #%%files -f %%{name}-dummypythonqt.lang -%files webview -%license LICENSES/GPL-3.0-or-later.txt -%{_datadir}/%{name}/modules/webview.conf -%{_libdir}/%{name}/modules/webview/ - %files branding-upstream %license LICENSES/GPL-3.0-or-later.txt %{_datadir}/%{name}/settings.conf %dir %{_datadir}/%{name}/branding/ %{_datadir}/%{name}/branding/default/ %{_datadir}/%{name}/modules/ -%exclude %{_datadir}/%{name}/modules/webview.conf ++++++ 3.2-bootloader.conf.patch -> 3.4-bootloader.conf.patch ++++++ --- /work/SRC/openSUSE:Factory/calamares/3.2-bootloader.conf.patch 2023-07-13 17:18:53.373238030 +0200 +++ /work/SRC/openSUSE:Factory/.calamares.new.16738/3.4-bootloader.conf.patch 2026-08-04 21:30:30.007937049 +0200 @@ -4,7 +4,7 @@ diff --git a/src/modules/bootloader/bootloader.conf b/src/modules/bootloader/bootloader.conf --- a/src/modules/bootloader/bootloader.conf +++ b/src/modules/bootloader/bootloader.conf -@@ -33,10 +33,10 @@ timeout: "10" +@@ -41,11 +41,11 @@ # GRUB functionality (notably grub-probe) to work. As needed, you may use # complete paths like `/usr/bin/efibootmgr` for the executables. # @@ -12,10 +12,21 @@ -grubMkconfig: "grub-mkconfig" -grubCfg: "/boot/grub/grub.cfg" -grubProbe: "grub-probe" -+grubInstall: "grub2-install" -+grubMkconfig: "grub2-mkconfig" +-efiBootMgr: "efibootmgr" ++grubInstall: "/usr/sbin/grub2-install" ++grubMkconfig: "/usr/sbin/grub2-mkconfig" +grubCfg: "/boot/grub2/grub.cfg" -+grubProbe: "grub2-probe" - efiBootMgr: "efibootmgr" ++grubProbe: "/usr/sbin/grub2-probe" ++efiBootMgr: "/usr/sbin/efibootmgr" # Optionally set the bootloader ID to use for EFI. This is passed to + # grub-install --bootloader-id. +@@ -72,7 +72,7 @@ + # packages may need to set this to "debian" because that is + # hard-coded in `grubx64.efi`. + # +-# efiBootloaderId: "dirname" ++efiBootloaderId: "opensuse" + + # Optionally install a copy of the GRUB EFI bootloader as the EFI + # fallback loader (either bootia32.efi or bootx64.efi depending on ++++++ 3.2.15-configuring_autologin_in_sysconfig.patch -> 3.4-configuring_autologin_in_sysconfig.patch ++++++ --- /work/SRC/openSUSE:Factory/calamares/3.2.15-configuring_autologin_in_sysconfig.patch 2023-07-13 17:18:53.621239494 +0200 +++ /work/SRC/openSUSE:Factory/.calamares.new.16738/3.4-configuring_autologin_in_sysconfig.patch 2026-08-04 21:30:30.447952316 +0200 @@ -6,7 +6,7 @@ --- a/src/modules/displaymanager/displaymanager.conf +++ b/src/modules/displaymanager/displaymanager.conf -@@ -16,14 +16,7 @@ +@@ -16,13 +16,7 @@ # is attempted. You can also list "sysconfig" in this list instead. # displaymanagers: @@ -16,15 +16,18 @@ - - gdm - - mdm - - lxdm -- - kdm - - greetd + - sysconfig # Enable the following settings to force a desktop environment # in your displaymanager configuration file. This will attempt -@@ -59,4 +52,4 @@ basicSetup: false +@@ -58,7 +52,7 @@ # The preferred way to pick sysconfig is to just list it in the # *displaymanagers* list (as the only one). # -sysconfigSetup: false +sysconfigSetup: true + + # Some DMs have specific settings. These can be customized here. + # + \ No newline at end of file ++++++ 3.4-dracut.conf.patch ++++++ --- a/src/modules/dracut/dracut.conf +++ b/src/modules/dracut/dracut.conf @@ -7,7 +7,7 @@ # If you want to specify another filename for the resulting image, # set a custom name, including the path # -initramfsName: /boot/initramfs-freebsd.img +# initramfsName: /boot/initramfs-freebsd.img # Optional: define a list of strings to be passed as arguments to Dracut # By default, -f is always included ++++++ 3.2-networkcfg.patch -> 3.4-networkcfg.patch ++++++ --- /work/SRC/openSUSE:Factory/calamares/3.2-networkcfg.patch 2023-07-13 17:18:53.433238385 +0200 +++ /work/SRC/openSUSE:Factory/.calamares.new.16738/3.4-networkcfg.patch 2026-08-04 21:30:31.459987423 +0200 @@ -6,11 +6,11 @@ but in openSUSE it should be to /var/run/netconfig/resolv.conf and created automatically anyway. ---- a/src/modules/networkcfg/main.py 2020-12-07 18:09:14.000000000 +0200 -+++ b/src/modules/networkcfg/main.py 2021-01-31 19:47:20.012191085 +0200 -@@ -132,20 +132,20 @@ def run(): - pass - +--- a/src/modules/networkcfg/main.py ++++ b/src/modules/networkcfg/main.py +@@ -168,20 +168,20 @@ + shutil.copy(source_cfg, target_cfg) + # We need to overwrite the default resolv.conf in the chroot. - source_resolv, target_resolv = path_pair(root_mount_point, "etc/resolv.conf") - if source_resolv != target_resolv and os.path.exists(source_resolv): @@ -20,28 +20,26 @@ - libcalamares.utils.debug( - "Couldn't remove {}: {}".format(target_resolv, err) - ) -- ++ # source_resolv, target_resolv = path_pair(root_mount_point, "etc/resolv.conf") ++ # if source_resolv != target_resolv and os.path.exists(source_resolv): ++ # try: ++ # os.remove(target_resolv) ++ # except Exception as err: ++ # libcalamares.utils.debug( ++ # "Couldn't remove {}: {}".format(target_resolv, err) ++ # ) + - try: - shutil.copy(source_resolv, target_resolv, follow_symlinks=False) - except Exception as err: - libcalamares.utils.debug( - "Can't copy resolv.conf from {}: {}".format(source_resolv, err) - ) -+# source_resolv, target_resolv = path_pair(root_mount_point, "etc/resolv.conf") -+# if source_resolv != target_resolv and os.path.exists(source_resolv): -+# try: -+# os.remove(target_resolv) -+# except Exception as err: -+# libcalamares.utils.debug( -+# "Couldn't remove {}: {}".format(target_resolv, err) -+# ) -+# -+# try: -+# shutil.copy(source_resolv, target_resolv, follow_symlinks=False) -+# except Exception as err: -+# libcalamares.utils.debug( -+# "Can't copy resolv.conf from {}: {}".format(source_resolv, err) -+# ) - ++ # try: ++ # shutil.copy(source_resolv, target_resolv, follow_symlinks=False) ++ # except Exception as err: ++ # libcalamares.utils.debug( ++ # "Can't copy resolv.conf from {}: {}".format(source_resolv, err) ++ # ) + return None - ++++++ 3.2-packages.conf.patch -> 3.4-packages.conf.patch ++++++ --- /work/SRC/openSUSE:Factory/calamares/3.2-packages.conf.patch 2023-07-13 17:18:53.473238621 +0200 +++ /work/SRC/openSUSE:Factory/.calamares.new.16738/3.4-packages.conf.patch 2026-08-04 21:30:32.136010825 +0200 @@ -2,10 +2,9 @@ Updating databases during installation may cause problems, thus allow to install system as is. Calamares packages is no longer needed after installation. -diff --git a/src/modules/packages/packages.conf b/src/modules/packages/packages.conf --- a/src/modules/packages/packages.conf +++ b/src/modules/packages/packages.conf -@@ -35,7 +35,7 @@ +@@ -36,7 +36,7 @@ # Not actually a package manager, but suitable for testing: # - dummy - Dummy manager, only logs # @@ -14,7 +13,7 @@ # # Often package installation needs an internet connection. -@@ -59,7 +59,7 @@ backend: dummy +@@ -60,7 +60,7 @@ # Therefore set also "update_system" to 'true'. # skip_if_no_internet: false @@ -23,7 +22,7 @@ update_system: false # pacman specific options -@@ -202,12 +202,6 @@ pacman: +@@ -203,12 +203,6 @@ # of packages, this can lead to a considerable time savings. # operations: ++++++ 3.4-partition.conf.patch ++++++ --- a/src/modules/partition/partition.conf +++ b/src/modules/partition/partition.conf @@ -154,7 +154,7 @@ # # The default is "none" (no swap) if that is one of the enabled options, otherwise # one of the items from the options. -initialSwapChoice: none +initialSwapChoice: small # armInstall # ++++++ 3.2-removeuser.conf.patch -> 3.4-removeuser.conf.patch ++++++ --- /work/SRC/openSUSE:Factory/calamares/3.2-removeuser.conf.patch 2020-07-06 16:27:05.690757811 +0200 +++ /work/SRC/openSUSE:Factory/.calamares.new.16738/3.4-removeuser.conf.patch 2026-08-04 21:30:33.300051119 +0200 @@ -1,13 +1,10 @@ Usually "linux" is default user in LiveCD/LiveDVD/LiveUSB of openSUSE and openSUSE based appliances. -By default this module is disabled, because Calamares crash -if indicated used does not exist. See: -https://github.com/calamares/calamares/issues/577 diff -ur a/src/modules/removeuser/removeuser.conf b/src/modules/removeuser/removeuser.conf --- a/src/modules/removeuser/removeuser.conf +++ b/src/modules/removeuser/removeuser.conf -@@ -7,4 +7,4 @@ +@@ -10,4 +10,4 @@ # continues as normal. --- # Username in the target system to be removed. ++++++ 3.2-settings.conf.patch -> 3.4-settings.conf.patch ++++++ --- /work/SRC/openSUSE:Factory/calamares/3.2-settings.conf.patch 2023-07-13 17:18:53.557239116 +0200 +++ /work/SRC/openSUSE:Factory/.calamares.new.16738/3.4-settings.conf.patch 2026-08-04 21:30:33.716065520 +0200 @@ -4,21 +4,20 @@ Removing default LiveCD/LiveUSB user is not mandatory, but "linux" user is no longer needed after installation. Note, that if user not exist, then Camamares crash! -See https://github.com/calamares/calamares/issues/577 Thus here we justion mention this option, but not enabling. diff --git a/settings.conf b/settings.conf --- a/settings.conf +++ b/settings.conf -@@ -139,17 +139,19 @@ sequence: - # - luksopenswaphookcfg - # - dracutlukscfg +@@ -141,17 +141,19 @@ + - fstab # - plymouthcfg + # - zfshostid - - initcpiocfg - - initcpio +# - initcpiocfg +# - initcpio -+# - removeuser ++# - removeuser - users - displaymanager - networkcfg @@ -35,4 +34,4 @@ + - packages - umount - show: - # - webview@owncloud + - finished ++++++ 3.2-show.qml.patch -> 3.4-show.qml.patch ++++++ --- /work/SRC/openSUSE:Factory/calamares/3.2-show.qml.patch 2023-07-13 17:18:53.577239234 +0200 +++ /work/SRC/openSUSE:Factory/.calamares.new.16738/3.4-show.qml.patch 2026-08-04 21:30:34.176081444 +0200 @@ -3,49 +3,46 @@ diff -ur a/src/branding/default/show.qml b/src/branding/default/show.qml --- a/src/branding/default/show.qml +++ b/src/branding/default/show.qml -@@ -19,7 +19,7 @@ Presentation - console.log("QML Component (default slideshow) Next slide"); +@@ -20,6 +20,7 @@ presentation.goToNextSlide(); } -- + +/* Uncomment to enable multiple slides Timer { id: advanceTimer interval: 1000 -@@ -27,7 +27,7 @@ Presentation - repeat: true +@@ -28,6 +29,7 @@ onTriggered: nextSlide() } -- + +*/ Slide { Image { -@@ -37,6 +37,7 @@ Presentation +@@ -37,6 +39,7 @@ fillMode: Image.PreserveAspectFit anchors.centerIn: parent } -+/* Uncomment to show some text ++ /* Uncomment to show some text Text { anchors.horizontalCenter: background.horizontalCenter anchors.top: background.bottom -@@ -49,8 +50,9 @@ Presentation +@@ -49,8 +52,10 @@ width: presentation.width horizontalAlignment: Text.Center } -+*/ ++ */ } -- + +/* Uncomment to enable multiple slides Slide { centeredText: qsTr("This is a second Slide element.") } -@@ -58,7 +60,7 @@ Presentation +@@ -58,6 +63,7 @@ Slide { centeredText: qsTr("This is a third Slide element.") } -- +*/ + // When this slideshow is loaded as a V1 slideshow, only // activatedInCalamares is set, which starts the timer (see above). - // ++++++ 3.2.15-unpackfs.conf_Leap15.patch -> 3.4-unpackfs.conf_Leap15.patch ++++++ --- /work/SRC/openSUSE:Factory/calamares/3.2.15-unpackfs.conf_Leap15.patch 2023-07-13 17:18:53.649239659 +0200 +++ /work/SRC/openSUSE:Factory/.calamares.new.16738/3.4-unpackfs.conf_Leap15.patch 2026-08-04 21:30:34.600096122 +0200 @@ -9,9 +9,9 @@ diff -ruN a/src/modules/unpackfs/unpackfs.conf b/src/modules/unpackfs/unpackfs.conf --- a/src/modules/unpackfs/unpackfs.conf +++ b/src/modules/unpackfs/unpackfs.conf -@@ -88,13 +88,15 @@ - # for its destination name, as in the example below. - +@@ -116,13 +116,15 @@ + # optional: true + unpack: - - source: ../CHANGES - sourcefs: file ++++++ 3.2-welcome.conf.patch -> 3.4-welcome.conf.patch ++++++ --- /work/SRC/openSUSE:Factory/calamares/3.2-welcome.conf.patch 2023-07-13 17:18:53.589239305 +0200 +++ /work/SRC/openSUSE:Factory/.calamares.new.16738/3.4-welcome.conf.patch 2026-08-04 21:30:35.192116616 +0200 @@ -20,11 +20,11 @@ # Requirements checking. These are general, generic, things # that are checked. They may not match with the actual requirements -@@ -68,7 +68,6 @@ requirements: +@@ -83,7 +83,6 @@ - storage - ram - power - - internet - root - screen - # List conditions that **must** be satisfied (from the list + - "false" ++++++ calamares-3.2.62.tar.gz -> calamares-3.4.0.tar.gz ++++++ ++++ 604225 lines of diff (skipped) ++++++ calamares.keyring ++++++ ++++ 1638 lines (skipped) ++++ between calamares.keyring ++++ and /work/SRC/openSUSE:Factory/.calamares.new.16738/calamares.keyring
