sync sources

This commit is contained in:
tpg (Tomasz Paweł Gajc) 2015-01-12 23:33:43 +01:00
commit 2d81e8fcc6
4 changed files with 296 additions and 0 deletions

2
.abf.yml Normal file
View file

@ -0,0 +1,2 @@
sources:
calamares-0.17.0-20150112.tar.xz: 6ed2cf40bb058e48515cffa22632d19a99cd514a

View file

@ -0,0 +1,19 @@
diff -Naur calamares-0.17.0-20150112/calamares.desktop calamares-0.17.0-20150112.tpg/calamares.desktop
--- calamares-0.17.0-20150112/calamares.desktop 2015-01-11 13:53:23.000000000 +0000
+++ calamares-0.17.0-20150112.tpg/calamares.desktop 2015-01-12 22:20:54.938394302 +0000
@@ -1,12 +1,11 @@
[Desktop Entry]
Type=Application
Version=1.0
-Name=Calamares
-GenericName=System Installer
+Name=Install OpenMandriva Lx
TryExec=calamares
Exec=pkexec /usr/bin/calamares
-Comment=Calamares — System Installer
-Icon=calamares
+Comment=OpenMandriva Lx installer
+Icon=openmandriva.svg
Terminal=false
StartupNotify=false
Categories=Qt;System;

View file

@ -0,0 +1,106 @@
diff -Naur calamares-0.17.0-20150112/settings.conf calamares-0.17.0-20150112.tpg/settings.conf
--- calamares-0.17.0-20150112/settings.conf 2015-01-11 13:53:23.000000000 +0000
+++ calamares-0.17.0-20150112.tpg/settings.conf 2015-01-12 21:59:55.719975775 +0000
@@ -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.
# "local" is LIBDIR/calamares/modules with settings in SHARE/calamares/modules
-modules-search: [ local, /path/to/dir/with/more/modules ]
+modules-search: [ local ]
# 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).
@@ -39,18 +39,17 @@
- locale
- keyboard
- localecfg
-- initcpiocfg
-- initcpio
- users
-#- displaymanager
+- displaymanager
- networkcfg
- hwclock
- services
-#- dracut
+- dracut
#- initramfs
- grubcfg
- grub
#- bootloader
+- packages
- umount
# Phase 3 - postinstall.
@@ -67,4 +66,4 @@
# paths relative to the current directory.
# Only the name of the branding component (directory) should be specified here, Calamares
# then takes care of finding it and loading the contents.
-branding: default
+branding: auto
diff -Naur calamares-0.17.0-20150112/src/modules/grub/grub.conf calamares-0.17.0-20150112.tpg/src/modules/grub/grub.conf
--- calamares-0.17.0-20150112/src/modules/grub/grub.conf 2015-01-11 13:53:23.000000000 +0000
+++ calamares-0.17.0-20150112.tpg/src/modules/grub/grub.conf 2015-01-12 22:02:04.588501788 +0000
@@ -1,11 +1,11 @@
---
# 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"
# 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"
+efiBootloaderId: "openmandriva"
diff -Naur calamares-0.17.0-20150112/src/modules/packages/packages.conf calamares-0.17.0-20150112.tpg/src/modules/packages/packages.conf
--- calamares-0.17.0-20150112/src/modules/packages/packages.conf 2015-01-11 13:53:23.000000000 +0000
+++ calamares-0.17.0-20150112.tpg/src/modules/packages/packages.conf 2015-01-12 22:03:33.478944661 +0000
@@ -9,7 +9,7 @@
# - apt - APT frontend for DEB and RPM
# - pacman - Pacman
#
-backend: packagekit
+backend: urpmi
#
# List of maps with package operations such as install or remove.
# Distro developers can provide a list of packages to remove
@@ -24,18 +24,6 @@
# storage called "packageOperations" and it is processed
# after the static list in the job configuration.
#
-#operations:
-# - install:
-# - pkg1
-# - pkg2
-# - remove:
-# - pkg3
-# - pkg4
-# - install:
-# - pkg5
-# - remove:
-# - pkg2
-# - pkg1
-# install:
-# - pkgs6
-# - pkg7
+operations:
+ - remove:
+ - calamares
diff -Naur calamares-0.17.0-20150112/src/modules/unpackfs/unpackfs.conf calamares-0.17.0-20150112.tpg/src/modules/unpackfs/unpackfs.conf
--- calamares-0.17.0-20150112/src/modules/unpackfs/unpackfs.conf 2015-01-11 13:53:23.000000000 +0000
+++ calamares-0.17.0-20150112.tpg/src/modules/unpackfs/unpackfs.conf 2015-01-12 22:06:36.008954515 +0000
@@ -1,8 +1,5 @@
---
unpack:
- - source: "/path/to/filesystem.img"
- sourcefs: "ext4"
- destination: ""
- - source: "/path/to/another/filesystem.sqfs"
+ - source: "/live/media/LiveOS/squashfs.img"
sourcefs: "squashfs"
destination: ""

169
calamares.spec Normal file
View file

@ -0,0 +1,169 @@
%global snapdate 20150112
Summary: Distribution-independent installer framework
Name: calamares
Version: 0.17.0
Release: 0.%{snapdate}.1
License: GPLv3+
URL: http://calamares.io/
# git archive --format=tar --prefix=calamares-0.17.0-20150112/ HEAD | xz -vf > calamares-0.17.0-20150112.tar.xz
Source0: https://github.com/calamares/calamares/archive/%{snaphash}/calamares-%{snapdate}.tar.xz
Patch0: calamares-0.17.0-20150112-openmandriva-settings.patch
Patch1: calamares-0.17.0-20150112-openmandriva-desktop-file.patch
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(Qt5Xml)
BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(Qt5Test)
BuildRequires: pkgconfig(Qt5Concurrent)
BuildRequires: pkgconfig(Qt5Svg)
BuildRequires: pkgconfig(libatasmart)
BuildRequires: pkgconfig(blkid)
BuildRequires: pkgconfig(libparted)
BuildRequires: cmake >= 3.0
BuildRequires: extra-cmake-modules
BuildRequires: qt5-qttools
BuildRequires: qt5-qttools-linguist
BuildRequires: cmake(KF5CoreAddons)
BuildRequires: cmake(KF5Config)
BuildRequires: cmake(KF5Solid)
BuildRequires: cmake(KF5I18n)
BuildRequires: yaml-cpp-devel
BuildRequires: pkgconfig(python3)
BuildRequires: boost-devel >= 1.54.0
Requires(post): distro-release-OpenMandriva
Requires(post): distro-theme-OpenMandriva
Requires: coreutils
Requires: util-linux
Requires: dracut
Requires: grub2
%ifarch x86_64
# EFI currently only supported on x86_64
Requires: grub2-efi
%endif
Requires: console-setup
# x11 stuff
Requires: setxkbmap
Requires: xkbcomp
Requires: NetworkManager
Requires: os-prober
Requires: e2fsprogs
Requires: dosfstools
Requires: ntfs-3g
Requires: gawk
#(tpg) needs to be ported to KF5
#Requires: partitionmanager
Requires: systemd
Requires: systemd-units
Requires: rsync
Requires: shadow
Requires: polkit
Requires: urpmi
ExclusiveArch: %{ix86} x86_64
%description
Calamares is a distribution-independent installer framework, designed to install
from a live CD/DVD/USB environment to a hard disk. It includes a graphical
installation program based on Qt 5.
%package libs
Summary: Calamares runtime libraries
Requires: %{name} = %{EVRD}
%description libs
Librarief for %{name}.
%package devel
Summary: Development files for %{name}
Requires: %{name} = %{EVRD}
Requires: cmake
%description devel
Development files and headers for %{name}.
%prep
%setup -q -n %{name}-%{snapdate}
rmdir src/modules/partition/partitionmanager
%patch0 -p1 -b .default-settings
%patch1 -p1 -b .desktop-file
#delete backup files
rm -f src/modules/*/*.conf.default-settings
%build
%cmake_qt5 -DWITH_PARTITIONMANAGER:BOOL="ONFF" -DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo"
%make
%install
%makeinstall_std
#own the auto branding directory
mkdir -p %{buildroot}%{_datadir}/calamares/branding/auto
touch %{buildroot}%{_datadir}/calamares/branding/auto/branding.desc
#own the local settings directories
mkdir -p %{buildroot}%{_sysconfdir}/calamares/modules
mkdir -p %{buildroot}%{_sysconfdir}/calamares/branding
%post
# generate the "auto" branding
. %{_sysconfdir}/os-release
cat >%{_datadir}/calamares/branding/auto/branding.desc <<EOF
# THIS FILE IS AUTOMATICALLY GENERATED! ANY CHANGES TO THIS FILE WILL BE LOST!
---
componentName: auto
strings:
productName: "$NAME"
shortProductName: "$NAME"
version: "$VERSION"
shortVersion: "$VERSION_ID"
versionedName: "$NAME $VERSION"
shortVersionedName: "$NAME $VERSION_ID"
bootloaderEntryName: "$NAME"
images:
productLogo: "%{_iconsdir}/openmandriva.svg"
productIcon: "%{_iconsdir}/openmandriva.svg"
slideshow:
- "%{_iconsdir}/openmandriva.svg"
EOF
%files
%doc LICENSE AUTHORS
%dir %{_libdir}/calamares
%dir %{_datadir}/calamares
%dir %{_datadir}/calamares/branding
%dir %{_datadir}/calamares/branding/auto
%{_bindir}/calamares
%{_datadir}/calamares/settings.conf
%{_datadir}/calamares/branding/default/
%{_datadir}/calamares/modules/
%{_datadir}/applications/calamares.desktop
%{_datadir}/polkit-1/actions/com.github.calamares.calamares.policy
%{_sysconfdir}/calamares/
%{_libdir}/calamares/*
%ghost %{_datadir}/calamares/branding/auto/branding.desc
%files libs
%{_libdir}/libcalamares.so.*
%{_libdir}/libcalamaresui.so.*
# unversioned library
%{_libdir}/libcalapm.so
%files devel
%dir %{_includedir}/libcalamares
%dir %{_libdir}/cmake/Calamares
%{_includedir}/libcalamares/*
%{_libdir}/libcalamares.so
%{_libdir}/libcalamaresui.so
%{_libdir}/cmake/Calamares/*