83f40e0ddf
* Fri Aug 09 2024 Jan Stancek <jstancek@redhat.com> [6.11.0-0.rc2.17.el10] - btrfs: avoid using fixed char array size for tree names (Qu Wenruo) - btrfs: fix double inode unlock for direct IO sync writes (Filipe Manana) - btrfs: emit a warning about space cache v1 being deprecated (Josef Bacik) - btrfs: fix qgroup reserve leaks in cow_file_range (Boris Burkov) - btrfs: implement launder_folio for clearing dirty page reserve (Boris Burkov) - btrfs: scrub: update last_physical after scrubbing one stripe (Qu Wenruo) - btrfs: factor out stripe length calculation into a helper (Qu Wenruo) - power: supply: qcom_battmgr: Ignore extra __le32 in info payload (Stephan Gerhold) - power: supply: qcom_battmgr: return EAGAIN when firmware service is not up (Neil Armstrong) - power: supply: axp288_charger: Round constant_charge_voltage writes down (Hans de Goede) - power: supply: axp288_charger: Fix constant_charge_voltage writes (Hans de Goede) - power: supply: rt5033: Bring back i2c_set_clientdata (Nikita Travkin) - vhost-vdpa: switch to use vmf_insert_pfn() in the fault handler (Jason Wang) - platform/x86/intel/ifs: Initialize union ifs_status to zero (Kuppuswamy Sathyanarayanan) - platform/x86: msi-wmi-platform: Fix spelling mistakes (Luis Felipe Hernandez) - platform/x86/amd/pmf: Add new ACPI ID AMDI0107 (Shyam Sundar S K) - platform/x86/amd/pmc: Send OS_HINT command for new AMD platform (Shyam Sundar S K) - platform/x86/amd: pmf: Add quirk for ROG Ally X (Luke D. Jones) - platform/x86: intel-vbtn: Protect ACPI notify handler against recursion (Hans de Goede) - selftests: ksft: Fix finished() helper exit code on skipped tests (Laura Nao) - mm, slub: do not call do_slab_free for kfence object (Rik van Riel) - redhat/configs: Disable gfs2 in rhel configs (Andrew Price) - redhat/uki_addons/virt: add common FIPS addon (Emanuele Giuseppe Esposito) - redhat/kernel.spec: add uki_addons to create UKI kernel cmdline addons (Emanuele Giuseppe Esposito) - Linux v6.11.0-0.rc2 Resolves: RHEL-29722 Signed-off-by: Jan Stancek <jstancek@redhat.com>
152 lines
5.0 KiB
Python
Executable File
152 lines
5.0 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
#
|
|
# This script inspects a given json proving a list of addons, and
|
|
# creates an addon for each key/value pair matching the given uki, distro and
|
|
# arch provided in input.
|
|
#
|
|
# Usage: python uki_create_addons.py input_json out_dir uki distro arch
|
|
#
|
|
# This tool requires the systemd-ukify and systemd-boot packages.
|
|
#
|
|
# Addon file
|
|
#-----------
|
|
# Each addon terminates with .addon
|
|
# Each addon contains only two types of lines:
|
|
# Lines beginning with '#' are description and thus ignored
|
|
# All other lines are command line to be added.
|
|
# The name of the end resulting addon is taken from the json hierarchy.
|
|
# For example, and addon in json['virt']['rhel']['x86_64']['hello.addon'] will
|
|
# result in an UKI addon file generated in out_dir called
|
|
# hello-virt.rhel.x86_64.addon.efi
|
|
#
|
|
# The common key, present in any sub-dict in the provided json (except the leaf dict)
|
|
# is used as place for default addons when the same addon is not defined deep
|
|
# in the hierarchy. For example, if we define test.addon (text: 'test1\n') in
|
|
# json['common']['test.addon'] = ['test1\n'] and another test.addon (text: test2) in
|
|
# json['virt']['common']['test.addon'] = ['test2'], any other uki except virt
|
|
# will have a test.addon.efi with text "test1", and virt will have a
|
|
# test.addon.efi with "test2"
|
|
#
|
|
# sbat.conf
|
|
#----------
|
|
# This dict is containing the sbat string for *all* addons being created.
|
|
# This dict is optional, but when used has to be put in a sub-dict with
|
|
# { 'sbat' : { 'sbat.conf' : ['your text here'] }}
|
|
# It follows the same syntax as the addon files, meaning '#' is comment and
|
|
# the rest is taken as sbat string and feed to ukify.
|
|
|
|
import os
|
|
import sys
|
|
import json
|
|
import collections
|
|
import subprocess
|
|
|
|
|
|
UKIFY_PATH = '/usr/lib/systemd/ukify'
|
|
|
|
def usage(err):
|
|
print(f'Usage: {os.path.basename(__file__)} input_json output_dir uki distro arch')
|
|
print(f'Error:{err}')
|
|
sys.exit(1)
|
|
|
|
def check_clean_arguments(input_json, out_dir):
|
|
# Remove end '/'
|
|
if out_dir[-1:] == '/':
|
|
out_dir = out_dir[:-1]
|
|
if not os.path.isfile(input_json):
|
|
usage(f'input_json {input_json} is not a file, or does not exist!')
|
|
if not os.path.isdir(out_dir):
|
|
usage(f'out_dir_dir {out_dir} is not a dir, or does not exist!')
|
|
return out_dir
|
|
|
|
UKICmdlineAddon = collections.namedtuple('UKICmdlineAddon', ['name', 'cmdline'])
|
|
uki_addons_list = []
|
|
uki_addons = {}
|
|
addon_sbat_string = None
|
|
|
|
def parse_lines(lines, rstrip=True):
|
|
cmdline = ''
|
|
for l in lines:
|
|
l = l.lstrip()
|
|
if not l:
|
|
continue
|
|
if l[0] == '#':
|
|
continue
|
|
# rstrip is used only for addons cmdline, not sbat.conf, as it replaces
|
|
# return lines with spaces.
|
|
if rstrip:
|
|
l = l.rstrip() + ' '
|
|
cmdline += l
|
|
if cmdline == '':
|
|
return ''
|
|
return cmdline
|
|
|
|
def parse_all_addons(in_obj):
|
|
global addon_sbat_string
|
|
|
|
for el in in_obj.keys():
|
|
# addon found: copy it in our global dict uki_addons
|
|
if el.endswith('.addon'):
|
|
uki_addons[el] = in_obj[el]
|
|
|
|
if 'sbat' in in_obj and 'sbat.conf' in in_obj['sbat']:
|
|
# sbat.conf found: override sbat with the most specific one found
|
|
addon_sbat_string = parse_lines(in_obj['sbat']['sbat.conf'], rstrip=False)
|
|
|
|
def recursively_find_addons(in_obj, folder_list):
|
|
# end of recursion, leaf directory. Search all addons here
|
|
if len(folder_list) == 0:
|
|
parse_all_addons(in_obj)
|
|
return
|
|
|
|
# first, check for common folder
|
|
if 'common' in in_obj:
|
|
parse_all_addons(in_obj['common'])
|
|
|
|
# second, check if there is a match with the searched folder
|
|
if folder_list[0] in in_obj:
|
|
folder_next = in_obj[folder_list[0]]
|
|
folder_list = folder_list[1:]
|
|
recursively_find_addons(folder_next, folder_list)
|
|
|
|
def parse_in_json(in_json, uki_name, distro, arch):
|
|
with open(in_json, 'r') as f:
|
|
in_obj = json.load(f)
|
|
recursively_find_addons(in_obj, [uki_name, distro, arch])
|
|
|
|
for addon_name, cmdline in uki_addons.items():
|
|
addon_name = addon_name.replace(".addon","")
|
|
addon_full_name = f'{addon_name}-{uki_name}.{distro}.{arch}.addon.efi'
|
|
cmdline = parse_lines(cmdline).rstrip()
|
|
if cmdline:
|
|
uki_addons_list.append(UKICmdlineAddon(addon_full_name, cmdline))
|
|
|
|
def create_addons(out_dir):
|
|
for uki_addon in uki_addons_list:
|
|
out_path = os.path.join(out_dir, uki_addon.name)
|
|
cmd = [
|
|
f'{UKIFY_PATH}', 'build',
|
|
f'--cmdline="{uki_addon.cmdline}"',
|
|
f'--output={out_path}']
|
|
if addon_sbat_string:
|
|
cmd.append('--sbat="' + addon_sbat_string.rstrip() +'"')
|
|
|
|
subprocess.check_call(cmd, text=True)
|
|
|
|
if __name__ == "__main__":
|
|
argc = len(sys.argv) - 1
|
|
if argc != 5:
|
|
usage('too few or too many parameters!')
|
|
|
|
input_json = sys.argv[1]
|
|
out_dir = sys.argv[2]
|
|
uki_name = sys.argv[3]
|
|
distro = sys.argv[4]
|
|
arch = sys.argv[5]
|
|
|
|
out_dir = check_clean_arguments(input_json, out_dir)
|
|
parse_in_json(input_json, uki_name, distro, arch)
|
|
create_addons(out_dir)
|
|
|
|
|