diff --git a/osbuild-manifests/Makefile b/osbuild-manifests/Makefile index 3efaa92..5ce3467 100644 --- a/osbuild-manifests/Makefile +++ b/osbuild-manifests/Makefile @@ -38,7 +38,7 @@ EXTRA_MPP_ARGS +=-D ostree_parent_refs='$(shell tools/ot-refs $(OSTREE_REPO))' endif export CHECKPOINTS=build -IMAGETYPES := regular ostree direct +IMAGETYPES := regular ostree FORMATS := img qcow2 oci.tar repo rootfs ext4 tar COMMON_TARGETS := qemu HOST_TARGETS := $(COMMON_TARGETS) $($(HOST_ARCH)_TARGETS) @@ -52,7 +52,6 @@ image-name = $(call image-name-noarch,$1,$2,$3,$4).$5 # variable name for image type regular_IMAGETYPE := regular ostree_IMAGETYPE := ostree -direct_IMAGETYPE := directboot help: @echo diff --git a/osbuild-manifests/images/directboot.csv b/osbuild-manifests/images/directboot.csv deleted file mode 100644 index 7e8f63d..0000000 Binary files a/osbuild-manifests/images/directboot.csv and /dev/null differ diff --git a/osbuild-manifests/include/image-directboot.ipp.yml b/osbuild-manifests/include/image-directboot.ipp.yml deleted file mode 100644 index c4e19a1..0000000 --- a/osbuild-manifests/include/image-directboot.ipp.yml +++ /dev/null @@ -1,168 +0,0 @@ -version: '2' -mpp-vars: - image_rpms: - mpp-join: - - mpp-eval: locals().get('extra_image_rpms', []) - - [] -pipelines: -- name: kernel-tree - build: name:build - stages: - - type: org.osbuild.kernel-cmdline - options: - root_fs_uuid: - mpp-eval: rootfs_uuid - kernel_opts: - mpp-eval: ''' '' .join(kernel_opts)' - - type: org.osbuild.rpm - options: - gpgkeys: - - mpp-eval: centos_gpg_key - - mpp-eval: redhat_gpg_key - disable_dracut: true - inputs: - packages: - type: org.osbuild.files - origin: org.osbuild.source - mpp-depsolve: - architecture: $arch - module-platform-id: $distro_module_id - baseurl: $distro_baseurl/BaseOS/$arch/os/ - repos: - mpp-join: - - mpp-eval: distro_repos - - - id: cs9-shim - baseurl: https://download.copr.fedorainfracloud.org/results/alexl/cs9-shim/fedora-35-$arch/ - packages: - mpp-join: - - mpp-eval: base_rpms - - mpp-eval: boot_rpms - - mpp-eval: locals().get('extra_boot_rpms', []) - - - shim-unsigned-$efiarch - excludes: - - dracut-config-rescue - - type: org.osbuild.mkdir - options: - paths: - - path: /boot/efi/EFI/Linux - parents: true - - type: org.osbuild.copy - inputs: - bootcsv: - type: org.osbuild.files - origin: org.osbuild.source - mpp-embed: - id: directboot.csv - path: directboot.csv - options: - paths: - mpp-join: - - - from: - mpp-format-string: input://bootcsv/{embedded['directboot.csv']} - to: tree:///boot/efi/EFI/Linux/boot.csv - - type: org.osbuild.dracut - options: - kernel: - - mpp-eval: rpms['kernel-tree'][kernel_rpm + '-core'].evra - add_modules: - mpp-eval: dracut_add_modules - omit_modules: - mpp-eval: dracut_omit_modules - add_drivers: - mpp-eval: dracut_add_drivers - filesystems: - mpp-eval: dracut_filesystems - install: - mpp-eval: dracut_install - extra: - - /boot/efi/EFI/Linux/initramfs.img - - --kernel-cmdline - - mpp-format-string: root=UUID={rootfs_uuid} {' ' .join(kernel_opts)} -- name: image-tree - build: name:build - stages: - mpp-join: - - - type: org.osbuild.copy - inputs: - tree: - type: org.osbuild.tree - origin: org.osbuild.pipeline - references: - - name:rootfs - options: - paths: - mpp-join: - - - from: input://tree/ - to: tree:/// - - type: org.osbuild.copy - inputs: - kernel: - type: org.osbuild.tree - origin: org.osbuild.pipeline - references: - - name:kernel-tree - options: - paths: - - from: input://kernel/lib/modules - to: tree:///lib/ - - from: input://kernel/boot/efi/EFI/BOOT - to: tree:////boot/efi/EFI/ - - from: input://kernel/boot/efi/EFI/Linux - to: tree:////boot/efi/EFI/ - - type: org.osbuild.copy - inputs: - kernel: - type: org.osbuild.tree - origin: org.osbuild.pipeline - references: - - name:kernel-tree - options: - paths: - - from: input://kernel/lib/modules - to: tree:///lib/ - - from: input://kernel/boot/efi/EFI/BOOT - to: tree:////boot/efi/EFI/ - - from: input://kernel/boot/efi/EFI/Linux - to: tree:////boot/efi/EFI/ - - mpp-if: arch == 'aarch64' - then: - type: org.osbuild.gunzip - inputs: - file: - type: org.osbuild.files - origin: org.osbuild.pipeline - references: - name:kernel-tree: - file: - mpp-format-string: boot/vmlinuz-{rpms['kernel-tree'][kernel_rpm + '-core'].evra} - options: - path: /boot/efi/EFI/Linux/linux.efi - else: - type: org.osbuild.copy - inputs: - kernel: - type: org.osbuild.tree - origin: org.osbuild.pipeline - references: - - name:kernel-tree - options: - paths: - - from: - mpp-format-string: input://kernel/boot/vmlinuz-{rpms['kernel-tree'][kernel_rpm + '-core'].evra} - to: tree:///boot/efi/EFI/Linux/linux.efi - - type: org.osbuild.users - options: - users: - root: - password: - mpp-eval: root_password - key: - mpp-eval: root_ssh_key - - mpp-eval: target_stages - - - type: org.osbuild.fstab - options: - filesystems: - mpp-eval: fstab - - type: org.osbuild.selinux - options: - file_contexts: etc/selinux/targeted/contexts/files/file_contexts