Lubuntu
/
livecd-rootfs
mirror of https://git.launchpad.net/livecd-rootfs
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update-source-catalog: support version 2 scheme

Browse Source 
Version 1 of install-sources.yaml is a top-level list of the sources to
be offered.
Version 2 extends this by placing the list under a top-level key
`sources`, adding a `version` field, and adding a `kernel` field which
supplants the current kernel-meta-package file.  `kernel.default` is
read to know which kernel to use - unless we need to fallback to the
bridge kernel.
ubuntu/master
Dan Bungert 2 months ago
parent 9b1ea66dc8
commit 9b42f898bf
3 changed files with 110 additions and 79 deletions
Show Stats Download Patch File Download Diff File

2
live-build/lb_binary_layered
Unescape View File

@ -185,7 +185,7 @@ build_layered_squashfs () {
if [ -f config/seeded-languages ]; then if [ -f config/seeded-languages ]; then
usc_opts="$usc_opts --langs $(cat config/seeded-languages)" usc_opts="$usc_opts --langs $(cat config/seeded-languages)"
fi fi
/usr/share/livecd-rootfs/update-source-catalog $usc_opts /usr/share/livecd-rootfs/update-source-catalog source $usc_opts
else else
echo "No catalog entry template for $pass" echo "No catalog entry template for $pass"
fi fi

2
live-build/ubuntu-core-installer/hooks/05-prepare-image.binary
Unescape View File

@ -56,4 +56,4 @@ PROJECT_FULL=$PROJECT${SUBARCH:+-$SUBARCH}
usc_opts="--output livecd.${PROJECT_FULL}.install-sources.yaml \ usc_opts="--output livecd.${PROJECT_FULL}.install-sources.yaml \
--template config/edge.catalog-in.yaml \ --template config/edge.catalog-in.yaml \
--size 0" --size 0"
/usr/share/livecd-rootfs/update-source-catalog $usc_opts /usr/share/livecd-rootfs/update-source-catalog source $usc_opts

185
update-source-catalog
Unescape View File

@ -7,82 +7,113 @@ import os
import sys import sys
import yaml import yaml
parser = argparse.ArgumentParser()
parser.add_argument('--output', required=True) def get_opts():
parser.add_argument('--size', required=True) parser = argparse.ArgumentParser()
parser.add_argument('--squashfs', default='') subparsers = parser.add_subparsers(dest="subcommand")
parser.add_argument('--translations')
parser.add_argument('--template') parser_source = subparsers.add_parser('source')
parser.add_argument('--langs', default=None) parser_source.add_argument('--output', required=True)
parser_source.add_argument('--template', required=True)
opts = parser.parse_args(sys.argv[1:]) parser_source.add_argument('--size', required=True)
parser_source.add_argument('--squashfs', default='')
if os.path.exists(opts.output): parser_source.add_argument('--translations')
with open(opts.output) as fp: parser_source.add_argument('--langs')
output = yaml.safe_load(fp) parser_source.set_defaults(func=on_source)
else:
output = [] parser_merge = subparsers.add_parser('merge')
parser_merge.add_argument('--output', required=True)
parser_merge.add_argument('--template', required=True)
with open(opts.template) as fp: parser_merge.set_defaults(func=on_merge)
template = yaml.safe_load(fp)
return parser.parse_args()
id = template['id']
for entry in output: def yaml_load(filename):
# First, look if this source catalogue template id is already present. with open(filename) as fp:
# If so, use the template to extend the existing entry with additional return yaml.safe_load(fp)
# variations.
if entry['id'] == id:
if 'variations' not in template: def yaml_dump(filename, content):
print("Non unique id in source catalog but no variations!") with open(filename, 'w') as fp:
sys.exit(1) yaml.dump(content, fp)
for variation in template['variations'].values():
variation['size'] = int(opts.size)
entry.setdefault('variations', {}).update(template['variations']) def on_source(opts, output):
break template = yaml_load(opts.template)
else:
# No entry with this id found, so add a new one. id = template['id']
for entry in output["sources"]:
if 'variations' in template: # First, look if this source catalogue template id is already present.
for variation in template['variations'].values(): # If so, use the template to extend the existing entry with additional
if variation['path'] == opts.squashfs: # variations.
if entry['id'] == id:
if 'variations' not in template:
print("Non unique id in source catalog but no variations!")
sys.exit(1)
for variation in template['variations'].values():
variation['size'] = int(opts.size) variation['size'] = int(opts.size)
entry.setdefault('variations', {}).update(template['variations'])
break
else:
# No entry with this id found, so add a new one.
if 'variations' in template:
for variation in template['variations'].values():
if variation['path'] == opts.squashfs:
variation['size'] = int(opts.size)
template['size'] = int(opts.size)
template['path'] = opts.squashfs
en_name = template['name']
en_description = template['description']
template['name'] = {'en': en_name}
template['description'] = {'en': en_description}
if opts.translations:
for mo in glob.glob(os.path.join(opts.translations, '*.mo')):
with open(mo, 'rb') as fp:
t = gettext.GNUTranslations(fp=fp)
t_name = t.gettext(en_name)
if t_name != en_name:
lang = os.path.splitext(os.path.basename(mo))[0]
template['name'][lang] = t_name
t_description = t.gettext(en_description)
if t_description != en_description:
lang = os.path.splitext(os.path.basedescription(mo))[0]
template['description'][lang] = t_description
if opts.langs is not None:
template['preinstalled_langs'] = opts.langs.split(',')
output["sources"].append(template)
default_count = 0
for entry in output["sources"]:
if entry.get('default', False):
default_count += 1
if default_count > 1:
print("Too many defaults in source catalog!")
sys.exit(1)
def on_merge(opts, output):
output.update(yaml_load(opts.template))
if __name__ == "__main__":
opts = get_opts()
if os.path.exists(opts.output):
output = yaml_load(opts.output)
else:
output = {
"version": 2,
"sources": [],
}
opts.func(opts, output)
template['size'] = int(opts.size) yaml_dump(opts.output, output)
template['path'] = opts.squashfs
en_name = template['name']
en_description = template['description']
template['name'] = {'en': en_name}
template['description'] = {'en': en_description}
if opts.translations:
for mo in glob.glob(os.path.join(opts.translations, '*.mo')):
with open(mo, 'rb') as fp:
t = gettext.GNUTranslations(fp=fp)
t_name = t.gettext(en_name)
if t_name != en_name:
lang = os.path.splitext(os.path.basename(mo))[0]
template['name'][lang] = t_name
t_description = t.gettext(en_description)
if t_description != en_description:
lang = os.path.splitext(os.path.basedescription(mo))[0]
template['description'][lang] = t_description
if opts.langs is not None:
template['preinstalled_langs'] = opts.langs.split(',')
output.append(template)
default_count = 0
for entry in output:
if entry.get('default', False):
default_count += 1
if default_count > 1:
print("Too many defaults in source catalog!")
sys.exit(1)
with open(opts.output, 'w') as fp:
yaml.dump(output, fp)

Write Preview
Loading…
Cancel
Save