OSDN Git Service
Adriaan de Groot [Tue, 16 Jun 2020 14:45:49 +0000 (16:45 +0200)]
Merge remote-tracking branch 'origin/master' into calamares
Pick up some older MRs that apply to the older branch.
Adriaan de Groot [Tue, 16 Jun 2020 14:42:30 +0000 (16:42 +0200)]
Merge pull request #1435 from gportay/partition-attributes
Partition Attributes
Adriaan de Groot [Tue, 16 Jun 2020 14:42:24 +0000 (16:42 +0200)]
Merge pull request #1409 from gportay/partition-uuid
Partition UUID
Adriaan de Groot [Tue, 16 Jun 2020 14:16:07 +0000 (16:16 +0200)]
[bootloader] Fix up schema
Adriaan de Groot [Tue, 16 Jun 2020 14:07:57 +0000 (16:07 +0200)]
Merge branch 'yaml-schemata' into calamares
Adriaan de Groot [Tue, 16 Jun 2020 14:06:56 +0000 (16:06 +0200)]
CI: import all the rest of the YAML schema
- These have **not** been fixed for validation, so the schema's themselves
will fail to load. This is a consequence of variations in JSON-Schema
representations through various drafts. Fixing the schemata is
fairly straightforward.
This gives us 19 new tests, all of which fail.
Adriaan de Groot [Tue, 16 Jun 2020 14:03:28 +0000 (16:03 +0200)]
[welcome] Add schema for welcome config
- Note that this is missing *languageIcon* so if that gets uncommented,
it will fail validation.
- While here decide that should be
right up front in object (mappings) declaration.
Adriaan de Groot [Tue, 16 Jun 2020 13:37:19 +0000 (15:37 +0200)]
CI: verbose schema-failure diagnostics
Adriaan de Groot [Tue, 16 Jun 2020 12:38:13 +0000 (14:38 +0200)]
CI: apply schema-validation to the example config files
- Any config file with a schema gets a test (validate-<module>)
to test the file.
Adriaan de Groot [Tue, 16 Jun 2020 12:06:26 +0000 (14:06 +0200)]
CMake: update Python3-finding
- mark for updates in 3.3: update to CMake 3.12 and use the more-modern
Python modules for it then.
Adriaan de Groot [Tue, 16 Jun 2020 11:54:13 +0000 (13:54 +0200)]
CMake: document WITH_ and BUILD_ a little more
- also mark TODO:3.3: for incompatible / surprising changes for 3.3
Adriaan de Groot [Tue, 16 Jun 2020 11:12:22 +0000 (13:12 +0200)]
Changes: thanks Phil, and change-of-branch
Adriaan de Groot [Tue, 16 Jun 2020 11:04:34 +0000 (13:04 +0200)]
[finished] Add schema for config
- Original schema from artoo@manjaro.org, modified for current JSON-Schema use
Adriaan de Groot [Tue, 16 Jun 2020 10:45:29 +0000 (12:45 +0200)]
CI: add tooling for schema validation
The config files have fairly extensive documentation but no
formal description; adding JSON-Schema into the mix makes it
possible to write a machine-checkable description.
Gaël PORTAY [Sat, 21 Mar 2020 18:21:16 +0000 (14:21 -0400)]
[partition] Add support for partition attributes
Philip Müller [Mon, 15 Jun 2020 10:33:26 +0000 (12:33 +0200)]
[CMake] fix typo
Adriaan de Groot [Mon, 15 Jun 2020 09:45:54 +0000 (11:45 +0200)]
Merge pull request #1432 from pinpox/gitignore-tags
Gitignore tags
Adriaan de Groot [Sun, 14 Jun 2020 21:42:25 +0000 (23:42 +0200)]
[libcalamares] Fix tests on 32-bit platforms
- The size of a 2GiB partition (in bytes) is larger than the largest
32-bit signed integer; we hit signed overflow while calculating
2^11 * 2^10 * 2^10 and the test fails.
- Switch the whole table of sizes to qint64 instead.
- For testing purposes only, introduce a _qi suffix for qint64.
FIXES #1430
Adriaan de Groot [Fri, 12 Jun 2020 12:50:12 +0000 (14:50 +0200)]
i18n: adjust tooling to renamed resource
Calamares CI [Fri, 12 Jun 2020 12:36:48 +0000 (14:36 +0200)]
i18n: [python] Automatic merge of Transifex translations
Calamares CI [Fri, 12 Jun 2020 12:36:48 +0000 (14:36 +0200)]
i18n: [dummypythonqt] Automatic merge of Transifex translations
Calamares CI [Fri, 12 Jun 2020 12:36:48 +0000 (14:36 +0200)]
i18n: [calamares] Automatic merge of Transifex translations
Adriaan de Groot [Fri, 12 Jun 2020 11:12:50 +0000 (13:12 +0200)]
CI: change of default branch
Adriaan de Groot [Fri, 12 Jun 2020 10:56:13 +0000 (12:56 +0200)]
i18n: expand the translation-load-compare tool a little, more docs
Adriaan de Groot [Fri, 12 Jun 2020 10:05:35 +0000 (12:05 +0200)]
CMake: handle Python modules built from subdirectory a/b
Adriaan de Groot [Fri, 12 Jun 2020 09:35:23 +0000 (11:35 +0200)]
CMake: support out-of-tree builds
- The variables that are set for out-of-tree builds are prefixed
with to avoid name clashes; make the module-infrastructure
respect those instead of the in-tree variable names.
- .. and then duplicate the in-tree variables to the out-of-tree
variables, so we only need one set of module instructions.
Adriaan de Groot [Fri, 12 Jun 2020 09:29:13 +0000 (11:29 +0200)]
Merge branch 'master' into calamares
Deprecate the master branch.
Adriaan de Groot [Thu, 11 Jun 2020 10:42:51 +0000 (12:42 +0200)]
Changes: mention recent features and contributors
Adriaan de Groot [Thu, 11 Jun 2020 10:26:32 +0000 (12:26 +0200)]
CI: remove outdated comment-crud
Adriaan de Groot [Thu, 11 Jun 2020 09:59:12 +0000 (11:59 +0200)]
Merge pull request #1431 from pinpox/master
Add xbps package manager
Pablo Ovelleiro Corral [Thu, 11 Jun 2020 09:57:23 +0000 (11:57 +0200)]
add tags file to .gitignore
Pablo Ovelleiro Corral [Thu, 11 Jun 2020 09:45:50 +0000 (11:45 +0200)]
[packages] add xbps package manager
Adriaan de Groot [Wed, 10 Jun 2020 15:27:41 +0000 (17:27 +0200)]
Merge branch 'issue-1428'
Install all the relevant CMake, libcalamares and libcalamaresui
files -- config and headers -- so that external modules can be
created (again). This support had severely bitrotted, so
that the only effective way to add modules was to do so inside
the Calamares build tree. Now it's independent again.
FIXES #1428
Adriaan de Groot [Wed, 10 Jun 2020 14:58:17 +0000 (16:58 +0200)]
Documentation: uncomment oem-setup
- Calamares complains if this isn't set, so the example should
probably be 'safe' from that complaint. With 3.3 plans including
'fatal error instead of warning' this should be fixed on-time.
Adriaan de Groot [Wed, 10 Jun 2020 14:43:34 +0000 (16:43 +0200)]
[libcalamaresui] Install libcalamaresui headers
- All the headers go to relevant subdirs, but we don't keep
libcalamares and libcalamaresui apart.
- While here, remove unused variable from libcalamares CMake
Adriaan de Groot [Wed, 10 Jun 2020 09:51:53 +0000 (11:51 +0200)]
CMake: put CMake-level ABI settings in CalamaresConfig
- drop the BuildTreeSettings, it was not usefully used
- make CalamaresConfig repeat the WITH_* settings, so that
consumers can know the ABI offered
Adriaan de Groot [Wed, 10 Jun 2020 00:27:57 +0000 (02:27 +0200)]
[libcalamares] Link yamlcpp privately
- link the library privately -- the public API uses QVariantMap
- install FindYAMLCPP just in case
- add yamlcpp explicitly in the few places that really need it
(e.g. netinstall testing the parsing of netinstall.yaml)
Adriaan de Groot [Wed, 10 Jun 2020 00:10:21 +0000 (02:10 +0200)]
CMake: install all the libcalamares subdir-headers
Adriaan de Groot [Wed, 10 Jun 2020 00:01:59 +0000 (02:01 +0200)]
CMake: give libcalamares IMPORTED includes
- Set the interface-include path for libcalamares, so that
linking to it (as one would from an external repo) pulls in
all the includes.
Adriaan de Groot [Tue, 9 Jun 2020 23:42:11 +0000 (01:42 +0200)]
CMake: tidy misc. installation bits
- don't generate uninstall file twice
- tighten up vertical space
Adriaan de Groot [Tue, 9 Jun 2020 23:34:18 +0000 (01:34 +0200)]
CMake: tidy up installation of CMake infrastructure
- export() only once
- document variables a bit better
- drop the LibraryDepends file
Adriaan de Groot [Tue, 9 Jun 2020 23:25:36 +0000 (01:25 +0200)]
CMake: remove unused link libraries
- Nothing ever sets LIBRARY_QT5_MODULES (it would be a macro
argument to calamares_add_library, if anything).
Adriaan de Groot [Tue, 9 Jun 2020 22:31:13 +0000 (00:31 +0200)]
CMake: massage IMPORTED targets and module path
- Add the Calamares CMake-modules to the search path automatically
- Export to CalamaresTargets.cmake and use namespace Calamares::
- Document imported targets
- Find Qt, because the translations machinery will need macros from that
- The installed lib links to IMPORTED libraries from KF5, so we need
to find them (again) as well.
Adriaan de Groot [Tue, 9 Jun 2020 21:58:58 +0000 (23:58 +0200)]
CMake: produce a standard modern-CMake config file
- Use modern CMake commands to produce the config file
- Drop the CalamaresUse.cmake file, include its functionality
in the config file.
Adriaan de Groot [Tue, 9 Jun 2020 21:38:31 +0000 (23:38 +0200)]
CMake: use standard function for creating a version file
Adriaan de Groot [Tue, 9 Jun 2020 21:25:17 +0000 (23:25 +0200)]
CMake: shuffle includes together
Adriaan de Groot [Tue, 9 Jun 2020 12:40:13 +0000 (14:40 +0200)]
[locale] Repair timezone graphics -- west-Africa and Pacific
Adriaan de Groot [Tue, 9 Jun 2020 12:21:11 +0000 (14:21 +0200)]
[locale] Norfolk Island gave up +11.5 in 2015
demmm [Tue, 9 Jun 2020 11:34:16 +0000 (13:34 +0200)]
[welcomeq]re-add the donate button example to welcomeq.conf
Adriaan de Groot [Tue, 9 Jun 2020 11:24:12 +0000 (13:24 +0200)]
[mount] Warn if chcon is missing, rather than fail
FIXES #1429
Adriaan de Groot [Tue, 9 Jun 2020 10:15:16 +0000 (12:15 +0200)]
Merge branch 'issue-1427'
Show failed requirements in one component, with a filter applied,
and with satisfied and mandatory (the latter has an effect on
can-we-continue, not on whether something is satisfied) colors applied.
FIXES #1427
Adriaan de Groot [Tue, 9 Jun 2020 10:13:44 +0000 (12:13 +0200)]
[welcomeq] Show filtered list of requirements
- only the unsatisfied ones are shown; no need to filter and
fiddle about in QML
Adriaan de Groot [Tue, 9 Jun 2020 10:05:40 +0000 (12:05 +0200)]
[welcome] Add a filtered model for unsatisfied requirements
Adriaan de Groot [Mon, 8 Jun 2020 14:22:03 +0000 (10:22 -0400)]
[welcomeq] Use just one component to display requirements
- Do all the status indication in one component, but vary
the top-level message based on whether the mandatory
requirements are satisfied.
- Vary color and icon based on each requirement's *mandatory* setting.
Adriaan de Groot [Mon, 8 Jun 2020 13:45:19 +0000 (09:45 -0400)]
[welcome] Some API docs
Adriaan de Groot [Mon, 8 Jun 2020 12:27:06 +0000 (08:27 -0400)]
[libcalamares] Be more verbose when the requirements check is done
Adriaan de Groot [Mon, 8 Jun 2020 12:05:46 +0000 (08:05 -0400)]
[welcome] Remove name-tangle
- use useful, not-single-letter, variable names
- don't rename inconsistently in the lambda capture
Adriaan de Groot [Mon, 8 Jun 2020 11:06:03 +0000 (07:06 -0400)]
[welcome] Sanitize example configurations
- remove all duplicated documentation from ; it's the same as
`welcome.conf` in all respects except for *qmlSearch*.
demmm [Mon, 8 Jun 2020 11:25:47 +0000 (13:25 +0200)]
adding needed geoip section to welcomeq.conf
see https://github.com/calamares/calamares/issues/1427#issuecomment-
640531710
Adriaan de Groot [Sat, 6 Jun 2020 15:22:13 +0000 (17:22 +0200)]
Merge pull request #1422 from andy1247008998/patch-2
remove unnecessary period mark since it's a title
Adriaan de Groot [Sat, 6 Jun 2020 15:21:14 +0000 (17:21 +0200)]
Post-release housekeeping
Adriaan de Groot [Sat, 6 Jun 2020 15:07:53 +0000 (17:07 +0200)]
Changes: pre-release housekeeping
Calamares CI [Sat, 6 Jun 2020 15:06:58 +0000 (17:06 +0200)]
i18n: [python] Automatic merge of Transifex translations
Calamares CI [Sat, 6 Jun 2020 15:06:58 +0000 (17:06 +0200)]
i18n: [calamares] Automatic merge of Transifex translations
Adriaan de Groot [Wed, 3 Jun 2020 14:43:31 +0000 (16:43 +0200)]
[partition] Add missing includes for Qt 5.15 compatibility
Adriaan de Groot [Wed, 3 Jun 2020 14:42:42 +0000 (16:42 +0200)]
[partition] Apply coding style (to just this one file)
Adriaan de Groot [Wed, 3 Jun 2020 14:02:43 +0000 (16:02 +0200)]
[netinstall] Improve documentation of translation framework
- Not country-code, but language-code
FIXES #1411
Adriaan de Groot [Wed, 3 Jun 2020 13:36:05 +0000 (15:36 +0200)]
Changes: mention some new stuff, thanks Callum
Adriaan de Groot [Wed, 3 Jun 2020 13:32:07 +0000 (15:32 +0200)]
Merge pull request #1423 from Cal8031/t1
Update and add SPDX identifiers
Adriaan de Groot [Wed, 3 Jun 2020 13:29:42 +0000 (15:29 +0200)]
Merge branch 'issue-1419'
When entering the page, en_CA maps to us keyboard, not ca_eng --
this will annoy those people who have that specifically set,
so it needs separation of "setting from GeoIP" and "setting
because system is already like that".
Not touched in the Config class because that's not used yet.
FIXES #1419
Adriaan de Groot [Wed, 3 Jun 2020 13:11:19 +0000 (15:11 +0200)]
[locale] Update documentation to mention *fixed* style
Adriaan de Groot [Wed, 3 Jun 2020 13:03:19 +0000 (15:03 +0200)]
[libcalamares] Allow "fixed" as a GeoIP lookup type
Adriaan de Groot [Wed, 3 Jun 2020 12:55:01 +0000 (14:55 +0200)]
[libcalamares] Add unittests for GeoIPFixed
- Ignores the data, just returns selector
Adriaan de Groot [Wed, 3 Jun 2020 12:34:45 +0000 (14:34 +0200)]
[libcalamares] Add GeoIPFixed to the test-tool for GeoIP lookup
- Allow format "fixed"
- Allow specifying the selector in the test-tool
Adriaan de Groot [Wed, 3 Jun 2020 12:26:14 +0000 (14:26 +0200)]
[libcalamares] GeoIP that always returns a fixed value
- Value is configurable (through the "selector" which is passed
to GeoIP lookups). This is convenient for tests so you can "fix"
the value that the lookup will return.
Callum Farmer [Sat, 30 May 2020 14:15:03 +0000 (15:15 +0100)]
[libcalamares] Update SPDX identifiers.
Update CppJob.h
Update CalamaresConfig.h.in
Update DllMacro.h
Update GlobalStorage.cpp
Update GlobalStorage.h
Update Job.cpp
Update Job.h
Update JobExample.cpp
Update JobExample.h
Update JobQueue.cpp
Update CalamaresConfig.h.in
Update CppJob.cpp
Update CppJob.h
Update DllMacro.h
Update GlobalStorage.cpp
Update GlobalStorage.h
Update Job.cpp
Update Job.h
Update JobExample.cpp
Update JobExample.h
Update JobQueue.h
Update ProcessJob.cpp
Update ProcessJob.h
Update PythonHelper.cpp
Update PythonJob.cpp
Update PythonJob.h
Update PythonHelper.h
Update PythonJobApi.cpp
Update PythonJobApi.h
Update Settings.cpp
Update Settings.h
Update GeoIPJSON.cpp
Update GeoIPJSON.h
Update GeoIPTests.cpp
Update GeoIPTests.h
Update GeoIPXML.cpp
Update GeoIPXML.h
Update Handler.cpp
Update Handler.h
Update Interface.cpp
Update Interface.h
Update test_geoip.cpp
Update CountryData_p.cpp
Update Label.cpp
Update Label.h
Update LabelModel.cpp
Update LabelModel.h
Update CountryData_p.cpp
Update CountryData_p.cpp
Update Lookup.cpp
Update Lookup.h
Update Tests.cpp
Update Tests.h
Update TimeZone.cpp
Update TimeZone.h
Update TranslatableConfiguration.cpp
Update TranslatableConfiguration.h
Update ZoneData_p.cxxtr
Update cldr-extractor.py
Update zone-extractor.py
Update Actions.h
Update Actions.h
Update Descriptor.h
Update InstanceKey.cpp
Update Module.cpp
Update Module.h
Update Requirement.cpp
Update RequirementsChecker.h
Update RequirementsModel.cpp
Update RequirementsModel.h
Update Tests.cpp
Update Manager.cpp
Update Manager.h
Update Tests.cpp
Update FileSystem.cpp
Update FileSystem.h
Update KPMManager.cpp
Update KPMManager.h
Update KPMTests.cpp
Update FileSystem.cpp
Update FileSystem.cpp
Update FileSystem.h
Update KPMManager.cpp
Update KPMManager.h
Update Mount.cpp
Update Mount.h
Update PartitionIterator.cpp
Update PartitionIterator.h
Update PartitionIterator.h
Update PartitionQuery.cpp
Update PartitionQuery.h
Update PartitionSize.cpp
Update PartitionSize.h
Update Sync.cpp
Update Sync.h
Update Tests.cpp
Update Tests.h
Update BoostPython.h
Update CalamaresUtilsSystem.cpp
Update CalamaresUtilsSystem.h
Update CommandList.cpp
Update CommandList.h
Update Dirs.cpp
Update Dirs.h
Update Entropy.cpp
Update Entropy.h
Update Entropy.cpp
Update Logger.cpp
Update Logger.h
Update NamedEnum.h
Update NamedSuffix.h
Update PluginFactory.cpp
Update PluginFactory.h
Update RAII.h
Update RAII.h
Update Retranslator.cpp
Update Retranslator.h
Update String.cpp
Update String.h
Update TestPaths.cpp
Update Tests.cpp
Update Tests.h
Update UMask.cpp
Update UMask.h
Update Units.h
Update Variant.cpp
Update Variant.h
Update Yaml.cpp
Update Yaml.h
Update moc-warnings.h
Adriaan de Groot [Wed, 3 Jun 2020 11:42:15 +0000 (13:42 +0200)]
[locale] C&P code with repeated bugs from QML branches
Callum Farmer [Sun, 31 May 2020 13:07:49 +0000 (14:07 +0100)]
[LICENSES] Add BSD2
Callum Farmer [Fri, 29 May 2020 21:11:24 +0000 (22:11 +0100)]
[libcalamaresui] Update SPDX identifiers.
Update ImageRegistry.cpp
Callum Farmer [Fri, 29 May 2020 21:09:39 +0000 (22:09 +0100)]
[qml] Update SPDX identifiers.
Update Presentation.qml
Callum Farmer [Thu, 28 May 2020 20:46:47 +0000 (21:46 +0100)]
[CMakeModules] Update SPDX identifiers.
Update CalamaresAddTest.cmake
Update CalamaresAddLibrary.cmake
Update CalamaresAddBrandingSubdirectory.cmake
Update CalamaresAddTranslations.cmake
Update CalamaresAddPlugin.cmake
Update CalamaresAddModuleSubdirectory.cmake
Callum Farmer [Thu, 28 May 2020 20:44:27 +0000 (21:44 +0100)]
[/] Update SPDX identifiers.
Update CMakeLists.txt
Callum Farmer [Thu, 28 May 2020 20:43:43 +0000 (21:43 +0100)]
[lang] Update SPDX identifiers.
Adriaan de Groot [Wed, 3 Jun 2020 08:38:11 +0000 (01:38 -0700)]
[keyboard] Give Canadian English the US keyboard layout, eh
AI Lion [Sat, 30 May 2020 16:31:05 +0000 (00:31 +0800)]
remove unnecessary period mark since it's a title
Adriaan de Groot [Mon, 25 May 2020 08:43:56 +0000 (10:43 +0200)]
Merge pull request #1414 from gportay/remove-unused-locals
[partition] Remove unused locals
Calamares CI [Mon, 25 May 2020 07:40:18 +0000 (03:40 -0400)]
i18n: [python] Automatic merge of Transifex translations
Calamares CI [Mon, 25 May 2020 07:40:18 +0000 (03:40 -0400)]
i18n: [dummypythonqt] Automatic merge of Transifex translations
Calamares CI [Mon, 25 May 2020 07:40:18 +0000 (03:40 -0400)]
i18n: [desktop] Automatic merge of Transifex translations
Calamares CI [Mon, 25 May 2020 07:40:18 +0000 (03:40 -0400)]
i18n: [calamares] Automatic merge of Transifex translations
Gaël PORTAY [Wed, 20 May 2020 14:39:01 +0000 (10:39 -0400)]
[partition] Remove unused locals
- Unused since commit
0d284759f59a2e1c282f86255d3da8d4542fce9d
Adriaan de Groot [Wed, 20 May 2020 12:50:57 +0000 (14:50 +0200)]
Merge pull request #1413 from gportay/rawfs-fix-crash-if-bogus-is-unset
[rawfs] Fix crash if bogus is unset
Adriaan de Groot [Wed, 20 May 2020 10:12:11 +0000 (12:12 +0200)]
[calamares] Make module-tester configurable in slideshow mode
- Uses global storage to steer the jobs that are created, in case
the slideshow needs to be tweaked by percentages or whatever.
- While here, add some code docs and apply coding style.
Adriaan de Groot [Wed, 20 May 2020 09:44:27 +0000 (11:44 +0200)]
[calamares] onInitComplete() already activates first step
- In the test application, there is only one viewstep, so it is
already activated; avoid double-activation.
Adriaan de Groot [Wed, 20 May 2020 09:36:44 +0000 (11:36 +0200)]
[libcalamaresui] Avoid deadlock
- When loading QML V2, both loadQmlV2Complete() and changeSlideShowState()
lock the same mutex, introduced in
e7f4479df150efa21a3c225916ee5d6580b17064.
- Explicitly unlock when loading is done and we need to change the state
immediately.
Adriaan de Groot [Wed, 20 May 2020 08:59:43 +0000 (10:59 +0200)]
[calamares] Give the fake ExecutionViewModule a name
- This is needed for addModule() so the module manager knows there
is a module by the name x@x.
- Tell the ExecutionViewStep to run jobs from x@x.
Adriaan de Groot [Wed, 20 May 2020 08:54:48 +0000 (10:54 +0200)]
[calamares] Register modules in test-loader
- When a viewmodule is loaded, register it with the module manager
(especially relevant for the slideshow module).
Adriaan de Groot [Wed, 20 May 2020 08:36:42 +0000 (10:36 +0200)]
[libcalamaresui] Expose registering-a-single-module
- For testing purposes, it's useful to load a module externally
and then register it to the ModuleManager (this hands off ownership).
- Refactor overall module loading to use the exposed single-module method.
Adriaan de Groot [Tue, 19 May 2020 19:25:05 +0000 (21:25 +0200)]
[libcalamares] Move QML search-path initialization
- QML files need to be searched in specific places; this was initialized
by Calamares, but not for the text application. Move initialization
into the library.
Adriaan de Groot [Tue, 19 May 2020 15:39:57 +0000 (17:39 +0200)]
[libcalamaresui] Move QML-related directory functions to Qml.cpp