Skip to content

Commit 6228606

Browse files
committed
config: Wind down Endless Key and drop it from master image
As discussed in Endless OS 7 features plan, wind down Endless Key and drop it from master image. https://phabricator.endlessm.com/T35871
1 parent 2dafd3c commit 6228606

File tree

7 files changed

+1
-153
lines changed

7 files changed

+1
-153
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ indent_style = space
1414
indent_size = 2
1515

1616
# Python
17-
[{*.py,eos-image-builder,run-build,helpers/{assemble-manifest,fetch-remote-collection-id,generate-ovf-files,kill-chroot-procs,kolibri-pick-content-from-channel,mutable-path,seed-kolibri-channels},hooks/{content/50-flatpak,image/{50-flatpak.chroot,52-ek-content-cache,62-kolibri-options,70-flatpak-appstream-catalog,70-flatpak-manifest,70-ostree-manifest,70-packages-manifest}}}]
17+
[{*.py,eos-image-builder,run-build,helpers/{assemble-manifest,fetch-remote-collection-id,generate-ovf-files,kill-chroot-procs,kolibri-pick-content-from-channel,mutable-path,seed-kolibri-channels},hooks/{content/50-flatpak,image/{50-flatpak.chroot,62-kolibri-options,70-flatpak-appstream-catalog,70-flatpak-manifest,70-ostree-manifest,70-packages-manifest}}}]
1818
indent_size = 4
1919
max_line_length = 88

config/defaults.ini

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ hooks_add =
7474
50-reclaim-swap-stamp
7575
50-gnome-software-cache
7676
50-xkb-layout.chroot
77-
53-ek-content-preload
7877
60-dconf-prepare
7978
60-flatpak-autoinstall-counters.chroot
8079
60-kolibri-content
@@ -245,30 +244,6 @@ regular_users_can_manage_content = false
245244
# # Kolibri 0.12.2 User Guide for Admins [document]
246245
# 5bb37c1832c8489ab2940f31588305f6
247246

248-
[endlesskey]
249-
# Kolibri package specification to use when preloading data. This needs to be
250-
# less than or equal to the version in the org.endlessos.Key flatpak to ensure
251-
# it doesn't apply any database migrations that the app doesn't have yet.
252-
# Typically this will be kolibri==<version>, but may also be a URL for a
253-
# pre-release not on PyPI.
254-
kolibri_pkgspec = https://github.com/learningequality/kolibri/releases/download/v0.16.0-beta6/kolibri-0.16.0b6-py2.py3-none-any.whl
255-
256-
# Kolibri xdg desktop file plugin to use when preloading channels. Out of the
257-
# box these desktop files are not used for Endless Key, but some OS images may
258-
# add them to the search path, so we should ensure they are pregenerated in the
259-
# OS image.
260-
kolibri_app_desktop_xdg_plugin_version = 1.3.0
261-
262-
# Which Endless Key collections to preload in the image.
263-
# Must match the name of one of the collections shipped with the Endless Key
264-
# (ex. artist, explorer, spanish etc).
265-
collections_add =
266-
267-
# By default, only the content specified in each collection will be included.
268-
# Set this to true to include all content from all channels in the requested
269-
# collections.
270-
include_full_channels = false
271-
272247
[ostree]
273248
# Repository setup. By default the remote, remote repo and OS name are
274249
# all named eos.
@@ -469,7 +444,6 @@ apps_add =
469444
io.thp.numptyphysics
470445
org.audacityteam.Audacity
471446
org.blender.Blender
472-
org.endlessos.Key
473447
org.gimp.GIMP
474448
org.gnome.Cheese
475449
org.gnome.Gnote

config/personality/base.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,3 @@ apps_del = ${apps_add_defaults}
1212
[flatpak-remote-flathub]
1313
# Delete all default additions and explicitly build the list from scratch.
1414
apps_del = ${apps_add_defaults}
15-
apps_add =
16-
org.endlessos.Key

config/personality/en.ini

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,3 @@ apps_add =
2525
com.endlessnetwork.drawingtutorials
2626
com.endlessnetwork.htmltutorials
2727
com.endlessnetwork.sciencesnacks
28-
29-
[endlesskey]
30-
collections_add =
31-
artist
32-
athlete
33-
curious
34-
explorer
35-
extras
36-
inventor
37-
scientist

config/personality/es.ini

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,3 @@ apps_add =
4343
[flatpak-remote-flathub]
4444
apps_add =
4545
ar.com.pilas_engine.App
46-
47-
[endlesskey]
48-
collections_add =
49-
spanish
50-
spanish-extras

hooks/image/53-ek-content-preload

Lines changed: 0 additions & 108 deletions
This file was deleted.

lib/eib.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ class ImageConfigParser(configparser.ConfigParser):
115115
('buildroot', 'mounts'),
116116
('check', 'hooks'),
117117
('content', 'hooks'),
118-
('endlesskey', 'collections'),
119118
('error', 'hooks'),
120119
('flatpak', 'locales'),
121120
('flatpak-remote-*', 'apps'),

0 commit comments

Comments
 (0)