From 023120546d526f2e04617fc331e5338a063ce80d Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Nov 15 2014 03:58:44 +0000 Subject: New snapshot (20141115git6b2ccfb442def). * Sat Nov 15 2014 Kevin Kofler - 0-0.13.20141115git6b2ccfb442def - New snapshot, adds retranslation support to more modules, fixes writing /etc/hosts, writes /etc/locale.conf (always LANG=en_US.UTF-8 for now) - Drop grub2-tools (calamares#123) patch, names made configurable upstream - Update default-settings patch to set the grub2 names and handle new modules - Drop workaround recreating calamares/libcalamares.so symlink, fixed upstream - Move desktop-file-validate call to %%check --- diff --git a/.gitignore b/.gitignore index d95ef8a..5315206 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ /calamares-faa77d7f5e65620212b6abcba9bc71e55bb78f4e.tar.gz /calamares-partitionmanager-3f1ace00592088a920f731acb1e42417f71f5e62.tar.gz +/calamares-7478c1266b47fde439c2882d835dc56f513ad64e.tar.gz +/calamares-6b2ccfb442defc1ffeb9359edd892aae5335b838.tar.gz diff --git a/calamares-default-settings.patch b/calamares-default-settings.patch index b8c1fd8..44226fe 100644 --- a/calamares-default-settings.patch +++ b/calamares-default-settings.patch @@ -1,6 +1,6 @@ -diff -ur calamares-8a623cc1181e94b9bf4f1511061ef817e4ccc5df/settings.conf calamares-default-settings/settings.conf ---- calamares-8a623cc1181e94b9bf4f1511061ef817e4ccc5df/settings.conf 2014-10-17 11:52:29.000000000 +0200 -+++ calamares-default-settings/settings.conf 2014-10-20 03:36:22.000000000 +0200 +diff -ur calamares-6b2ccfb442defc1ffeb9359edd892aae5335b838/settings.conf calamares-default-settings/settings.conf +--- calamares-6b2ccfb442defc1ffeb9359edd892aae5335b838/settings.conf 2014-11-15 04:44:09.000000000 +0100 ++++ calamares-default-settings/settings.conf 2014-11-15 04:36:58.000000000 +0100 @@ -4,7 +4,7 @@ # Modules can be job modules (with different interfaces) and QtWidgets view modules. # They could all be placed in a number of different paths. @@ -10,29 +10,28 @@ diff -ur calamares-8a623cc1181e94b9bf4f1511061ef817e4ccc5df/settings.conf calama # We define the module names in the order they should show up (QtWidget view modules, # with one or more pages) OR be executed if enqueued (all other modules). -@@ -29,17 +29,15 @@ - # allowed, their names should be added here as placeholders to specify the order in - # which view module jobs should be enqueued. Job modules are also allowed. - install: --#- dummyprocess --#- dummypython - - partition - - mount - - unpackfs - - fstab +@@ -38,14 +38,14 @@ - locale - keyboard + - localecfg -- initcpiocfg -- initcpio -+- dracut ++#- initcpiocfg ++#- initcpio - users +-#- displaymanager +- displaymanager - networkcfg - hwclock - services -diff -ur calamares-8a623cc1181e94b9bf4f1511061ef817e4ccc5df/src/modules/displaymanager/displaymanager.conf calamares-default-settings/src/modules/displaymanager/displaymanager.conf ---- calamares-8a623cc1181e94b9bf4f1511061ef817e4ccc5df/src/modules/displaymanager/displaymanager.conf 2014-10-17 11:52:29.000000000 +0200 -+++ calamares-default-settings/src/modules/displaymanager/displaymanager.conf 2014-10-20 03:29:04.000000000 +0200 +-#- dracut ++- dracut + #- initramfs + - grubcfg + - grub +diff -ur calamares-6b2ccfb442defc1ffeb9359edd892aae5335b838/src/modules/displaymanager/displaymanager.conf calamares-default-settings/src/modules/displaymanager/displaymanager.conf +--- calamares-6b2ccfb442defc1ffeb9359edd892aae5335b838/src/modules/displaymanager/displaymanager.conf 2014-11-15 04:44:09.000000000 +0100 ++++ calamares-default-settings/src/modules/displaymanager/displaymanager.conf 2014-11-15 04:48:36.000000000 +0100 @@ -3,10 +3,4 @@ #It also sets up autologin, if the feature is enabled in globalstorage. #The displaymanagers list can also be set in globalstorage, and in that case it overrides anything set up here. @@ -44,9 +43,22 @@ diff -ur calamares-8a623cc1181e94b9bf4f1511061ef817e4ccc5df/src/modules/displaym - - mdm - - lxdm - - kdm -diff -ur calamares-8a623cc1181e94b9bf4f1511061ef817e4ccc5df/src/modules/locale/locale.conf calamares-default-settings/src/modules/locale/locale.conf ---- calamares-8a623cc1181e94b9bf4f1511061ef817e4ccc5df/src/modules/locale/locale.conf 2014-10-17 11:52:29.000000000 +0200 -+++ calamares-default-settings/src/modules/locale/locale.conf 2014-10-20 03:18:15.000000000 +0200 +diff -ur calamares-6b2ccfb442defc1ffeb9359edd892aae5335b838/src/modules/grub/grub.conf calamares-default-settings/src/modules/grub/grub.conf +--- calamares-6b2ccfb442defc1ffeb9359edd892aae5335b838/src/modules/grub/grub.conf 2014-11-15 04:44:09.000000000 +0100 ++++ calamares-default-settings/src/modules/grub/grub.conf 2014-11-15 04:48:36.000000000 +0100 +@@ -1,6 +1,6 @@ + --- + # GRUB 2 binary names and boot directory + # Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names. +-grubInstall: "grub-install" +-grubMkconfig: "grub-mkconfig" +-grubCfg: "/boot/grub/grub.cfg" ++grubInstall: "grub2-install" ++grubMkconfig: "grub2-mkconfig" ++grubCfg: "/boot/grub2/grub.cfg" +diff -ur calamares-6b2ccfb442defc1ffeb9359edd892aae5335b838/src/modules/locale/locale.conf calamares-default-settings/src/modules/locale/locale.conf +--- calamares-6b2ccfb442defc1ffeb9359edd892aae5335b838/src/modules/locale/locale.conf 2014-11-15 04:44:09.000000000 +0100 ++++ calamares-default-settings/src/modules/locale/locale.conf 2014-11-15 04:48:36.000000000 +0100 @@ -1,3 +1,4 @@ --- -region: "Europe" @@ -54,9 +66,9 @@ diff -ur calamares-8a623cc1181e94b9bf4f1511061ef817e4ccc5df/src/modules/locale/l +# default to UTC +region: "Atlantic" +zone: "Reykjavik" -diff -ur calamares-8a623cc1181e94b9bf4f1511061ef817e4ccc5df/src/modules/unpackfs/unpackfs.conf calamares-default-settings/src/modules/unpackfs/unpackfs.conf ---- calamares-8a623cc1181e94b9bf4f1511061ef817e4ccc5df/src/modules/unpackfs/unpackfs.conf 2014-10-17 11:52:29.000000000 +0200 -+++ calamares-default-settings/src/modules/unpackfs/unpackfs.conf 2014-10-20 04:59:58.000000000 +0200 +diff -ur calamares-6b2ccfb442defc1ffeb9359edd892aae5335b838/src/modules/unpackfs/unpackfs.conf calamares-default-settings/src/modules/unpackfs/unpackfs.conf +--- calamares-6b2ccfb442defc1ffeb9359edd892aae5335b838/src/modules/unpackfs/unpackfs.conf 2014-11-15 04:44:09.000000000 +0100 ++++ calamares-default-settings/src/modules/unpackfs/unpackfs.conf 2014-11-15 04:48:36.000000000 +0100 @@ -1,8 +1,5 @@ --- unpack: @@ -67,9 +79,9 @@ diff -ur calamares-8a623cc1181e94b9bf4f1511061ef817e4ccc5df/src/modules/unpackfs - - source: "/path/to/another/filesystem.sqfs" - sourcefs: "squashfs" - destination: "" -diff -ur calamares-8a623cc1181e94b9bf4f1511061ef817e4ccc5df/src/modules/users/users.conf calamares-default-settings/src/modules/users/users.conf ---- calamares-8a623cc1181e94b9bf4f1511061ef817e4ccc5df/src/modules/users/users.conf 2014-10-17 11:52:29.000000000 +0200 -+++ calamares-default-settings/src/modules/users/users.conf 2014-10-20 03:35:35.000000000 +0200 +diff -ur calamares-6b2ccfb442defc1ffeb9359edd892aae5335b838/src/modules/users/users.conf calamares-default-settings/src/modules/users/users.conf +--- calamares-6b2ccfb442defc1ffeb9359edd892aae5335b838/src/modules/users/users.conf 2014-11-15 04:44:09.000000000 +0100 ++++ calamares-default-settings/src/modules/users/users.conf 2014-11-15 04:48:36.000000000 +0100 @@ -3,8 +3,7 @@ defaultGroups: - lp diff --git a/calamares-grub2-tools.patch b/calamares-grub2-tools.patch deleted file mode 100644 index 1f2fa40..0000000 --- a/calamares-grub2-tools.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ur calamares-8a623cc1181e94b9bf4f1511061ef817e4ccc5df/src/modules/grub/main.py calamares-grub2-tools/src/modules/grub/main.py ---- calamares-8a623cc1181e94b9bf4f1511061ef817e4ccc5df/src/modules/grub/main.py 2014-10-17 11:52:29.000000000 +0200 -+++ calamares-grub2-tools/src/modules/grub/main.py 2014-10-20 23:49:46.000000000 +0200 -@@ -23,8 +23,8 @@ - - def install_grub(boot_loader): - install_path = boot_loader["installPath"] -- check_chroot_call(["grub-install", install_path]) -- check_chroot_call(["grub-mkconfig", "-o", "/boot/grub/grub.cfg"]) -+ check_chroot_call(["grub2-install", install_path]) -+ check_chroot_call(["grub2-mkconfig", "-o", "/boot/grub2/grub.cfg"]) - - - def run(): diff --git a/calamares.spec b/calamares.spec index ddfe182..0b90c21 100644 --- a/calamares.spec +++ b/calamares.spec @@ -1,10 +1,10 @@ -%global snapdate 20141111 -%global snaphash faa77d7f5e65620212b6abcba9bc71e55bb78f4e +%global snapdate 20141115 +%global snaphash 6b2ccfb442defc1ffeb9359edd892aae5335b838 %global partitionmanagerhash 3f1ace00592088a920f731acb1e42417f71f5e62 Name: calamares Version: 0 -Release: 0.12.%{snapdate}git%(echo %{snaphash} | cut -c -13)%{?dist} +Release: 0.13.%{snapdate}git%(echo %{snaphash} | cut -c -13)%{?dist} Summary: Installer from a live CD/DVD/USB to disk License: GPLv3+ @@ -14,15 +14,10 @@ Source1: https://github.com/calamares/partitionmanager/archive/%{partitio # documentation file describing how to rebrand Calamares Source2: README.branding -# fix / work around https://github.com/calamares/calamares/issues/123 -# "Hardcoded binary names grub-install and grub-mkconfig (wrong on Fedora)" -# The patch hardcodes them to grub2-install and grub2-mkconfig instead. -# It also fixes the hardcoded path to grub.cfg to /boot/grub2/grub.cfg. -Patch0: calamares-grub2-tools.patch # adjust some default settings (default shipped .conf files) -Patch1: calamares-default-settings.patch +Patch0: calamares-default-settings.patch # .desktop file customizations and fixes (e.g. don't use nonexistent Icon=) -Patch2: calamares-desktop-file.patch +Patch1: calamares-desktop-file.patch BuildRequires: kf5-rpm-macros @@ -104,9 +99,8 @@ developing custom modules for Calamares. rmdir src/modules/partition/partitionmanager mv -f partitionmanager-%{partitionmanagerhash} src/modules/partition/partitionmanager cp -pf %{SOURCE2} . -%patch0 -p1 -b .grub2-tools -%patch1 -p1 -b .default-settings -%patch2 -p1 -b .desktop-file +%patch0 -p1 -b .default-settings +%patch1 -p1 -b .desktop-file # delete backup files so they don't get installed rm -f src/modules/*/*.conf.default-settings @@ -123,12 +117,8 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} # own the local settings directories mkdir -p %{buildroot}%{_sysconfdir}/calamares/modules mkdir -p %{buildroot}%{_sysconfdir}/calamares/branding -# fix the symlink not to point to the devel library -pushd %{buildroot}%{_libdir}/calamares -rm -f libcalamares.so -ln -sf ../libcalamares.so.* libcalamares.so -popd +%check # validate the .desktop file desktop-file-validate %{buildroot}%{_datadir}/applications/calamares.desktop @@ -173,6 +163,14 @@ fi %changelog +* Sat Nov 15 2014 Kevin Kofler - 0-0.13.20141115git6b2ccfb442def +- New snapshot, adds retranslation support to more modules, fixes writing + /etc/hosts, writes /etc/locale.conf (always LANG=en_US.UTF-8 for now) +- Drop grub2-tools (calamares#123) patch, names made configurable upstream +- Update default-settings patch to set the grub2 names and handle new modules +- Drop workaround recreating calamares/libcalamares.so symlink, fixed upstream +- Move desktop-file-validate call to %%check + * Tue Nov 11 2014 Kevin Kofler - 0-0.12.20141111gitfaa77d7f5e656 - New snapshot, writes keyboard configuration files to the installed system (calamares#31), adds a language selector and dynamic retranslation support diff --git a/sources b/sources index c7ae578..2d0b8a5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -e5c4ff39413fc2868d96402eed72dfdc calamares-faa77d7f5e65620212b6abcba9bc71e55bb78f4e.tar.gz +a7f76a846409b2f6c990281d2be0cb24 calamares-6b2ccfb442defc1ffeb9359edd892aae5335b838.tar.gz 853bb899693b47d43a78e6142d07e235 calamares-partitionmanager-3f1ace00592088a920f731acb1e42417f71f5e62.tar.gz