OSDN Git Service
hayao [Fri, 14 Aug 2020 12:43:30 +0000 (21:43 +0900)]
Merge tag 'v3.2.28.2'
hayao [Fri, 14 Aug 2020 12:42:26 +0000 (21:42 +0900)]
[update] : alteriso2 and alteriso3
Adriaan de Groot [Wed, 12 Aug 2020 14:52:42 +0000 (16:52 +0200)]
Changes: pre-release housekeeping
Adriaan de Groot [Wed, 12 Aug 2020 09:20:24 +0000 (11:20 +0200)]
[users] Create all the groups needed for the user
-
26b8c82630 added the list of all-the-groups-for-the-user,
but didn't change the list passed to the method that
creates groups.
FIXES #1488
Adriaan de Groot [Mon, 10 Aug 2020 20:58:11 +0000 (22:58 +0200)]
Mention both of the fixed bugs
Adriaan de Groot [Mon, 10 Aug 2020 15:02:03 +0000 (17:02 +0200)]
[libcalamares] Improve logging - report correct number of jobs left
Adriaan de Groot [Mon, 10 Aug 2020 16:37:08 +0000 (18:37 +0200)]
[users] Missing ! makes install always fail
FIXES #1483
Adriaan de Groot [Mon, 10 Aug 2020 16:21:42 +0000 (18:21 +0200)]
[libcalamares] Apply SPDX to utils/
Adriaan de Groot [Mon, 10 Aug 2020 16:21:36 +0000 (18:21 +0200)]
Changes: pre-release housekeeping
Adriaan de Groot [Mon, 10 Aug 2020 15:02:58 +0000 (17:02 +0200)]
Merge pull request #1481 from demmm/calamares
[welcomeq] language bar icon configurable
Adriaan de Groot [Mon, 10 Aug 2020 14:52:19 +0000 (16:52 +0200)]
[users] **keep** the create users job
- need to add the job to the list rather than just leaking it
Adriaan de Groot [Mon, 10 Aug 2020 14:38:13 +0000 (16:38 +0200)]
[libcalamares] Improve logging in runCommand() (less chatty)
Adriaan de Groot [Mon, 10 Aug 2020 14:10:16 +0000 (16:10 +0200)]
[calamares] Fix up multiple-moc of KDSAG
- was getting multiple definitions of moc-related code due to automoc
combined with KDSAG having its own #include moc, comment-out the include.
- while here, simplify the CMake bits for building KDSAG
demmm [Mon, 10 Aug 2020 10:30:55 +0000 (12:30 +0200)]
[localeq] use image instead of theme icon
Adriaan de Groot [Mon, 10 Aug 2020 07:44:34 +0000 (09:44 +0200)]
CMake: add SPDX identifiers to top-level CMakeLists.txt
- This is kind of bogus, since the file has existed for much longer
than the identifier says, but I don't want to do spelunking now.
Adriaan de Groot [Mon, 10 Aug 2020 07:43:13 +0000 (09:43 +0200)]
[libcalamares] Update SPDX identifiers in locale/
Adriaan de Groot [Mon, 10 Aug 2020 07:32:50 +0000 (09:32 +0200)]
[libcalamares] update SPDX licensing on generated files
- the scripts are BSD-2-clause,
- the generated files are CC0 (I'm not *100%* sure about the
derived file CountryData_p.cpp, which lists countries and
country codes -- it **is** extracted from CLDR data which
is not CC0)
Adriaan de Groot [Sun, 9 Aug 2020 21:01:59 +0000 (23:01 +0200)]
[libcalamares] Repair tests around save/load YAML round-trip
- QStringList doesn't round-trip correctly; add a test to
demonstrate that.
- Fix existing test to **not** use QStringList, but QVariantList
(of strings), which is how other code would use it.
The above is **kind** of moot because nothing uses the YAML-save
function, but it might.
While here, fix another test: YAML-loading can load JSON just fine.
Adriaan de Groot [Sun, 9 Aug 2020 20:35:10 +0000 (22:35 +0200)]
[libcalamares] Repair test for old Qt
- Qt 5.11 and early 5.12 just don't support Esperanto at all
Adriaan de Groot [Sun, 9 Aug 2020 19:10:24 +0000 (21:10 +0200)]
ci: put a space after directory names in user-visible messages
- this makes is much easier to double-click-select the directory,
since the . isn't attached and won't be selected along with the
directory anymore.
Adriaan de Groot [Sun, 9 Aug 2020 19:03:58 +0000 (21:03 +0200)]
ci: update the GPG key ID used for signing
Adriaan de Groot [Sun, 9 Aug 2020 19:01:44 +0000 (21:01 +0200)]
Changes: pre-release housekeeping
Adriaan de Groot [Sun, 9 Aug 2020 19:00:40 +0000 (21:00 +0200)]
i18n: drop pythonqt translations from the tooling
Adriaan de Groot [Sun, 9 Aug 2020 18:58:16 +0000 (20:58 +0200)]
i18n: update English source translations
Calamares CI [Sun, 9 Aug 2020 18:49:43 +0000 (20:49 +0200)]
i18n: [calamares] Automatic merge of Transifex translations
Adriaan de Groot [Sun, 9 Aug 2020 07:43:01 +0000 (09:43 +0200)]
Merge branch 'issue-1479' into calamares
Special case reiserfs (named "reiserfs" in /etc/fstab and as
a `mount -t` argument).
FIXES #1479
Adriaan de Groot [Sat, 8 Aug 2020 22:00:14 +0000 (00:00 +0200)]
[libcalamares] Add name-for-partition-type method
- add apidox to all the untranslatedFS() methods
- add the most-basic of untranslatedFS(), which works on a given
FileSystem::Type; this one can handle special cases where
Cala needs a different untranslated name than what KPMCore provides.
Adriaan de Groot [Sat, 8 Aug 2020 21:32:09 +0000 (23:32 +0200)]
[libcalamares] SPDX, DLLEXPORT on partition/FileSystem.h
Adriaan de Groot [Sat, 8 Aug 2020 20:54:59 +0000 (22:54 +0200)]
[libcalamares] Expand KPMCore tests
- check on FS names as well
Adriaan de Groot [Sat, 8 Aug 2020 14:36:35 +0000 (00:36 +1000)]
Merge branch 'fix-joburg' into calamares
Resolve a long-standing annoyance. With the new model for TimeZones
and nicer data structures, along with consistent find-methods,
we can spot-patch TZ data to handle special cases of bad timezones
being assigned to obviously-otherwise locations.
Adriaan de Groot [Sat, 8 Aug 2020 14:20:04 +0000 (00:20 +1000)]
[libcalamares] Test the spot-patch for Johannesburg
- Add a note about notation, degrees-minutes
Adriaan de Groot [Sat, 8 Aug 2020 14:05:40 +0000 (00:05 +1000)]
[libcalamares] Add spot-patches to timezone data
- for the purposes of Calamares's nearest-location selection algorithm
for timezone selection, introduce spot patches: alternate markers
on the map to indicate "things close to here belong in this timezone".
- hide the implementation detail in the find() methods.
Adriaan de Groot [Sat, 8 Aug 2020 13:40:13 +0000 (23:40 +1000)]
[libcalamares] Expand testing of TZ location lookup
- Cape Town is in South Africa, so one might expect it to get South
Africa's timezone -- which is Africa/Johannesburg -- but Windhoek
is closer, so it gets that.
- Port Elisabeth is similar: Maseru lies between it an Johannesburg,
so it gets the wrong timezone, too.
These both illustrate how the limited resolution of the map, together
with the "closest location" lookup, can give poor results. For most
of South Africa, the "wrong" timezone is closer than the right one.
Adriaan de Groot [Sat, 8 Aug 2020 13:14:20 +0000 (23:14 +1000)]
[libcalamares] Refactor test to be data-driven
- this test is going to get a lot more cases, so prepare for that
Adriaan de Groot [Sat, 8 Aug 2020 12:12:22 +0000 (22:12 +1000)]
[libcalamares] Refactor timezone loading
- load from a TextStream. This is prep-work for alternate TZ data
sources.
Adriaan de Groot [Sat, 8 Aug 2020 12:01:10 +0000 (22:01 +1000)]
[locale] Port TZ widget lookup to new find() method
- The TZ widget uses a different coordinate system (mapping lat and lon
to pixel locations, and then calculating Manhattan distance from
that), so needs a different distance function.
- Simplify code: there's just one "closest TZ" function.
Adriaan de Groot [Sat, 8 Aug 2020 11:45:32 +0000 (13:45 +0200)]
[libcalamares] Expose distanceFunc-find for timezones
Adriaan de Groot [Sat, 8 Aug 2020 11:26:39 +0000 (13:26 +0200)]
[libcalamares] Refactor finding-TZ algorithm
- introduce a distance function and use that, rather than coding it
inside the find() function. This is prep-work for unifying the
find() calls, based on various coordinate systems.
Adriaan de Groot [Fri, 7 Aug 2020 11:59:41 +0000 (13:59 +0200)]
Merge branch 'issue-1457' into calamares
Support /etc/default/grub.d/ -- keep in mind that the **rest** of the
logic in writing a grub configuration file is unchanged, so 00calamares
may roughly override "global" or top-level grub variables like
GRUB_TIMEOUT.
FIXES #1457
Adriaan de Groot [Fri, 7 Aug 2020 11:42:47 +0000 (13:42 +0200)]
[grubcfg] expand config-testing for the new features
- create directories for new tests ahead of the tests themselves;
this **can** still cause problems if a test is run standalone.
- if creating the grub-dir at runtime is necessary, be informative
if it fails.
demmm [Fri, 7 Aug 2020 10:44:07 +0000 (12:44 +0200)]
[welcomeq] language bar icon configurable
similar functionality as in welcome module, set in welcomeq.conf
Adriaan de Groot [Fri, 7 Aug 2020 10:13:51 +0000 (12:13 +0200)]
[grubcfg] Support prefer_grub_d settings
Adriaan de Groot [Fri, 7 Aug 2020 10:05:46 +0000 (12:05 +0200)]
[grubcfg] Drop default_dir
- the default_dir was only stored in modify_grub_default() to
create the directory if needed; move that functionality to
the get_grub_config_paths() function (and drop the "s",
since it now returns just one).
Adriaan de Groot [Fri, 7 Aug 2020 10:02:42 +0000 (12:02 +0200)]
[grubcfg] refactor finding-the-grub-paths into a function
Adriaan de Groot [Fri, 7 Aug 2020 09:55:16 +0000 (11:55 +0200)]
[grubcfg] Introduce prefer_grub_d
- new setting for using /etc/defaults/grub.d/ (SEE #1457), not implemented
- add missing fields to schema for config file
Adriaan de Groot [Fri, 7 Aug 2020 09:43:48 +0000 (11:43 +0200)]
[grubcfg] Fix config schema
Adriaan de Groot [Fri, 7 Aug 2020 09:30:30 +0000 (11:30 +0200)]
Merge branch 'issue-1477' into calamares
FIXES #1477
Adriaan de Groot [Fri, 7 Aug 2020 08:50:33 +0000 (10:50 +0200)]
[displaymanager] Fix config schema
Adriaan de Groot [Fri, 7 Aug 2020 08:43:29 +0000 (10:43 +0200)]
CMake: put completions with the other "misc. installs"
Adriaan de Groot [Fri, 7 Aug 2020 06:33:44 +0000 (08:33 +0200)]
Merge branch 'issue-1476' into calamares
Go over the locale module again:
- new models that avoid weird casts and inconvenient iteration
- shared timezone data
- simple sorting and filtering
- simplify the map / QML version
FIXES #1476
FIXES #1426
Adriaan de Groot [Thu, 6 Aug 2020 23:12:18 +0000 (01:12 +0200)]
Merge branch 'mt-gs' into calamares
Fix up potential thread-safety issues with GS, expand testing.
Adriaan de Groot [Thu, 6 Aug 2020 23:11:14 +0000 (01:11 +0200)]
[libcalamares] More GS load/save testing
- failures elsewhere boil down to QStringList is not supported,
but a QVariantList of QVariants of QStrings is.
Adriaan de Groot [Thu, 6 Aug 2020 22:57:30 +0000 (00:57 +0200)]
[libcalamares] Expand YAML testing a little
- load/save of a stringlist seems to work
Adriaan de Groot [Thu, 6 Aug 2020 22:45:36 +0000 (00:45 +0200)]
[libcalamares] Test GS
- test insert, remove, emitted signals
- test loading and saving of YAML and JSON
This shows up a big bug in the YAML saving code (which was never
used, it seems, anyway)
Adriaan de Groot [Thu, 6 Aug 2020 22:13:58 +0000 (00:13 +0200)]
[libcalamares] Rename tests for consistency
Adriaan de Groot [Thu, 6 Aug 2020 22:08:47 +0000 (00:08 +0200)]
[libcalamares] Fix GS load behavior
- the loadJson behavior did too many notifications, and was likely to
deadlock; write directly to the map instead and emit only once.
- the loadYaml method did something very different from its
documentation or intent.
Adriaan de Groot [Thu, 6 Aug 2020 21:48:18 +0000 (23:48 +0200)]
[libcalamares] Apply locking to GS access
Adriaan de Groot [Thu, 6 Aug 2020 21:27:04 +0000 (23:27 +0200)]
[libcalamares] Address outdates assumptions about thread-safety
Adriaan de Groot [Thu, 6 Aug 2020 22:01:20 +0000 (00:01 +0200)]
[libcalamares] GS improve load/save
- save should be const
- rename save() to saveJson() for parity with saveYaml()
Adriaan de Groot [Thu, 6 Aug 2020 21:14:44 +0000 (23:14 +0200)]
[libcalamares] Document GS
- write apidox for all of GlobalStorage
- while here, polish up the SPDX bits
Adriaan de Groot [Thu, 6 Aug 2020 20:54:37 +0000 (22:54 +0200)]
[libcalamares] Improve GS debugDump() formatting
Adriaan de Groot [Thu, 6 Aug 2020 20:50:11 +0000 (22:50 +0200)]
[libcalamares] Remove unused include, declaration
Adriaan de Groot [Thu, 6 Aug 2020 16:32:51 +0000 (18:32 +0200)]
[locale] Explicitly update GS from the locale step
- refactor into some free functions (out of the lambda's for connecting)
- introduce new method to call from onLeave(), matching previous
widget behavior
Adriaan de Groot [Thu, 6 Aug 2020 14:05:58 +0000 (16:05 +0200)]
[localeq] Demonstrate "offline" lookups
- we can do GeoIP and GeoNames lookups, **or**
- use Calamares's internal GeoIP lookup and country / city hints.
The online version is much more accurate, but costs more lookups;
in these examples, set it all to "offline" and document what needs
to change (code edit) to use the online version.
It's probably a good beginner job to introduce a bool in localeq.qml
to switch the behaviors.
Adriaan de Groot [Thu, 6 Aug 2020 13:49:55 +0000 (15:49 +0200)]
[localeq] Pick up Config changes before showing the module
Adriaan de Groot [Thu, 6 Aug 2020 13:58:11 +0000 (15:58 +0200)]
[locale] QML doesn't like const
Adriaan de Groot [Thu, 6 Aug 2020 12:47:55 +0000 (14:47 +0200)]
[locale] Update the map-QML implementation
- Config has suitable strings for displaying TZ information.
Use them and automatic bindings. Don't update the strings manually.
- Suggest online or offline TZ lookups based on what the distro wants.
Edit the QML to pick online lookups (needs access to the geonames
service, though).
- Drop the variables that point at config and geoip: the Config
object has a currentLocation, which is filled in by both the
configuration and any GeoIP lookup -- it doesn't have city
or country information though.
Adriaan de Groot [Thu, 6 Aug 2020 10:40:24 +0000 (12:40 +0200)]
[locale] Add a 'current timezone' strings to Config
- status is a longer phrase
- name is a short human-readable name
- code is the internal code
Code that writes its own "Timezone set to" messages can use
the name, rather than the status.
Adriaan de Groot [Thu, 6 Aug 2020 10:38:55 +0000 (12:38 +0200)]
[locale] Avoid nullptr deref
- when no location has been set at all, there's no sensible TZ
to report; just leave it blank. In *practice* you won't hit this
code from the Calamares UI before a location has been set, because
the Config object is instantiated and then immediately configured,
but from tests or unusual UIs it could be.
Adriaan de Groot [Thu, 6 Aug 2020 10:32:48 +0000 (12:32 +0200)]
[locale] Add test for Config initialization
- needs some massaging because Config otherwise depends on
ModuleManager which is a UI class (for the Reasons),
but we already have a BUILD_AS_TEST define for that purpose.
- demonstrate a nullptr deref.
Adriaan de Groot [Thu, 6 Aug 2020 10:14:15 +0000 (12:14 +0200)]
[locale] Repair test: don't re-init te occupied-pixels set each loop
- while here, merge Tests.h to the cpp file
- Fix build when debugging timezones (missed during earlier refactor)
Adriaan de Groot [Thu, 6 Aug 2020 12:19:27 +0000 (14:19 +0200)]
[libcalamares] Offer translation lookup of regions
Adriaan de Groot [Thu, 6 Aug 2020 10:43:49 +0000 (12:43 +0200)]
[libcalamares] Reduce logging in POD manipulation
Adriaan de Groot [Thu, 6 Aug 2020 09:57:05 +0000 (11:57 +0200)]
[libcalamares] Implement nearest-TZ lookup
- This version, based on lat+lon lookup, handles wrap-around the
globe at -180 W (which is very close to +180 E)
- Test wrap-around-the-globe lookups
Adriaan de Groot [Thu, 6 Aug 2020 08:47:47 +0000 (10:47 +0200)]
[libcalamares] Make ZonesModel more QML-friendly
- expose TZ lookup (as a QObject*, which QML needs)
- C++ code should use find(), which is safer
Adriaan de Groot [Wed, 5 Aug 2020 23:52:50 +0000 (01:52 +0200)]
[libcalamares] Add API for geographical lookup
- find a zone given lat, lon -- with a failing test and a bogus
implementation.
Adriaan de Groot [Wed, 5 Aug 2020 23:27:03 +0000 (01:27 +0200)]
[locale] Re-do locale module with new TZ data
- The Config object now uses the re-done models and timezone data
- most of the properties of the locale Config are unchanged
- much less complication in extracting data from the zones model
Adriaan de Groot [Wed, 5 Aug 2020 22:56:13 +0000 (00:56 +0200)]
[libcalamares] Sort the models before use
- zones and regions alphabetically by key
Adriaan de Groot [Wed, 5 Aug 2020 21:46:14 +0000 (23:46 +0200)]
[libcalamares] Add an iterator for the full zones model
Adriaan de Groot [Wed, 5 Aug 2020 21:26:17 +0000 (23:26 +0200)]
[libcalamares] Add accessors for TZ data and region in the model
It's convenient when e.g. QComboBox::currentData() gets the key
"automatically", and the default role for that method is UserRole,
so let the value of KeyRole overlap.
Adriaan de Groot [Wed, 5 Aug 2020 20:30:04 +0000 (22:30 +0200)]
[libcalamares] Add a find() to ZonesModel
- Look up TZ data by region and zone name.
Adriaan de Groot [Wed, 5 Aug 2020 16:01:24 +0000 (18:01 +0200)]
[libcalamares] Make TimeZoneData public
- Also make it a QObject so we can add properties and make it useful
for QML consumption.
Adriaan de Groot [Wed, 5 Aug 2020 15:52:41 +0000 (17:52 +0200)]
[libcalamares] Split out CStringPair into TranslatableString
The (renamed) class TranslatableString keeps a key value
(e.g. New_York) and a human-readable version around; the
human-readable one is passed through QObject::tr() for translation
on-the-fly.
Adriaan de Groot [Wed, 5 Aug 2020 15:14:13 +0000 (17:14 +0200)]
[libcalamares] Introduce a filtering model per-region
Adriaan de Groot [Wed, 5 Aug 2020 14:45:41 +0000 (16:45 +0200)]
[libcalamares] Give zones data, too
- while here, fix bug in TimeZoneData that didn't munge names
(so it reported "New_York")
Adriaan de Groot [Wed, 5 Aug 2020 14:36:00 +0000 (16:36 +0200)]
[libcalamares] Satisfy test, return region names
Adriaan de Groot [Wed, 5 Aug 2020 14:25:45 +0000 (16:25 +0200)]
[libcalamares] Failing test: there is data in the regions model
Adriaan de Groot [Wed, 5 Aug 2020 14:21:05 +0000 (16:21 +0200)]
[libcalamares] Re-done zones loading
- just make one big list of zones, one short list of regions
- the models are non-functional right now
Adriaan de Groot [Wed, 5 Aug 2020 13:17:09 +0000 (15:17 +0200)]
[libcalamares] Introduce a failing test for the number of regions
Adriaan de Groot [Wed, 5 Aug 2020 13:11:52 +0000 (15:11 +0200)]
[libcalamares] Rip out all the TZ models
- The models are overly complicated: **overall** there is just one
list of timezones, and we need various views on that list.
Start over with an empty model of regions.
Adriaan de Groot [Wed, 5 Aug 2020 12:25:49 +0000 (14:25 +0200)]
Merge branch 'issue-1471' into calamares
FIXES #1471
Adriaan de Groot [Wed, 5 Aug 2020 12:24:28 +0000 (14:24 +0200)]
[hostinfo] Massage test to handle ARM
- there **is** another source of information about the CPU,
so in the test use that to cross-check what hostCPU() says.
NB: it's probably a good idea to fall back on the same file
in hostCPU() for better accuracy.
Adriaan de Groot [Wed, 5 Aug 2020 12:07:39 +0000 (14:07 +0200)]
[hostinfo] Try to recognize ARM as well
- /proc/cpuinfo is a terrible information source; it contains very
different information on x86 from arm (testen on rpi4 and rock64).
Calamares CI [Wed, 5 Aug 2020 11:53:54 +0000 (13:53 +0200)]
i18n: [python] Automatic merge of Transifex translations
Calamares CI [Wed, 5 Aug 2020 11:53:54 +0000 (13:53 +0200)]
i18n: [calamares] Automatic merge of Transifex translations
Adriaan de Groot [Wed, 5 Aug 2020 11:42:18 +0000 (13:42 +0200)]
[users] Drop data-access from the Page
- get username, password etc. from the config object, not the page
- jobs now depend entirely on config
- handle logic of "what's the root password" in Config
Adriaan de Groot [Wed, 5 Aug 2020 11:29:06 +0000 (13:29 +0200)]
[users] Add password fields to Config
- no checking is done for validity, and there is no password-status
Adriaan de Groot [Wed, 5 Aug 2020 11:03:56 +0000 (13:03 +0200)]
[users] Add tests for moved password-check configuration
- link the PW checks to the test, and libpwquality if needed
- test only does very basic config-mungeing
Adriaan de Groot [Wed, 5 Aug 2020 11:03:18 +0000 (13:03 +0200)]
[users] Move the configuration of password checks to Config
- the Widget (Page) does not need to know the password checks,
that's business logic that belongs to Config.
Adriaan de Groot [Wed, 5 Aug 2020 10:56:09 +0000 (12:56 +0200)]
[users] PW checking does not need widgets