Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ indent_style = space
indent_size = 2

# Python
[{*.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}}}]
[{*.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}}}]
indent_size = 4
max_line_length = 88
26 changes: 0 additions & 26 deletions config/defaults.ini
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ hooks_add =
50-reclaim-swap-stamp
50-gnome-software-cache
50-xkb-layout.chroot
53-ek-content-preload
60-dconf-prepare
60-flatpak-autoinstall-counters.chroot
60-kolibri-content
Expand Down Expand Up @@ -245,30 +244,6 @@ regular_users_can_manage_content = false
# # Kolibri 0.12.2 User Guide for Admins [document]
# 5bb37c1832c8489ab2940f31588305f6

[endlesskey]
# Kolibri package specification to use when preloading data. This needs to be
# less than or equal to the version in the org.endlessos.Key flatpak to ensure
# it doesn't apply any database migrations that the app doesn't have yet.
# Typically this will be kolibri==<version>, but may also be a URL for a
# pre-release not on PyPI.
kolibri_pkgspec = https://github.com/learningequality/kolibri/releases/download/v0.16.0-beta6/kolibri-0.16.0b6-py2.py3-none-any.whl

# Kolibri xdg desktop file plugin to use when preloading channels. Out of the
# box these desktop files are not used for Endless Key, but some OS images may
# add them to the search path, so we should ensure they are pregenerated in the
# OS image.
kolibri_app_desktop_xdg_plugin_version = 1.3.0

# Which Endless Key collections to preload in the image.
# Must match the name of one of the collections shipped with the Endless Key
# (ex. artist, explorer, spanish etc).
collections_add =

# By default, only the content specified in each collection will be included.
# Set this to true to include all content from all channels in the requested
# collections.
include_full_channels = false

[ostree]
# Repository setup. By default the remote, remote repo and OS name are
# all named eos.
Expand Down Expand Up @@ -469,7 +444,6 @@ apps_add =
io.thp.numptyphysics
org.audacityteam.Audacity
org.blender.Blender
org.endlessos.Key
org.gimp.GIMP
org.gnome.Cheese
org.gnome.Gnote
Expand Down
2 changes: 0 additions & 2 deletions config/personality/base.ini
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,3 @@ apps_del = ${apps_add_defaults}
[flatpak-remote-flathub]
# Delete all default additions and explicitly build the list from scratch.
apps_del = ${apps_add_defaults}
apps_add =
org.endlessos.Key
10 changes: 0 additions & 10 deletions config/personality/en.ini
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,3 @@ apps_add =
com.endlessnetwork.drawingtutorials
com.endlessnetwork.htmltutorials
com.endlessnetwork.sciencesnacks

[endlesskey]
collections_add =
artist
athlete
curious
explorer
extras
inventor
scientist
5 changes: 0 additions & 5 deletions config/personality/es.ini
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,3 @@ apps_add =
[flatpak-remote-flathub]
apps_add =
ar.com.pilas_engine.App

[endlesskey]
collections_add =
spanish
spanish-extras
108 changes: 0 additions & 108 deletions hooks/image/53-ek-content-preload

This file was deleted.

10 changes: 0 additions & 10 deletions hooks/image/54-ek-launchers

This file was deleted.

1 change: 0 additions & 1 deletion lib/eib.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ class ImageConfigParser(configparser.ConfigParser):
('buildroot', 'mounts'),
('check', 'hooks'),
('content', 'hooks'),
('endlesskey', 'collections'),
('error', 'hooks'),
('flatpak', 'locales'),
('flatpak-remote-*', 'apps'),
Expand Down