| -rw-r--r-- | components/boot.xml | 8 | ||||
| -rw-r--r-- | components/liveinstall.xml | 9 | ||||
| -rw-r--r-- | grub-riscv64.cfg.iso-template | 41 | ||||
| -rw-r--r-- | teams/cloud/cloud.xml | 4 | ||||
| -rw-r--r-- | teams/cloud/container.xml | 2 | ||||
| -rw-r--r-- | teams/server.xml | 36 | ||||
| -rwxr-xr-x | uki-editbootconfig.sh | 5 |
7 files changed, 6 insertions, 99 deletions
diff --git a/components/boot.xml b/components/boot.xml index d801c01..ee27d4f 100644 --- a/components/boot.xml +++ b/components/boot.xml @@ -7,7 +7,7 @@ <requires profile="BootCore"/> </profile> </profiles> - <preferences profiles="BootDiskCore" arch="x86_64,riscv64"> + <preferences profiles="BootDiskCore" arch="x86_64"> <type image="oem" filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="x-systemd.growfs,compress=zstd:1" kernelcmdline="rhgb quiet" devicepersistency="by-uuid" @@ -86,8 +86,6 @@ <packages type="image" patternType="plusRecommended" profiles="BootCore"> <package name="grub2-efi-aa64" arch="aarch64"/> <package name="grub2-efi-aa64-modules" arch="aarch64"/> - <package name="grub2-efi-riscv64" arch="riscv64"/> - <package name="grub2-efi-riscv64-modules" arch="riscv64"/> <package name="grub2-efi-x64" arch="x86_64"/> <package name="grub2-efi-x64-modules" arch="x86_64"/> <package name="grub2-pc" arch="x86_64"/> @@ -96,7 +94,6 @@ <package name="s390utils-base" arch="s390x"/> <package name="shim-signed-aa64" arch="aarch64"/> <package name="shim-signed-x64" arch="x86_64"/> - <package name="shim-unsigned-riscv64" arch="riscv64"/> <package name="kernel-core"/> <package name="systemd-oomd-defaults"/> <package name="systemd-resolved"/> @@ -104,7 +101,6 @@ <packages type="image" patternType="plusRecommended" profiles="BootCoreUKI"> <package name="shim-signed-aa64" arch="aarch64"/> <package name="shim-signed-x64" arch="x86_64"/> - <package name="shim-unsigned-riscv64" arch="riscv64"/> <package name="systemd-oomd-defaults"/> <package name="systemd-resolved"/> <package name="kernel-uki-virt"/> @@ -113,7 +109,6 @@ </packages> <packages type="iso" patternType="plusRecommended" profiles="BootCore"> <package name="grub2-efi-aa64-cdboot" arch="aarch64"/> - <package name="grub2-efi-riscv64-cdboot" arch="riscv64"/> <package name="grub2-efi-x64-cdboot" arch="x86_64"/> </packages> <packages type="image" patternType="plusRecommended" profiles="BootDiskCore"> @@ -126,6 +121,5 @@ <package name="btrfs-progs"/> <package name="udisks2-btrfs"/> <package name="uboot-images-armv8" arch="aarch64"/> - <package name="uboot-images-riscv64" arch="riscv64"/> </packages> </image> diff --git a/components/liveinstall.xml b/components/liveinstall.xml index ea6029a..814dd76 100644 --- a/components/liveinstall.xml +++ b/components/liveinstall.xml @@ -23,15 +23,6 @@ <bootloader name="grub2" grub_template="grub-arm.cfg.iso-template" console="console" timeout="10"/> </type> </preferences> - <preferences profiles="LiveInstall" arch="riscv64"> - <type image="iso" - publisher="Fedora Project" volid="Fedora_Linux" application_id="Fedora_Linux" - primary="true" flags="dmsquash" filesystem="squashfs" squashfscompression="xz" mediacheck="true" - firmware="uefi" efiparttable="gpt" efifatimagesize="30" kernelcmdline="quiet rhgb" - > - <bootloader name="grub2" grub_template="grub-riscv64.cfg.iso-template" console="console" timeout="10"/> - </type> - </preferences> <preferences profiles="LiveInstall" arch="ppc64le"> <type image="iso" publisher="Fedora Project" volid="Fedora_Linux" application_id="Fedora_Linux" diff --git a/grub-riscv64.cfg.iso-template b/grub-riscv64.cfg.iso-template deleted file mode 100644 index 037ae79..0000000 --- a/grub-riscv64.cfg.iso-template +++ /dev/null @@ -1,41 +0,0 @@ -# Inspired by the config used for lorax-built live media - -set default="1" - -function load_video { - insmod efi_gop - insmod efi_uga - insmod video_bochs - insmod video_cirrus - insmod all_video -} -set basicgfx="nomodeset" - -load_video -set gfxpayload=keep -insmod gzio -insmod part_gpt -insmod ext2 - -terminal_input console -terminal_output ${terminal_output} - -set timeout=${boot_timeout} -set timeout_style=${boot_timeout_style} - -search ${search_params} - -menuentry "Start ${title}" --class fedora --class gnu-linux --class gnu --class os { - linux ($$root)${bootpath}/${kernel_file} ${boot_options} - initrd ($$root)${bootpath}/${initrd_file} -} -menuentry "Test this media & start ${title}" --class fedora --class gnu-linux --class gnu --class os { - linux ($$root)${bootpath}/${kernel_file} ${boot_options} rd.live.check - initrd ($$root)${bootpath}/${initrd_file} -} -submenu "Troubleshooting -->" { - menuentry "Start ${title} in basic graphics mode" --class fedora --class gnu-linux --class gnu --class os { - linux ($$root)${bootpath}/${kernel_file} ${boot_options} $${basicgfx} - initrd ($$root)${bootpath}/${initrd_file} - } -} diff --git a/teams/cloud/cloud.xml b/teams/cloud/cloud.xml index b6874c4..b38b508 100644 --- a/teams/cloud/cloud.xml +++ b/teams/cloud/cloud.xml @@ -89,7 +89,7 @@ </oemconfig> </type> </preferences> - <preferences profiles="Cloud-Base-Generic" arch="x86_64,aarch64,riscv64"> + <preferences profiles="Cloud-Base-Generic" arch="x86_64,aarch64"> <type image="oem" format="qcow2" filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1" kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off" @@ -149,7 +149,7 @@ </oemconfig> </type> </preferences> - <preferences profiles="Cloud-Base-UEFI-UKI" arch="x86_64,aarch64,riscv64"> + <preferences profiles="Cloud-Base-UEFI-UKI" arch="x86_64,aarch64"> <type image="oem" format="qcow2" firmware="uefi" efipartsize="1000" bootpartition="false" diff --git a/teams/cloud/container.xml b/teams/cloud/container.xml index 733fc87..420918a 100644 --- a/teams/cloud/container.xml +++ b/teams/cloud/container.xml @@ -246,7 +246,7 @@ <package name="man-db"/> <package name="man-pages"/> <package name="mesa-dri-drivers"/> - <package name="mesa-va-drivers" arch="aarch64,ppc64le,x86_64,riscv64"/> <!-- doesn't exist in s390x --> + <package name="mesa-va-drivers" arch="aarch64,ppc64le,x86_64"/> <!-- doesn't exist in s390x --> <package name="mesa-vulkan-drivers"/> <package name="mtr"/> <package name="nss-mdns"/> diff --git a/teams/server.xml b/teams/server.xml index 02f3915..fbcf610 100644 --- a/teams/server.xml +++ b/teams/server.xml @@ -71,24 +71,6 @@ </oemconfig> </type> </preferences> - <preferences profiles="ServerVMDisk" arch="riscv64"> - <type image="oem" format="qcow2" - filesystem="xfs" - kernelcmdline="earlycon console=ttyS0,115200n8" - devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" - rootfs_label="fedora" - > - <bootloader name="grub2" console="serial" timeout="0"/> - <size unit="G">10</size> - <systemdisk> - <volume name="@root"/> - </systemdisk> - <oemconfig> - <oem-resize>false</oem-resize> - </oemconfig> - </type> - </preferences> <preferences profiles="ServerDisk" arch="x86_64"> <type image="oem" filesystem="xfs" @@ -157,24 +139,6 @@ </oemconfig> </type> </preferences> - <preferences profiles="ServerDisk" arch="riscv64"> - <type image="oem" - filesystem="xfs" - kernelcmdline="earlycon console=ttyS0,115200n8" - devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" - rootfs_label="fedora" - > - <bootloader name="grub2" console="serial" timeout="3" timeout_style="menu"/> - <size unit="G">10</size> - <systemdisk> - <volume name="@root"/> - </systemdisk> - <oemconfig> - <oem-resize>false</oem-resize> - </oemconfig> - </type> - </preferences> <packages type="bootstrap" patternType="plusRecommended" profiles="ServerCore"> <package name="fedora-release-server"/> </packages> diff --git a/uki-editbootconfig.sh b/uki-editbootconfig.sh index a2e2bcc..32cb463 100755 --- a/uki-editbootconfig.sh +++ b/uki-editbootconfig.sh @@ -3,9 +3,8 @@ echo "###" "$0" "$@" # set arch-specific variables case "$(uname -m)" in - aarch64) arch="aa64"; ARCH="AA64";; - riscv64) arch="riscv64"; ARCH="RISCV64";; - x86_64) arch="x64"; ARCH="X64";; + aarch64) arch="aa64"; ARCH="AA64";; + x86_64) arch="x64"; ARCH="X64";; esac # figure where shim.efi and BOOT.CSV are located |