almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

templates: Copy license files from the correct path

Browse Source 
Since Fedora 30, license files are missing from the ISO filesystem
of live or installer images (including official builds). The source
path to these files changed when they were moved into a subpackage
named fedora-release-common (or generic-release-common).

Also, copy the license files from the installroot, rather than the
existing root filesystem.

(cherry picked from commit 7df94aed4d)
This commit is contained in:
David Ward 2021-01-17 19:58:01 -05:00 committed by Brian C. Lane
parent 2c58a0bc14
commit cce83b6354
10 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/templates.d/99-generic/aarch64.tmpl
View File

@ -68,7 +68,7 @@ mkdir ${KERNELDIR}
%>
# Add the license files
%for f in glob("/usr/share/licenses/*-release/*"):
%for f in glob("usr/share/licenses/*-release-common/*"):
install ${f} ${f|basename}
<% filegraft += " {0}={1}/{0}".format(basename(f), outroot) %>
%endfor

2
share/templates.d/99-generic/arm.tmpl
View File

@ -85,7 +85,7 @@ treeinfo ${basearch} platforms ${platforms}
%>
# Add the license files
%for f in glob("/usr/share/licenses/*-release/*"):
%for f in glob("usr/share/licenses/*-release-common/*"):
install ${f} ${f|basename}
<% filegraft += " {0}={1}/{0}".format(basename(f), outroot) %>
%endfor

2
share/templates.d/99-generic/live/aarch64.tmpl
View File

@ -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/licenses/*-release-common/*"):
install ${f} ${f|basename}
<% filegraft += " {0}={1}/{0}".format(basename(f), outroot) %>
%endfor

2
share/templates.d/99-generic/live/arm.tmpl
View File

@ -44,7 +44,7 @@ mkdir ${KERNELDIR}
%endfor
# Add the license files
%for f in glob("/usr/share/licenses/*-release/*"):
%for f in glob("usr/share/licenses/*-release-common/*"):
install ${f} ${f|basename}
%endfor

2
share/templates.d/99-generic/live/ppc64le.tmpl
View File

@ -74,7 +74,7 @@ replace @EXTRA@ '${extra_boot_args}' ${GRUBDIR}/grub.cfg
%endfor
# Add the license files
%for f in glob("/usr/share/licenses/*-release/*"):
%for f in glob("usr/share/licenses/*-release-common/*"):
install ${f} ${f|basename}
<% filegraft += " {0}={1}/{0}".format(basename(f), outroot) %>
%endfor

2
share/templates.d/99-generic/live/s390.tmpl
View File

@ -68,7 +68,7 @@ treeinfo images-${basearch} cdboot.prm ${BOOTDIR}/cdboot.prm
%endfor
# Add the license files
%for f in glob("/usr/share/licenses/*-release/*"):
%for f in glob("usr/share/licenses/*-release-common/*"):
install ${f} ${f|basename}
<% filegraft += " {0}={1}/{0}".format(basename(f), outroot) %>
%endfor

2
share/templates.d/99-generic/live/x86.tmpl
View File

@ -107,7 +107,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/licenses/*-release-common/*"):
install ${f} ${f|basename}
<% filegraft += " {0}={1}/{0}".format(basename(f), outroot) %>
%endfor

2
share/templates.d/99-generic/ppc64le.tmpl
View File

@ -80,7 +80,7 @@ replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${GRUBDIR}/grub.cfg
%>
# Add the license files
%for f in glob("/usr/share/licenses/*-release/*"):
%for f in glob("usr/share/licenses/*-release-common/*"):
install ${f} ${f|basename}
<% filegraft += " {0}={1}/{0}".format(basename(f), outroot) %>
%endfor

2
share/templates.d/99-generic/s390.tmpl
View File

@ -64,7 +64,7 @@ treeinfo images-${basearch} redhat.exec ${BOOTDIR}/redhat.exec
%>
# Add the license files
%for f in glob("/usr/share/licenses/*-release/*"):
%for f in glob("usr/share/licenses/*-release-common/*"):
install ${f} ${f|basename}
<% filegraft += " {0}={1}/{0}".format(basename(f), outroot) %>
%endfor

2
share/templates.d/99-generic/x86.tmpl
View File

@ -115,7 +115,7 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR}
%>
# Add the license files
%for f in glob("/usr/share/licenses/*-release/*"):
%for f in glob("usr/share/licenses/*-release-common/*"):
install ${f} ${f|basename}
<% filegraft += " {0}={1}/{0}".format(basename(f), outroot) %>
%endfor