diff --git a/SOURCES/0003-Translate-installation-image-bootloader-to-Russian.patch b/SOURCES/0003-Translate-installation-image-bootloader-to-Russian.patch index fa3b457..3de7a74 100644 --- a/SOURCES/0003-Translate-installation-image-bootloader-to-Russian.patch +++ b/SOURCES/0003-Translate-installation-image-bootloader-to-Russian.patch @@ -1,15 +1,90 @@ -From 6a2fe8be7df46482666162d7b71d26ca0ed0afbe Mon Sep 17 00:00:00 2001 +From ea989db77f31ff2b5d332216f96c18d349eff4ee Mon Sep 17 00:00:00 2001 From: Eugene Zamriy Date: Wed, 26 Jul 2023 23:51:00 +0300 -Subject: [PATCH 3/3] Translate installation image bootloader to Russian +Subject: [PATCH 3/7] Translate installation image bootloader to Russian --- - 80-rhel/config_files/x86/grub2-efi.cfg | 15 ++++++---- - 80-rhel/config_files/x86/isolinux.cfg | 41 +++++++++++++++----------- - 80-rhel/efi.tmpl | 9 +++++- - 80-rhel/x86.tmpl | 25 ++++++++++++++-- - 4 files changed, 64 insertions(+), 26 deletions(-) + 80-rhel/aarch64.tmpl | 12 ++++++- + 80-rhel/config_files/aarch64/grub2-efi.cfg | 15 +++++--- + 80-rhel/config_files/x86/grub2-efi.cfg | 15 +++++--- + 80-rhel/config_files/x86/isolinux.cfg | 41 ++++++++++++---------- + 80-rhel/efi.tmpl | 9 ++++- + 80-rhel/x86.tmpl | 25 +++++++++++-- + 6 files changed, 85 insertions(+), 32 deletions(-) +diff --git a/80-rhel/aarch64.tmpl b/80-rhel/aarch64.tmpl +index 2893a50..b6dc04a 100644 +--- a/80-rhel/aarch64.tmpl ++++ b/80-rhel/aarch64.tmpl +@@ -15,6 +15,16 @@ if os.stat(joinpaths(inroot, runtime_img)).st_size >= 4*1024**3: + isoargs = "-iso-level 3" + else: + isoargs = "" ++ ++# define an MSVSphere-specific image flavor constant ++if product.variant in ("Minimal", "Server"): ++ FLAVOR=" Сервер" ++elif product.variant == "Certified": ++ FLAVOR=" Сертифицированная" ++elif product.variant == "BaseOS": ++ FLAVOR=" ОС" ++else: ++ FLAVOR="" + %> + + mkdir images +@@ -47,7 +57,7 @@ mkdir ${KERNELDIR} + %> + treeinfo images-${basearch} ${img|basename} ${img} + %endfor +- <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch32=efiarch32, efiarch64=efiarch64, isolabel=isolabel"/> ++ <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch32=efiarch32, efiarch64=efiarch64, isolabel=isolabel", FLAVOR=FLAVOR"/> + %endif + + # Create optional product.img and updates.img +diff --git a/80-rhel/config_files/aarch64/grub2-efi.cfg b/80-rhel/config_files/aarch64/grub2-efi.cfg +index 80db480..5d7ab99 100644 +--- a/80-rhel/config_files/aarch64/grub2-efi.cfg ++++ b/80-rhel/config_files/aarch64/grub2-efi.cfg +@@ -15,7 +15,12 @@ function load_video { + } + + load_video ++insmod gfxterm ++set gfxmode=auto + set gfxpayload=keep ++set lang=ru_RU ++terminal_output gfxterm ++loadfont unicode + insmod gzio + insmod part_gpt + insmod ext2 +@@ -26,20 +31,20 @@ set timeout=60 + search --no-floppy --set=root -l '@ISOLABEL@' + + ### BEGIN /etc/grub.d/10_linux ### +-menuentry 'Install @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os { ++menuentry 'Установить @PRODUCT@ @VERSION@@FLAVOR@' --class fedora --class gnu-linux --class gnu --class os { + linux @KERNELPATH@ @ROOT@ ro + initrd @INITRDPATH@ + } +-menuentry 'Test this media & install @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os { ++menuentry 'Проверить носитель и установить @PRODUCT@ @VERSION@@FLAVOR@' --class fedora --class gnu-linux --class gnu --class os { + linux @KERNELPATH@ @ROOT@ rd.live.check + initrd @INITRDPATH@ + } +-submenu 'Troubleshooting -->' { +- menuentry 'Install @PRODUCT@ @VERSION@ in text mode' --class red --class gnu-linux --class gnu --class os { ++submenu 'Устранение неполадок -->' { ++ menuentry 'Установить @PRODUCT@ @VERSION@@FLAVOR@ (текстовый установщик)' --class fedora --class gnu-linux --class gnu --class os { + linux @KERNELPATH@ @ROOT@ inst.text + initrd @INITRDPATH@ + } +- menuentry 'Rescue a @PRODUCT@ system' --class red --class gnu-linux --class gnu --class os { ++ menuentry 'Восстановление установленной системы' --class fedora --class gnu-linux --class gnu --class os { + linux @KERNELPATH@ @ROOT@ inst.rescue + initrd @INITRDPATH@ + } diff --git a/80-rhel/config_files/x86/grub2-efi.cfg b/80-rhel/config_files/x86/grub2-efi.cfg index 5fc47de..1ac9995 100644 --- a/80-rhel/config_files/x86/grub2-efi.cfg @@ -259,5 +334,5 @@ index 3d9d0a4..2717f2c 100644 # Create optional product.img and updates.img -- -2.46.0 +2.47.0 diff --git a/SOURCES/0004-Translate-live-image-bootloader-to-Russian.patch b/SOURCES/0004-Translate-live-image-bootloader-to-Russian.patch index 9a545b4..2c2b596 100644 --- a/SOURCES/0004-Translate-live-image-bootloader-to-Russian.patch +++ b/SOURCES/0004-Translate-live-image-bootloader-to-Russian.patch @@ -1,16 +1,48 @@ -From 54d9c3bb700838579d1d329bdbdeae4372d76669 Mon Sep 17 00:00:00 2001 +From 8976fe0e94144b94f52e324f920a5fcd671afac9 Mon Sep 17 00:00:00 2001 From: tigro Date: Sat, 29 Jul 2023 15:34:37 +0200 -Subject: [PATCH] Translate live image bootloader to Russian +Subject: [PATCH 4/7] Translate live image bootloader to Russian --- - 80-rhel/live/config_files/x86/grub2-efi.cfg | 9 ++++-- - 80-rhel/live/config_files/x86/isolinux.cfg | 27 ++++++++++-------- - 80-rhel/live/efi.tmpl | 6 ++++ - 80-rhel/live/x86.tmpl | 31 ++++++++++++++++++++- - 80-rhel/x86.tmpl | 2 +- - 5 files changed, 59 insertions(+), 16 deletions(-) + .../live/config_files/aarch64/grub2-efi.cfg | 9 ++++-- + 80-rhel/live/config_files/x86/grub2-efi.cfg | 9 ++++-- + 80-rhel/live/config_files/x86/isolinux.cfg | 27 +++++++++------- + 80-rhel/live/efi.tmpl | 6 ++++ + 80-rhel/live/x86.tmpl | 31 ++++++++++++++++++- + 80-rhel/x86.tmpl | 2 +- + 6 files changed, 66 insertions(+), 18 deletions(-) +diff --git a/80-rhel/live/config_files/aarch64/grub2-efi.cfg b/80-rhel/live/config_files/aarch64/grub2-efi.cfg +index ea655ff..4d60bf0 100644 +--- a/80-rhel/live/config_files/aarch64/grub2-efi.cfg ++++ b/80-rhel/live/config_files/aarch64/grub2-efi.cfg +@@ -15,7 +15,12 @@ function load_video { + } + + load_video ++insmod gfxterm ++set gfxmode=auto + set gfxpayload=keep ++set lang=ru_RU ++terminal_output gfxterm ++loadfont unicode + insmod gzio + insmod part_gpt + insmod ext2 +@@ -26,11 +31,11 @@ set timeout=60 + search --no-floppy --set=root -l '@ISOLABEL@' + + ### BEGIN /etc/grub.d/10_linux ### +-menuentry 'Start @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os { ++menuentry 'Запустить @PRODUCT@ @VERSION@@FLAVOR@' --class fedora --class gnu-linux --class gnu --class os { + linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet + initrd @INITRDPATH@ + } +-menuentry 'Test this media & start @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os { ++menuentry 'Проверить носитель и запустить @PRODUCT@ @VERSION@@FLAVOR@' --class fedora --class gnu-linux --class gnu --class os { + linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.check quiet + initrd @INITRDPATH@ + } diff --git a/80-rhel/live/config_files/x86/grub2-efi.cfg b/80-rhel/live/config_files/x86/grub2-efi.cfg index 89a74ea..f26d4e6 100644 --- a/80-rhel/live/config_files/x86/grub2-efi.cfg @@ -191,10 +223,10 @@ index 473faab..c4c2c20 100644 mkdir ${KERNELDIR} %for kernel in kernels: diff --git a/80-rhel/x86.tmpl b/80-rhel/x86.tmpl -index be49189..4de8bf8 100644 +index 2717f2c..5cf3778 100644 --- a/80-rhel/x86.tmpl +++ b/80-rhel/x86.tmpl -@@ -54,7 +54,7 @@ install ${configdir}/cp866-8x16.psf ${BOOTDIR} +@@ -56,7 +56,7 @@ install ${configdir}/cp866-8x16.psf ${BOOTDIR} ## configure bootloader replace @VERSION@ ${product.version} ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg @@ -204,5 +236,5 @@ index be49189..4de8bf8 100644 %else: replace @PRODUCT@ '${product.name}' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg -- -2.41.0 +2.47.0 diff --git a/SOURCES/0007-Add-sphere-licenses-to-live-media.patch b/SOURCES/0007-Add-sphere-licenses-to-live-media.patch index cbf5335..7c39bb7 100644 --- a/SOURCES/0007-Add-sphere-licenses-to-live-media.patch +++ b/SOURCES/0007-Add-sphere-licenses-to-live-media.patch @@ -1,12 +1,26 @@ -From b8f496cf30e61c650fb416df9fb140b8148500fe Mon Sep 17 00:00:00 2001 +From 10de30f87fda00f05abbbe162fd1eb0a9b186475 Mon Sep 17 00:00:00 2001 From: tigro Date: Sat, 30 Sep 2023 16:42:23 +0300 Subject: [PATCH 7/7] Add sphere licenses to live media --- - 80-rhel/live/x86.tmpl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + 80-rhel/live/aarch64.tmpl | 2 +- + 80-rhel/live/x86.tmpl | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +diff --git a/80-rhel/live/aarch64.tmpl b/80-rhel/live/aarch64.tmpl +index a59c4ff..64c7f14 100644 +--- a/80-rhel/live/aarch64.tmpl ++++ b/80-rhel/live/aarch64.tmpl +@@ -67,7 +67,7 @@ mkdir ${KERNELDIR} + %endfor + + # Add the license files +-%for f in glob("/usr/share/licenses/*-release/*"): ++%for f in glob("/usr/share/sphere-release/EULA"): + install ${f} ${f|basename} + <% filegraft += " {0}={1}/{0}".format(basename(f), outroot) %> + %endfor diff --git a/80-rhel/live/x86.tmpl b/80-rhel/live/x86.tmpl index 6e10da4..0b92fd6 100644 --- a/80-rhel/live/x86.tmpl @@ -21,5 +35,5 @@ index 6e10da4..0b92fd6 100644 <% filegraft += " {0}={1}/{0}".format(basename(f), outroot) %> %endfor -- -2.41.0 +2.47.0 diff --git a/SPECS/lorax-templates-rhel.spec b/SPECS/lorax-templates-rhel.spec index f725d07..11a0705 100644 --- a/SPECS/lorax-templates-rhel.spec +++ b/SPECS/lorax-templates-rhel.spec @@ -1,6 +1,6 @@ Name: lorax-templates-msvsphere Version: 9.0 -Release: 40%{?dist} +Release: 40%{?dist}.1 Summary: MSVSphere 9 build templates for lorax and livemedia-creator License: GPLv2+ @@ -32,16 +32,8 @@ MSVSphere 9 Lorax templates for creating the boot.iso and live isos are placed in %{templatedir} %prep -%setup -n lorax-templates-rhel-%{version} -%patch1001 -p1 -%patch1002 -p1 -%patch1003 -p1 -%patch1004 -p1 -%patch1005 -p1 -%patch1006 -p1 -%patch1007 -p1 -%patch1008 -p1 -%patch1009 -p1 +%setup -q -n lorax-templates-rhel-%{version} +%autopatch -p1 %build # nothing to build @@ -58,6 +50,9 @@ install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{templatedir}/live/config_files/x86/ %{templatedir}/* %changelog +* Tue Nov 5 2024 Arkady L. Shane - 9.0-40.1 +- Patch also aarch64 templates + * Thu Oct 17 2024 Arkady L. Shane - 9.0-40 - Sync with upstream