Page MenuHomeLubuntu Development

Clean up Calamares settings.
ClosedPublic

Authored by kc2bez on Sun, Aug 18, 6:37 PM.

Details

Summary

This resolves T107

Refactor automirror

Add donate button url and geoip to welcome

Adjust locale.conf geoip format

Set default filesystem type and no user swap choices

Add defaults to settings to eliminate warnings

Add efi mount options to fstab.conf

Set restart mode in finished.conf to new style

Set bootloader entry name to Ubuntu and slideshowAPI to 1

Test Plan

Test Calamares installation for proper location detection.

Test Calamares installation for proper efi mount.

Test Calamares installation for proper bootloader entry.

Diff Detail

Repository
rCALASETTINGS Ubuntu Calamares Settings
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

kc2bez requested review of this revision.Sun, Aug 18, 6:37 PM
kc2bez created this revision.
tsimonq2 accepted this revision.Sun, Aug 18, 6:46 PM

Nice work!

This revision is now accepted and ready to land.Sun, Aug 18, 6:46 PM
wxl added a comment.Sun, Aug 18, 9:43 PM

LGTM. I didn't pine over every single key, but I assume you have. Land, upload, and tag away. We'll shake it out when we've got a new ISO.

wxl accepted this revision.Sun, Aug 18, 10:25 PM
apt-ghetto requested changes to this revision.Mon, Aug 19, 12:29 PM
apt-ghetto added a subscriber: apt-ghetto.

After sbuild -d eoan-amd:

N: Processing source package calamares-settings-ubuntu (version 1:19.10.4, arch source) ...
W: calamares-settings-ubuntu source: debian-rules-sets-dpkg-architecture-variable DEB_HOST_MULTIARCH (line 3)
I: calamares-settings-ubuntu source: testsuite-autopkgtest-missing                                                                  
E: calamares-settings-ubuntu source: not-binnmuable-all-depends-any calamares-settings-lubuntu -> calamares-settings-ubuntu-common  
N: ----                                                                                                                             
N: Processing buildinfo package calamares-settings-ubuntu (version 1:19.10.4, arch all amd64) ...
N: ----
N: Processing binary package calamares-settings-ubuntu-common (version 1:19.10.4, arch amd64) ...
I: calamares-settings-ubuntu-common: extended-description-is-probably-too-short
E: calamares-settings-ubuntu-common: python-script-but-no-python-dep usr/lib/x86_64-linux-gnu/calamares/modules/automirror/main.py #!python3                                                                                                                            
W: calamares-settings-ubuntu-common: executable-not-elf-or-script usr/lib/x86_64-linux-gnu/calamares/modules/automirror/automirror.conf                                                                                                                                 
W: calamares-settings-ubuntu-common: executable-not-elf-or-script usr/lib/x86_64-linux-gnu/calamares/modules/automirror/module.desc 
N: ----                                                                                                                             
N: Processing binary package calamares-settings-lubuntu (version 1:19.10.4, arch all) ...
I: calamares-settings-lubuntu: extended-description-is-probably-too-short
W: calamares-settings-lubuntu: uses-dpkg-database-directly usr/bin/calamares-logs-helper                                            
W: calamares-settings-lubuntu: binary-without-manpage usr/bin/calamares-logs-helper                                                 
I: calamares-settings-lubuntu: desktop-entry-lacks-keywords-entry usr/share/applications/lubuntu-calamares.desktop                  
W: calamares-settings-lubuntu: desktop-command-not-in-package usr/share/applications/lubuntu-calamares.desktop bash                 
W: calamares-settings-lubuntu: script-not-executable usr/share/applications/lubuntu-calamares.desktop                               
W: calamares-settings-lubuntu: unusual-interpreter usr/share/applications/lubuntu-calamares.desktop #!xdg-open                      
N: Finished processing group calamares-settings-ubuntu/1:19.10.4

Not sure, which error can be removed easily.

common/modules/automirror/main.py
109

Please remove the whitespace between the brackets

114–115

The variable name is undefined. I suggest to remove it (with the first placeholder).

139–140

The block is over-intended: Please use 4 instead of 8 whitespaces

This revision now requires changes to proceed.Mon, Aug 19, 12:29 PM
apt-ghetto updated this revision to Diff 94.Mon, Aug 19, 1:54 PM
  • Fixes in automirror module
wxl added a comment.Mon, Aug 19, 10:09 PM

+1 on those automirror changes. I recognize we're still waiting on Lintian fixes.

kc2bez updated this revision to Diff 99.Mon, Aug 19, 10:15 PM
  • Fix lintian errors and warnings.
  • Add lintian override.
  • More lintian overrides.
  • Add keywords to .desktop file.
wxl added a comment.EditedMon, Aug 19, 11:50 PM

Please drop the shebang on the desktop and then you won't need to override unusual-interpreter or script-not-executable though I still advise removing chmod +x lubuntu/*.desktop from the root Makefile. Also it looks like it's executable. You can undo that.

Your issue with executables in automirror (executable-not-elf-or-script) is that debian/rules sets chmod -R 755 debian/calamares-settings-ubuntu-common/usr/lib/. That should probably be rewritten to chmod -R 755 debian/calamares-settings-ubuntu-common/usr/lib/${DEB_HOST_MULTIARCH}/calamares/modules/automirror/main.py because at least that should be executable.

You got a calamares misspell in your changelog, too.

Finally, let's us all never forget than anything to do with usr/bin/calamares-logs-helper is entirely the fault of @tsimonq2.

kc2bez updated this revision to Diff 101.Tue, Aug 20, 7:01 PM
  • Remove shebang and executable flag from .desktop.
  • Remove executable flag from non-executables.
  • Adjust dpkg-architecture-variable.
tsimonq2 accepted this revision.Tue, Aug 20, 7:09 PM

Looks good to me.

wxl accepted this revision.Tue, Aug 20, 11:28 PM

Amazing work, ya'll.

This revision was not accepted when it landed; it landed in state Needs Review.Tue, Aug 20, 11:32 PM
Closed by commit rCALASETTINGScd7fa92d1541: Clean up Calamares settings. (authored by kc2bez, committed by wxl). · Explain Why
This revision was automatically updated to reflect the committed changes.