diff options
| author | Adriaan de Groot <groot@kde.org> | 2017-12-15 07:18:05 -0500 |
|---|---|---|
| committer | Adriaan de Groot <groot@kde.org> | 2017-12-15 07:18:05 -0500 |
| commit | cc15dd9ec7d55207240f2a3441f7c7ae27af183c (patch) | |
| tree | 64a703fa7e964c33c356d24849c59bb61a4516c0 /README.md | |
| parent | 12deb67acef8a78b76858db2ae47a49420fa06b1 (diff) | |
| parent | 55ed2ba4c078f2ab4700d6efdfc9fdc84ba5a13b (diff) | |
Merge branch 'master' into kpmcore-3.2
- Pull in Master, merge README, to simplify merging this
branch into master (soon-ish, once kpmcore 3.3 becomes available
in builders)
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -19,16 +19,16 @@ Main: * yaml-cpp >= 0.5.1 * Python >= 3.3 * Boost.Python >= 1.55.0 -* dmidecode +* extra-cmake-modules (recommended; required for some modules) Modules: * welcome: * NetworkManager - * UPower + * UPower (optional, runtime) * partition: * extra-cmake-modules * KF5: KCoreAddons, KConfig, KI18n, KService, KWidgetsAddons - * KPMcore >= 3.2 + * KPMcore >= 3.3 * bootloader: * systemd-boot or GRUB * unpackfs: @@ -37,4 +37,7 @@ Modules: ### Building -See [wiki](https://github.com/calamares/calamares/wiki) for up to date building and deployment instructions. +See [wiki](https://github.com/calamares/calamares/wiki) for up to date +[building](https://github.com/calamares/calamares/wiki/Developer's-Guide) +and [deployment](https://github.com/calamares/calamares/wiki/Deployer's-Guide) +instructions. |