From d27e582805f2f50481cf684b23fbebd9c7f6e0b9 Mon Sep 17 00:00:00 2001 From: tigro Date: Sat, 30 Sep 2023 16:43:45 +0300 Subject: [PATCH] Added sphere licenses to live media --- ...07-Add-sphere-licenses-to-live-media.patch | 25 +++++++++++++++++++ SPECS/lorax-templates-rhel.spec | 7 +++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 SOURCES/0007-Add-sphere-licenses-to-live-media.patch diff --git a/SOURCES/0007-Add-sphere-licenses-to-live-media.patch b/SOURCES/0007-Add-sphere-licenses-to-live-media.patch new file mode 100644 index 0000000..3e5d2fe --- /dev/null +++ b/SOURCES/0007-Add-sphere-licenses-to-live-media.patch @@ -0,0 +1,25 @@ +From a988cc8516ba2179a0780f3158ac17263f7ce828 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(-) + +diff --git a/80-rhel/live/x86.tmpl b/80-rhel/live/x86.tmpl +index 6e10da4..8a1ee4c 100644 +--- a/80-rhel/live/x86.tmpl ++++ b/80-rhel/live/x86.tmpl +@@ -136,7 +136,7 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR} + %endfor + + # Add the license files +-%for f in glob("/usr/share/licenses/*-release/*"): ++%for f in glob("/usr/share/sphere-release/*"): + install ${f} ${f|basename} + <% filegraft += " {0}={1}/{0}".format(basename(f), outroot) %> + %endfor +-- +2.41.0 + diff --git a/SPECS/lorax-templates-rhel.spec b/SPECS/lorax-templates-rhel.spec index d55b610..997805c 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: 37%{?dist}.8 +Release: 37%{?dist}.9 Summary: MSVSphere 9 build templates for lorax and livemedia-creator License: GPLv2+ @@ -16,6 +16,7 @@ Patch1003: 0003-Translate-installation-image-bootloader-to-Russian.patch Patch1004: 0004-Translate-live-image-bootloader-to-Russian.patch Patch1005: 0005-Disable-geo-location.patch Patch1006: 0006-Update-title-color.patch +Patch1007: 0007-Add-sphere-licenses-to-live-media.patch # Required for the template branding support # Required for Russian localization @@ -36,6 +37,7 @@ placed in %{templatedir} %patch1004 -p1 %patch1005 -p1 %patch1006 -p1 +%patch1007 -p1 %build # nothing to build @@ -52,6 +54,9 @@ install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{templatedir}/live/config_files/x86/ %{templatedir}/* %changelog +* Sat Sep 30 2023 Arkady L. Shane - 9.0-37.9 +- Added sphere licenses to live media + * Thu Sep 21 2023 Arkady L. Shane - 9.0-37.8 - Apply missing patch