sig_core/toolkit
sig_core/toolkit
7
2
Fork 3
Code Issues 6 Pull Requests 2 Actions Projects Releases Wiki Activity

remove templates for xorr

Browse Source
This commit is contained in:
Louis Abel 2022-06-27 00:29:45 -07:00
parent 8302604f7d
commit 6d239b48e9
Signed by: label
GPG Key ID: B37E62D143879B36
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
iso/empanadas/empanadas/templates/buildExtraImage.tmpl.sh
View File

@ -7,12 +7,12 @@ mkdir -p {{ compose_work_iso_dir }}/{{ arch }}
cd {{ compose_work_iso_dir }}/{{ arch }} cd {{ compose_work_iso_dir }}/{{ arch }}
{% else %} {% else %}
cd /builddir cd /builddir
{% endif %}
if ! TEMPLATE="$($(head -n1 $(which lorax) | cut -c3-) -c 'import pylorax; print(pylorax.find_templates())')"; then if ! TEMPLATE="$($(head -n1 $(which lorax) | cut -c3-) -c 'import pylorax; print(pylorax.find_templates())')"; then
TEMPLATE="/usr/share/lorax" TEMPLATE="/usr/share/lorax"
fi fi
{% endif %}
{{ make_image }} | tee -a {{ log_path }} {{ make_image }} | tee -a {{ log_path }}

3
iso/empanadas/empanadas/util/iso_utils.py
View File

@ -986,9 +986,6 @@ class IsoBuild:
if 'genisoimage' in required_pkgs and 'xorriso' not in required_pkgs: if 'genisoimage' in required_pkgs and 'xorriso' not in required_pkgs:
required_pkgs.append('xorriso') required_pkgs.append('xorriso')
if self.extra_iso_mode == 'podman':
required_pkgs.append('which')
rclevel = '' rclevel = ''
if self.release_candidate: if self.release_candidate:
rclevel = '-' + self.rclvl rclevel = '-' + self.rclvl