comments to explain how to do things

This commit is contained in:
Louis Abel 2022-06-17 11:49:22 -07:00
parent adc0cd3b81
commit 7ca3cc889d
Signed by untrusted user: label
GPG Key ID: B37E62D143879B36
2 changed files with 36 additions and 6 deletions

View File

@ -1,7 +1,6 @@
#!/bin/bash #!/bin/bash
VOLID="{{ shortname }}-{{ major }}-{{ minor }}{{ rc }}-{{ arch }}-boot1" VOLID="{{ shortname }}-{{ major }}-{{ minor }}{{ rc }}-{{ arch }}-boot1"
LOGFILE="{{ builddir }}/lorax-{{ arch }}.log"
VARIANT="{{ variant }}" VARIANT="{{ variant }}"
ARCH="{{ arch }}" ARCH="{{ arch }}"
VERSION="{{ revision }}" VERSION="{{ revision }}"
@ -9,6 +8,7 @@ PRODUCT="{{ distname }}"
MOCKBLD="{{ builddir }}" MOCKBLD="{{ builddir }}"
LORAXRES="{{ lorax_work_root }}" LORAXRES="{{ lorax_work_root }}"
LORAX_TAR="lorax-{{ major }}-{{ arch }}.tar.gz" LORAX_TAR="lorax-{{ major }}-{{ arch }}.tar.gz"
LOGFILE="lorax-{{ arch }}.log"
{% for pkg in lorax %} {% for pkg in lorax %}
sed -i '/{{ pkg }}/ s/^/#/' /usr/share/lorax/templates.d/80-rhel/runtime-install.tmpl sed -i '/{{ pkg }}/ s/^/#/' /usr/share/lorax/templates.d/80-rhel/runtime-install.tmpl
@ -27,7 +27,7 @@ lorax --product="${PRODUCT}" \
--nomacboot \ --nomacboot \
--buildarch="${ARCH}" \ --buildarch="${ARCH}" \
--volid="${VOLID}" \ --volid="${VOLID}" \
--logfile="${LOGFILE}" \ --logfile="${MOCKBLD}/${LOGFILE}" \
--rootfs-size=3 \ --rootfs-size=3 \
"${LORAXRES}" "${LORAXRES}"

View File

@ -12,7 +12,13 @@ import subprocess
import shlex import shlex
import time import time
import re import re
# This is for treeinfo
from configparser import ConfigParser
from productmd.common import SortedConfigParser from productmd.common import SortedConfigParser
from productmd.images import Image
from productmd.extra_files import ExtraFiles
import productmd.treeinfo
# End treeinfo
from common import Color from common import Color
from jinja2 import Environment, FileSystemLoader from jinja2 import Environment, FileSystemLoader
@ -31,6 +37,7 @@ class IsoBuild:
config, config,
major, major,
rc: bool = False, rc: bool = False,
force_unpack: bool = False,
isolation: str = 'auto', isolation: str = 'auto',
compose_dir_is_here: bool = False, compose_dir_is_here: bool = False,
image=None, image=None,
@ -56,6 +63,7 @@ class IsoBuild:
self.mock_isolation = isolation self.mock_isolation = isolation
self.iso_map = rlvars['iso_map'] self.iso_map = rlvars['iso_map']
self.release_candidate = rc self.release_candidate = rc
self.force_unpack = force_unpack
# Relevant major version items # Relevant major version items
self.release = rlvars['revision'] self.release = rlvars['revision']
@ -260,17 +268,39 @@ class IsoBuild:
self.log.error('See the logs for more information.') self.log.error('See the logs for more information.')
raise SystemExit() raise SystemExit()
def run_image_build(self, arch):
"""
Builds the other images
"""
print()
def run_boot_sync(self, arch, force_sync):
"""
This unpacks into BaseOS/$arch/os, assuming there's no data actually
there. There should be checks.
1. Sync from work/$arch/lorax to work/$arch/dvd
2. Sync from work/$arch/lorax to work/$arch/minimal
3. Sync from work/$arch/lorax to BaseOS/$arch/os
4. Modify (3) .treeinfo
5. Modify (1) .treeinfo, keep out boot.iso checksum
6. Create a .treeinfo for AppStream
"""
self.sync_boot(arch, force_sync)
def sync_boot(self, arch, force_sync):
"""
Syncs whatever is in work/$arch/lorax to BaseOS/$arch/os
"""
self.log.info('Syncing lorax to dvd directory...')
self.log.info('Syncing lorax to %s directory...' % self.iso_map['variant'])
# !!! Send help, we would prefer to do this using the productmd python
# !!! library. If you are reading this and you can help us, please do so!
def treeinfo_write(self): def treeinfo_write(self):
""" """
Ensure treeinfo is written correctly Ensure treeinfo is written correctly
""" """
print() print()
# !!! Send help, we would prefer to do this using the productmd python
# !!! library. If you are reading this and you can help us, please do so!
def discinfo_write(self): def discinfo_write(self):
""" """
Ensure discinfo is written correctly Ensure discinfo is written correctly