[calamares] New snapshot (20141206git75adfa03fcba0), add ExclusiveArch (#1171380).
Kevin Kofler
kkofler at fedoraproject.org
Sat Dec 6 06:10:58 UTC 2014
commit e2f1e7d45d6cf059d201486a0a221f9d160b58ec
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Sat Dec 6 07:10:50 2014 +0100
New snapshot (20141206git75adfa03fcba0), add ExclusiveArch (#1171380).
* Sat Dec 06 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.17.0-3.20141206git75adfa03fcba0
- New snapshot, fixes some bugs, adds partial/incomplete grub-efi support
- Add ExclusiveArch matching the livearches from anaconda.spec (#1171380)
- Requires: grub-efi on x86_64
- Rebase default-settings patch, set efiBootloaderId in grub.cfg
.gitignore | 1 +
calamares-default-settings.patch | 46 ++++++++++++++++++++++---------------
calamares.spec | 20 ++++++++++++++--
sources | 2 +-
4 files changed, 46 insertions(+), 23 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b3c93d6..f71825f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/calamares-c17898a6501fdd89aba302cd2d1078da18ed8812.tar.gz
/calamares-8591dcf731cbfbc9d219244911756460b331c8c3.tar.gz
/calamares-eee54241d1f58839f9d2dc8a64a1a556ff5f70b3.tar.gz
+/calamares-75adfa03fcba056a016d3cd04a3c9484b409c147.tar.gz
diff --git a/calamares-default-settings.patch b/calamares-default-settings.patch
index 7583e4e..a4ee08c 100644
--- a/calamares-default-settings.patch
+++ b/calamares-default-settings.patch
@@ -1,6 +1,6 @@
-diff -ur calamares-eee54241d1f58839f9d2dc8a64a1a556ff5f70b3/settings.conf calamares-default-settings/settings.conf
---- calamares-eee54241d1f58839f9d2dc8a64a1a556ff5f70b3/settings.conf 2014-11-28 22:32:38.000000000 +0100
-+++ calamares-default-settings/settings.conf 2014-11-29 03:10:33.000000000 +0100
+diff -ur calamares-75adfa03fcba056a016d3cd04a3c9484b409c147/settings.conf calamares-default-settings/settings.conf
+--- calamares-75adfa03fcba056a016d3cd04a3c9484b409c147/settings.conf 2014-12-06 00:15:55.000000000 +0100
++++ calamares-default-settings/settings.conf 2014-12-06 06:47:04.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.
@@ -35,9 +35,9 @@ diff -ur calamares-eee54241d1f58839f9d2dc8a64a1a556ff5f70b3/settings.conf calama
# then takes care of finding it and loading the contents.
-branding: default
+branding: auto
-diff -ur calamares-eee54241d1f58839f9d2dc8a64a1a556ff5f70b3/src/modules/displaymanager/displaymanager.conf calamares-default-settings/src/modules/displaymanager/displaymanager.conf
---- calamares-eee54241d1f58839f9d2dc8a64a1a556ff5f70b3/src/modules/displaymanager/displaymanager.conf 2014-11-28 22:32:38.000000000 +0100
-+++ calamares-default-settings/src/modules/displaymanager/displaymanager.conf 2014-11-29 03:11:05.000000000 +0100
+diff -ur calamares-75adfa03fcba056a016d3cd04a3c9484b409c147/src/modules/displaymanager/displaymanager.conf calamares-default-settings/src/modules/displaymanager/displaymanager.conf
+--- calamares-75adfa03fcba056a016d3cd04a3c9484b409c147/src/modules/displaymanager/displaymanager.conf 2014-12-06 00:15:55.000000000 +0100
++++ calamares-default-settings/src/modules/displaymanager/displaymanager.conf 2014-12-06 06:47:04.000000000 +0100
@@ -3,13 +3,7 @@
#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.
@@ -52,10 +52,10 @@ diff -ur calamares-eee54241d1f58839f9d2dc8a64a1a556ff5f70b3/src/modules/displaym
#Enable followed settings to force a destop environment in your displaymanager configuration file
#default_desktop_environment:
-diff -ur calamares-eee54241d1f58839f9d2dc8a64a1a556ff5f70b3/src/modules/grub/grub.conf calamares-default-settings/src/modules/grub/grub.conf
---- calamares-eee54241d1f58839f9d2dc8a64a1a556ff5f70b3/src/modules/grub/grub.conf 2014-11-28 22:32:38.000000000 +0100
-+++ calamares-default-settings/src/modules/grub/grub.conf 2014-11-29 03:10:33.000000000 +0100
-@@ -1,6 +1,6 @@
+diff -ur calamares-75adfa03fcba056a016d3cd04a3c9484b409c147/src/modules/grub/grub.conf calamares-default-settings/src/modules/grub/grub.conf
+--- calamares-75adfa03fcba056a016d3cd04a3c9484b409c147/src/modules/grub/grub.conf 2014-12-06 00:15:55.000000000 +0100
++++ calamares-default-settings/src/modules/grub/grub.conf 2014-12-06 06:48:25.000000000 +0100
+@@ -1,11 +1,13 @@
---
# GRUB 2 binary names and boot directory
# Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names.
@@ -65,9 +65,17 @@ diff -ur calamares-eee54241d1f58839f9d2dc8a64a1a556ff5f70b3/src/modules/grub/gru
+grubInstall: "grub2-install"
+grubMkconfig: "grub2-mkconfig"
+grubCfg: "/boot/grub2/grub.cfg"
-diff -ur calamares-eee54241d1f58839f9d2dc8a64a1a556ff5f70b3/src/modules/locale/locale.conf calamares-default-settings/src/modules/locale/locale.conf
---- calamares-eee54241d1f58839f9d2dc8a64a1a556ff5f70b3/src/modules/locale/locale.conf 2014-11-28 22:32:38.000000000 +0100
-+++ calamares-default-settings/src/modules/locale/locale.conf 2014-11-29 03:10:33.000000000 +0100
+ # Optionally set the --bootloader-id to use for EFI. If not set, this defaults
+ # to the bootloaderEntryName from branding.desc with problematic characters
+ # replaced. If an efiBootloaderId is specified here, it is taken to already be a
+ # valid directory name, so no such postprocessing is done in this case.
+-# efiBootloaderId: "dirname"
++# PACKAGER NOTE: If you really want to change this value, you will also have to
++# change the hardcoded directory name in the grub2(-efi) package.
++efiBootloaderId: "fedora"
+diff -ur calamares-75adfa03fcba056a016d3cd04a3c9484b409c147/src/modules/locale/locale.conf calamares-default-settings/src/modules/locale/locale.conf
+--- calamares-75adfa03fcba056a016d3cd04a3c9484b409c147/src/modules/locale/locale.conf 2014-12-06 00:15:55.000000000 +0100
++++ calamares-default-settings/src/modules/locale/locale.conf 2014-12-06 06:47:04.000000000 +0100
@@ -1,3 +1,4 @@
---
-region: "Europe"
@@ -75,9 +83,9 @@ diff -ur calamares-eee54241d1f58839f9d2dc8a64a1a556ff5f70b3/src/modules/locale/l
+# default to UTC
+region: "Atlantic"
+zone: "Reykjavik"
-diff -ur calamares-eee54241d1f58839f9d2dc8a64a1a556ff5f70b3/src/modules/unpackfs/unpackfs.conf calamares-default-settings/src/modules/unpackfs/unpackfs.conf
---- calamares-eee54241d1f58839f9d2dc8a64a1a556ff5f70b3/src/modules/unpackfs/unpackfs.conf 2014-11-28 22:32:38.000000000 +0100
-+++ calamares-default-settings/src/modules/unpackfs/unpackfs.conf 2014-11-29 03:10:33.000000000 +0100
+diff -ur calamares-75adfa03fcba056a016d3cd04a3c9484b409c147/src/modules/unpackfs/unpackfs.conf calamares-default-settings/src/modules/unpackfs/unpackfs.conf
+--- calamares-75adfa03fcba056a016d3cd04a3c9484b409c147/src/modules/unpackfs/unpackfs.conf 2014-12-06 00:15:55.000000000 +0100
++++ calamares-default-settings/src/modules/unpackfs/unpackfs.conf 2014-12-06 06:47:04.000000000 +0100
@@ -1,8 +1,5 @@
---
unpack:
@@ -88,9 +96,9 @@ diff -ur calamares-eee54241d1f58839f9d2dc8a64a1a556ff5f70b3/src/modules/unpackfs
- - source: "/path/to/another/filesystem.sqfs"
- sourcefs: "squashfs"
- destination: ""
-diff -ur calamares-eee54241d1f58839f9d2dc8a64a1a556ff5f70b3/src/modules/users/users.conf calamares-default-settings/src/modules/users/users.conf
---- calamares-eee54241d1f58839f9d2dc8a64a1a556ff5f70b3/src/modules/users/users.conf 2014-11-28 22:32:38.000000000 +0100
-+++ calamares-default-settings/src/modules/users/users.conf 2014-11-29 03:10:33.000000000 +0100
+diff -ur calamares-75adfa03fcba056a016d3cd04a3c9484b409c147/src/modules/users/users.conf calamares-default-settings/src/modules/users/users.conf
+--- calamares-75adfa03fcba056a016d3cd04a3c9484b409c147/src/modules/users/users.conf 2014-12-06 00:15:55.000000000 +0100
++++ calamares-default-settings/src/modules/users/users.conf 2014-12-06 06:47:04.000000000 +0100
@@ -3,8 +3,7 @@
defaultGroups:
- lp
diff --git a/calamares.spec b/calamares.spec
index 069e7df..70cc667 100644
--- a/calamares.spec
+++ b/calamares.spec
@@ -1,10 +1,10 @@
-%global snapdate 20141128
-%global snaphash eee54241d1f58839f9d2dc8a64a1a556ff5f70b3
+%global snapdate 20141206
+%global snaphash 75adfa03fcba056a016d3cd04a3c9484b409c147
%global partitionmanagerhash 3f1ace00592088a920f731acb1e42417f71f5e62
Name: calamares
Version: 0.17.0
-Release: 2.%{snapdate}git%(echo %{snaphash} | cut -c -13)%{?dist}
+Release: 3.%{snapdate}git%(echo %{snaphash} | cut -c -13)%{?dist}
Summary: Installer from a live CD/DVD/USB to disk
License: GPLv3+
@@ -17,6 +17,10 @@ Patch0: calamares-default-settings.patch
# .desktop file customizations and fixes (e.g. don't use nonexistent Icon=)
Patch1: calamares-desktop-file.patch
+# Calamares is only supported where live images (and GRUB) are. (#1171380)
+# This list matches the livearches global from anaconda.spec
+ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le
+
BuildRequires: kf5-rpm-macros
BuildRequires: cmake >= 2.8.12
@@ -56,6 +60,10 @@ Requires: util-linux
Requires: sddm
Requires: dracut
Requires: grub2
+%ifarch x86_64
+# EFI currently only supported on x86_64
+Requires: grub2-efi
+%endif
Requires: console-setup
Requires: xorg-x11-xkb-utils
Requires: NetworkManager
@@ -193,6 +201,12 @@ EOF
%changelog
+* Sat Dec 06 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.17.0-3.20141206git75adfa03fcba0
+- New snapshot, fixes some bugs, adds partial/incomplete grub-efi support
+- Add ExclusiveArch matching the livearches from anaconda.spec (#1171380)
+- Requires: grub-efi on x86_64
+- Rebase default-settings patch, set efiBootloaderId in grub.cfg
+
* Sat Nov 29 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.17.0-2.20141128giteee54241d1f58
- New snapshot, sets the machine-id, fixes mounting/unmounting bugs
- Rebase default-settings patch
diff --git a/sources b/sources
index 659426e..9d46fc0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-20751b632785f0a948f7da029eac06b8 calamares-eee54241d1f58839f9d2dc8a64a1a556ff5f70b3.tar.gz
+40fcb2c14d61593fc2c9253085177c0e calamares-75adfa03fcba056a016d3cd04a3c9484b409c147.tar.gz
853bb899693b47d43a78e6142d07e235 calamares-partitionmanager-3f1ace00592088a920f731acb1e42417f71f5e62.tar.gz
More information about the scm-commits
mailing list