Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-06-06 23:51:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some fixes per review - thanks Dan!

Browse Source
This commit is contained in:
Łukasz 'sil2100' Zemczak 2023-04-05 22:29:40 +02:00
parent 0518f73a7f
commit 959011d5fc
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
live-build/auto/config
View File

@ -756,6 +756,7 @@ case $PROJECT in
# the enhanced-secureboot layer, contains all packages for the enhanced secureboot install # the enhanced-secureboot layer, contains all packages for the enhanced secureboot install
add_package minimal.standard.enhanced-secureboot cryptsetup add_package minimal.standard.enhanced-secureboot cryptsetup
# now let's create the neccessary catalog files # now let's create the neccessary catalog files
# TODO: make sure that we handle locale_support: langpack correctly
cat <<-EOF > config/minimal.catalog-in.yaml cat <<-EOF > config/minimal.catalog-in.yaml
name: "Ubuntu Desktop (minimized)" name: "Ubuntu Desktop (minimized)"
description: >- description: >-
@ -763,7 +764,7 @@ case $PROJECT in
id: ubuntu-desktop-minimal id: ubuntu-desktop-minimal
type: fsimage-layered type: fsimage-layered
variant: desktop variant: desktop
locale_support: langpack locale_support: none
EOF EOF
cat <<-EOF > config/minimal.standard.catalog-in.yaml cat <<-EOF > config/minimal.standard.catalog-in.yaml
name: "Ubuntu Desktop" name: "Ubuntu Desktop"
@ -772,7 +773,7 @@ case $PROJECT in
id: ubuntu-desktop id: ubuntu-desktop
type: fsimage-layered type: fsimage-layered
variant: desktop variant: desktop
locale_support: langpack locale_support: none
default: yes default: yes
EOF EOF
cat <<-EOF > config/minimal.standard.classic.catalog-in.yaml cat <<-EOF > config/minimal.standard.classic.catalog-in.yaml

4
update-source-catalog
View File

@ -37,11 +37,9 @@ for entry in output:
if 'variations' not in template: if 'variations' not in template:
print("Non unique id in source catalog but no variations!") print("Non unique id in source catalog but no variations!")
sys.exit(1) sys.exit(1)
if 'variations' not in entry:
entry['variations'] = {}
for k, variation in template['variations'].items(): for k, variation in template['variations'].items():
variation['size'] = int(opts.size) variation['size'] = int(opts.size)
entry['variations'].update(template['variations']) entry.setdefault('variations', {}).update(template['variations'])
break break
else: else:
# No entry with this id found, so add a new one. # No entry with this id found, so add a new one.