From a091fb67df0e5cc127c7bb4d6f5d6ed962c14ab9 Mon Sep 17 00:00:00 2001 From: "Jason N." <33561705+JasonN3@users.noreply.github.com> Date: Wed, 13 Mar 2024 20:28:19 -0400 Subject: [PATCH] remove bootc --- Makefile | 6 ------ lorax_templates/bootc_patch.tmpl | 5 ----- lorax_templates/bootc_patch/39.patch | 18 ------------------ 3 files changed, 29 deletions(-) delete mode 100644 lorax_templates/bootc_patch.tmpl delete mode 100644 lorax_templates/bootc_patch/39.patch diff --git a/Makefile b/Makefile index cbefaa9..00483bf 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,6 @@ # General ADDITIONAL_TEMPLATES = ARCH = x86_64 -BOOTC = true EXTRA_BOOT_PARAMS = IMAGE_NAME = base IMAGE_REPO = quay.io/fedora-ostree-desktops @@ -123,11 +122,6 @@ _LORAX_TEMPLATES += $(call get_templates,secureboot) _TEMPLATE_VARS += ENROLLMENT_PASSWORD endif -ifeq ($(BOOTC),true) -_LORAX_TEMPLATES += $(call get_templates,bootc) -_LORAX_ARGS += -i bootc -endif - # Step 7: Build end ISO ## Default action build/deploy.iso: boot.iso container/$(IMAGE_NAME)-$(IMAGE_TAG) xorriso/input.txt diff --git a/lorax_templates/bootc_patch.tmpl b/lorax_templates/bootc_patch.tmpl deleted file mode 100644 index cf971ce..0000000 --- a/lorax_templates/bootc_patch.tmpl +++ /dev/null @@ -1,5 +0,0 @@ -<%page args="_base_dir, root, version"/> - -% if int(version) == 39: -runcmd patch ${root}/usr/lib64/python3.12/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/installation.py ${_base_dir}/lorax_templates/bootc_patch/39.patch -% endif \ No newline at end of file diff --git a/lorax_templates/bootc_patch/39.patch b/lorax_templates/bootc_patch/39.patch deleted file mode 100644 index 035e677..0000000 --- a/lorax_templates/bootc_patch/39.patch +++ /dev/null @@ -1,18 +0,0 @@ -577,586c577,578 -< args = ["container", "image", "deploy", -< "--sysroot=" + self._physroot, -< "--image=" + ref] -< -< if self._data.transport: -< args.append("--transport=" + self._data.transport) -< if self._data.stateroot: -< args.append("--stateroot=" + self._data.stateroot) -< if not self._data.signature_verification_enabled: -< args.append("--no-signature-verification") ---- -> args = ["install", "to-filesystem", "--source-imgref=oci:" + ref, -> self._physroot] -589c581 -< "ostree", ---- -> "bootc",