actions/build-container-installer
1
0
Fork 0
mirror of https://github.com/JasonN3/build-container-installer.git synced 2025-12-25 10:57:55 +01:00
Code Releases Activity

replace ostree commands with bootc commands

Browse source
This commit is contained in:
Jason N. 2024-03-13 11:37:42 -04:00
parent 6f1f78fa89
commit 71b42dd35c
3 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Makefile
View file

@ -3,6 +3,7 @@
# General # General
ADDITIONAL_TEMPLATES = ADDITIONAL_TEMPLATES =
ARCH = x86_64 ARCH = x86_64
BOOTC = true
EXTRA_BOOT_PARAMS = EXTRA_BOOT_PARAMS =
IMAGE_NAME = base IMAGE_NAME = base
IMAGE_REPO = quay.io/fedora-ostree-desktops IMAGE_REPO = quay.io/fedora-ostree-desktops
@ -33,7 +34,7 @@ _LORAX_TEMPLATES = $(shell ls lorax_templates/install_*.tmpl) \
$(foreach file,$(notdir $(shell ls lorax_templates/scripts/post/install_*)),lorax_templates/post_$(file).tmpl) $(foreach file,$(notdir $(shell ls lorax_templates/scripts/post/install_*)),lorax_templates/post_$(file).tmpl)
_REPO_FILES = $(subst /etc/yum.repos.d,repos,$(REPOS)) _REPO_FILES = $(subst /etc/yum.repos.d,repos,$(REPOS))
_TEMP_DIR = $(shell mktemp -d) _TEMP_DIR = $(shell mktemp -d)
_TEMPLATE_VARS = ARCH IMAGE_NAME IMAGE_REPO _IMAGE_REPO_DOUBLE_ESCAPED _IMAGE_REPO_ESCAPED IMAGE_TAG REPOS VARIANT VERSION WEB_UI _TEMPLATE_VARS = ARCH _BASE_DIR IMAGE_NAME IMAGE_REPO _IMAGE_REPO_DOUBLE_ESCAPED _IMAGE_REPO_ESCAPED IMAGE_TAG REPOS VARIANT VERSION WEB_UI
_VOLID = $(firstword $(subst -, ,$(IMAGE_NAME)))-$(ARCH)-$(IMAGE_TAG) _VOLID = $(firstword $(subst -, ,$(IMAGE_NAME)))-$(ARCH)-$(IMAGE_TAG)
ifeq ($(findstring redhat.repo,$(REPOS)),redhat.repo) ifeq ($(findstring redhat.repo,$(REPOS)),redhat.repo)
@ -83,6 +84,10 @@ _LORAX_TEMPLATES += $(shell ls lorax_templates/secureboot_*.tmpl) \
_TEMPLATE_VARS += ENROLLMENT_PASSWORD _TEMPLATE_VARS += ENROLLMENT_PASSWORD
endif endif
ifeq ($(BOOTC),true)
_LORAX_TEMPLATES += $(shell ls lorax_templates/bootc_*.tmpl)
endif
# Step 7: Build end ISO # Step 7: Build end ISO
## Default action ## Default action
build/deploy.iso: boot.iso container/$(IMAGE_NAME)-$(IMAGE_TAG) xorriso/input.txt build/deploy.iso: boot.iso container/$(IMAGE_NAME)-$(IMAGE_TAG) xorriso/input.txt
@ -232,7 +237,7 @@ clean:
rm -f $(_BASE_DIR)/*.log || true rm -f $(_BASE_DIR)/*.log || true
install-deps: install-deps:
dnf install -y lorax xorriso skopeo flatpak dbus-daemon ostree coreutils gettext git dnf install -y lorax xorriso skopeo flatpak dbus-daemon ostree coreutils gettext git patch
test: test-iso test-vm test: test-iso test-vm

3
lorax_templates/bootc_patch.tmpl Normal file
View file

@ -0,0 +1,3 @@
<%page args="_base_dir, root"/>
runcmd patch ${root}/usr/lib64/python*/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/installation.py ${_base_dir}/lorax_templates/bootc_patch/39.patch

11
lorax_templates/bootc_patch/39.patch Normal file
View file

@ -0,0 +1,11 @@
577,578c577,579
< args = ["install", "to-filesystem", "--source-imgref=" + ref,
< self._physroot]
---
> args = ["container", "image", "deploy",
> "--sysroot=" + self._physroot,
> "--image=" + ref]
588c589
< "bootc",
---
> "ostree",